diff options
Diffstat (limited to 'kivio')
206 files changed, 810 insertions, 810 deletions
diff --git a/kivio/kiviopart/config/kivio_config.cpp b/kivio/kiviopart/config/kivio_config.cpp index 6428c1fd..74e8572b 100644 --- a/kivio/kiviopart/config/kivio_config.cpp +++ b/kivio/kiviopart/config/kivio_config.cpp @@ -28,30 +28,30 @@ namespace Kivio { KoPageLayout Config::defaultPageLayout() { - KoPageLayout tqlayout; + KoPageLayout layout; - tqlayout.format = KoPageFormat::formatFromString(Settings::format()); - tqlayout.orientation = Kivio::orientationFromString(Settings::orientation()); - tqlayout.ptTop = Settings::borderTop(); - tqlayout.ptBottom = Settings::borderBottom(); - tqlayout.ptLeft = Settings::borderLeft(); - tqlayout.ptRight = Settings::borderRight(); - tqlayout.ptWidth = Settings::width(); - tqlayout.ptHeight = Settings::height(); + layout.format = KoPageFormat::formatFromString(Settings::format()); + layout.orientation = Kivio::orientationFromString(Settings::orientation()); + layout.ptTop = Settings::borderTop(); + layout.ptBottom = Settings::borderBottom(); + layout.ptLeft = Settings::borderLeft(); + layout.ptRight = Settings::borderRight(); + layout.ptWidth = Settings::width(); + layout.ptHeight = Settings::height(); - return tqlayout; + return layout; } - void Config::setDefaultPageLayout(const KoPageLayout& tqlayout) + void Config::setDefaultPageLayout(const KoPageLayout& layout) { - Settings::setFormat(KoPageFormat::formatString(tqlayout.format)); - Settings::setOrientation(Kivio::orientationString(tqlayout.orientation)); - Settings::setBorderTop(tqlayout.ptTop); - Settings::setBorderBottom(tqlayout.ptBottom); - Settings::setBorderLeft(tqlayout.ptLeft); - Settings::setBorderRight(tqlayout.ptRight); - Settings::setWidth(tqlayout.ptWidth); - Settings::setHeight(tqlayout.ptHeight); + Settings::setFormat(KoPageFormat::formatString(layout.format)); + Settings::setOrientation(Kivio::orientationString(layout.orientation)); + Settings::setBorderTop(layout.ptTop); + Settings::setBorderBottom(layout.ptBottom); + Settings::setBorderLeft(layout.ptLeft); + Settings::setBorderRight(layout.ptRight); + Settings::setWidth(layout.ptWidth); + Settings::setHeight(layout.ptHeight); } void Config::setGrid(const KivioGridData& /*grid*/) diff --git a/kivio/kiviopart/config/kivio_config.h b/kivio/kiviopart/config/kivio_config.h index b4df785a..651ec121 100644 --- a/kivio/kiviopart/config/kivio_config.h +++ b/kivio/kiviopart/config/kivio_config.h @@ -34,12 +34,12 @@ namespace Kivio { { public: /** - * Set the default page tqlayout + * Set the default page layout */ - static void setDefaultPageLayout(const KoPageLayout& tqlayout); + static void setDefaultPageLayout(const KoPageLayout& layout); /** - * Get the default page tqlayout + * Get the default page layout */ static KoPageLayout defaultPageLayout(); diff --git a/kivio/kiviopart/kivio_canvas.cpp b/kivio/kiviopart/kivio_canvas.cpp index 96fee8cb..e2125cbb 100644 --- a/kivio/kiviopart/kivio_canvas.cpp +++ b/kivio/kiviopart/kivio_canvas.cpp @@ -275,7 +275,7 @@ void KivioCanvas::paintEvent( TQPaintEvent* ev ) painter.save(); painter.setClipRegion(grayRegion, TQPainter::CoordPainter); painter.setPen(TQt::NoPen); - painter.fillRect(grayRegion.boundingRect(), KApplication::tqpalette().active().brush(TQColorGroup::Mid)); + painter.fillRect(grayRegion.boundingRect(), KApplication::palette().active().brush(TQColorGroup::Mid)); painter.restore(); // end of copy... @@ -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; @@ -1115,7 +1115,7 @@ void KivioCanvas::startPasteMoving() beginUnclippedSpawnerPainter(); drawSelectedStencilsXOR(); - // Build the list of old tqgeometry + // Build the list of old geometry KoRect *pData; m_lstOldGeometry.clear(); KivioStencil* pStencil = activePage()->selectedStencils()->first(); @@ -1245,7 +1245,7 @@ void KivioCanvas::endPasteMoving() endUnclippedSpawnerPainter(); - // Clear the list of old tqgeometry + // Clear the list of old geometry m_lstOldGeometry.clear(); m_pasteMoving = false; } diff --git a/kivio/kiviopart/kivio_dlg_pageshow.cpp b/kivio/kiviopart/kivio_dlg_pageshow.cpp index 6381d76b..7989a4c6 100644 --- a/kivio/kiviopart/kivio_dlg_pageshow.cpp +++ b/kivio/kiviopart/kivio_dlg_pageshow.cpp @@ -26,7 +26,7 @@ #include <kapplication.h> #include <klocale.h> #include <tqstringlist.h> -#include <tqlayout.h> +#include <layout.h> #include <kbuttonbox.h> #include <tqstrlist.h> #include <tqptrlist.h> diff --git a/kivio/kiviopart/kivio_doc.cpp b/kivio/kiviopart/kivio_doc.cpp index a7dee3d4..d25bcfa0 100644 --- a/kivio/kiviopart/kivio_doc.cpp +++ b/kivio/kiviopart/kivio_doc.cpp @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include <tqdom.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqbuffer.h> #include <tqtabwidget.h> #include <tqpaintdevicemetrics.h> @@ -119,7 +119,7 @@ KivioDoc::KivioDoc( TQWidget *parentWidget, const char* widgetName, TQObject* pa if ( !name ) { TQString tmp( "Document%1" ); //lukas: FIXME - tmp = tmp.tqarg( s_docId++ ); + tmp = tmp.arg( s_docId++ ); setName( tmp.latin1() ); } @@ -307,7 +307,7 @@ bool KivioDoc::saveOasis(KoStore* store, KoXmlWriter* manifestWriter) KoGenStyle pageLayout = Kivio::Config::defaultPageLayout().saveOasis(); TQString layoutName = styles.lookup(pageLayout, "PL"); KoGenStyle masterPage(KoGenStyle::STYLE_MASTER); - masterPage.addAttribute("style:page-tqlayout-name", layoutName); + masterPage.addAttribute("style:page-layout-name", layoutName); styles.lookup(masterPage, "Standard", false); if(!store->open("content.xml")) { @@ -345,7 +345,7 @@ bool KivioDoc::saveOasis(KoStore* store, KoXmlWriter* manifestWriter) TQValueList<KoGenStyles::NamedStyle>::const_iterator it = styleList.begin(); for ( ; it != styleList.end(); ++it) { - (*it).style->writeStyle(styleWriter, styles, "style:page-tqlayout", (*it).name, "style:page-tqlayout-properties"); + (*it).style->writeStyle(styleWriter, styles, "style:page-layout", (*it).name, "style:page-layout-properties"); } styleList = styles.styles(Kivio::STYLE_PAGE); @@ -627,7 +627,7 @@ bool KivioDoc::completeLoading( KoStore* ) KivioPage* KivioDoc::createPage() { TQString s( i18n("Page%1") ); - s = s.tqarg( m_iPageId++ ); + s = s.arg( m_iPageId++ ); KivioPage* t = new KivioPage(m_pMap, s); t->setPageName(s,true); diff --git a/kivio/kiviopart/kivio_icon_view.cpp b/kivio/kiviopart/kivio_icon_view.cpp index 179b6a49..94463366 100644 --- a/kivio/kiviopart/kivio_icon_view.cpp +++ b/kivio/kiviopart/kivio_icon_view.cpp @@ -26,9 +26,9 @@ #include "kivioglobal.h" #include "kivio_stencil.h" -#include <tqbrush.h> +#include <brush.h> #include <tqcursor.h> -#include <tqpalette.h> +#include <palette.h> #include <klocale.h> #include <kdebug.h> #include <kglobalsettings.h> diff --git a/kivio/kiviopart/kivio_icon_view.h b/kivio/kiviopart/kivio_icon_view.h index ec6fa163..8ceede64 100644 --- a/kivio/kiviopart/kivio_icon_view.h +++ b/kivio/kiviopart/kivio_icon_view.h @@ -23,7 +23,7 @@ #include <tqiconview.h> #include <tqptrlist.h> #include <tqpainter.h> -#include <tqpalette.h> +#include <palette.h> #include <tqpixmap.h> #include <tqdragobject.h> diff --git a/kivio/kiviopart/kivio_page.cpp b/kivio/kiviopart/kivio_page.cpp index 0b60344b..41fe984b 100644 --- a/kivio/kiviopart/kivio_page.cpp +++ b/kivio/kiviopart/kivio_page.cpp @@ -30,10 +30,10 @@ #include <tqptrstack.h> #include <tqbuffer.h> #include <tqmessagebox.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqpicture.h> #include <tqdom.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqdragobject.h> #include <tqmime.h> #include <tqsortedlist.h> @@ -153,7 +153,7 @@ TQDomElement KivioPage::save( TQDomDocument& doc ) page.setAttribute( "name", m_strName ); page.setAttribute( "hide", (int)m_bPageHide ); - // Create a child element for the page tqlayout + // Create a child element for the page layout TQDomElement layoutE = saveLayout( doc ); page.appendChild( layoutE ); @@ -194,7 +194,7 @@ void KivioPage::saveOasis(KoStore* /*store*/, KoXmlWriter* docWriter, KoGenStyle TQString layoutName = styles->lookup(pageLayout, "PL"); KoGenStyle masterPage(KoGenStyle::STYLE_MASTER); - masterPage.addAttribute("style:page-tqlayout-name", layoutName); + masterPage.addAttribute("style:page-layout-name", layoutName); TQString masterName = styles->lookup(masterPage, "MP"); docWriter->addAttribute("draw:master-page-name", masterName); @@ -324,17 +324,17 @@ bool KivioPage::loadOasis(const TQDomElement& page, KoOasisStyles& oasisStyles) return false; } - const TQDomElement *pageLayout = oasisStyles.findStyle(masterPage->attributeNS( KoXmlNS::style, "page-tqlayout-name", TQString() ) ); + const TQDomElement *pageLayout = oasisStyles.findStyle(masterPage->attributeNS( KoXmlNS::style, "page-layout-name", TQString() ) ); if(!pageLayout) { - kdDebug(430000) << "Couldn't find the pagetqlayout!" << endl; + kdDebug(430000) << "Couldn't find the pagelayout!" << endl; return false; } m_pPageLayout.loadOasis(*pageLayout); if(m_pPageLayout.ptWidth <= 1e-13 || m_pPageLayout.ptHeight <= 1e-13) { - kdDebug(430000) << "Non valid pagetqlayout!" << endl; + kdDebug(430000) << "Non valid pagelayout!" << endl; return false; } @@ -941,7 +941,7 @@ void KivioPage::copy() KivioDragObject* kdo = new KivioDragObject(); kdo->setStencilList(m_lstSelection); kdo->setStencilRect(getRectForAllSelectedStencils()); - TQApplication::tqclipboard()->setData(kdo, TQClipboard::Clipboard); + TQApplication::clipboard()->setData(kdo, TQClipboard::Clipboard); } void KivioPage::cut() @@ -987,7 +987,7 @@ void KivioPage::paste(KivioView* view) list.setAutoDelete(false); KivioDragObject kdo; - if(kdo.decode(TQApplication::tqclipboard()->data(TQClipboard::Clipboard), list, this)) { + if(kdo.decode(TQApplication::clipboard()->data(TQClipboard::Clipboard), list, this)) { unselectAllStencils(); KivioStencil* stencil = list.first(); diff --git a/kivio/kiviopart/kivio_page.h b/kivio/kiviopart/kivio_page.h index 16d9db48..bc7daeca 100644 --- a/kivio/kiviopart/kivio_page.h +++ b/kivio/kiviopart/kivio_page.h @@ -41,7 +41,7 @@ class DCOPObject; #include <tqintdict.h> #include <tqmemarray.h> #include <tqrect.h> -#include <tqpalette.h> +#include <palette.h> #include <tqwidget.h> #include <KoPoint.h> 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..25ea7af2 100644 --- a/kivio/kiviopart/kivio_stackbar.cpp +++ b/kivio/kiviopart/kivio_stackbar.cpp @@ -19,7 +19,7 @@ #include "kivio_stackbar.h" #include "stencilbarbutton.h" -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqapplication.h> @@ -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/kivio_stencil_geometry_panel.cpp b/kivio/kiviopart/kivio_stencil_geometry_panel.cpp index f7ea9121..064c8b50 100644 --- a/kivio/kiviopart/kivio_stencil_geometry_panel.cpp +++ b/kivio/kiviopart/kivio_stencil_geometry_panel.cpp @@ -1,6 +1,6 @@ #include "kivio_stencil_geometry_panel.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqpixmap.h> diff --git a/kivio/kiviopart/kivio_view.cpp b/kivio/kiviopart/kivio_view.cpp index 8d529449..282312a0 100644 --- a/kivio/kiviopart/kivio_view.cpp +++ b/kivio/kiviopart/kivio_view.cpp @@ -24,7 +24,7 @@ #include <time.h> #include <assert.h> -#include <tqlayout.h> +#include <layout.h> #include <tqwidgetstack.h> #include <tqsplitter.h> #include <tqpushbutton.h> @@ -37,7 +37,7 @@ #include <tqtoolbutton.h> #include <tqtimer.h> #include <tqbutton.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqprogressbar.h> #include <tqstringlist.h> @@ -153,7 +153,7 @@ KivioView::KivioView( TQWidget *_parent, const char *_name, KivioDoc* doc ) if(KStatusBar* sb = statusBar()) { // No statusbar in e.g. konqueror m_pageCountSLbl = new KStatusBarLabel(i18n("%1 current page, %2 total number of pages", - "Page %1/%2").tqarg(0).tqarg(0), PAGECOUNT_TEXT, sb); + "Page %1/%2").arg(0).arg(0), PAGECOUNT_TEXT, sb); addStatusBarItem(m_pageCountSLbl, 0, false); m_infoSLbl = new KStatusBarLabel("", INFO_TEXT, sb); @@ -163,8 +163,8 @@ KivioView::KivioView( TQWidget *_parent, const char *_name, KivioDoc* doc ) TQString unit = KoUnit::unitName(m_pDoc->unit()); KoPoint xy(0, 0); TQString text = i18n("%1 x coord, %2 y coord, %3 and %4 the unit", - "X: %1 %3 Y: %2 %4").tqarg(KGlobal::_locale->formatNumber(xy.x(), 2)) - .tqarg(KGlobal::_locale->formatNumber(xy.y(), 2)).tqarg(unit).tqarg(unit); + "X: %1 %3 Y: %2 %4").arg(KGlobal::_locale->formatNumber(xy.x(), 2)) + .arg(KGlobal::_locale->formatNumber(xy.y(), 2)).arg(unit).arg(unit); m_coordSLbl = new KStatusBarLabel(text, MOUSEPOS_TEXT, sb); addStatusBarItem(m_coordSLbl, 0, true); } @@ -245,20 +245,20 @@ KivioView::KivioView( TQWidget *_parent, const char *_name, KivioDoc* doc ) &(m_pCanvas->guideLines()), TQT_SLOT(moveGuide(const TQPoint&, bool, int))); connect(&(m_pCanvas->guideLines()), TQT_SIGNAL(guideLinesChanged(KoView*)), m_pDoc, TQT_SLOT(updateGuideLines(KoView*))); - TQGridLayout* tqlayout = new TQGridLayout(pRightSide); - tqlayout->addWidget(hRuler, 0, 1); - tqlayout->addWidget(vRuler, 1, 0); - tqlayout->addWidget(canvasBase, 1, 1); - tqlayout->addMultiCellLayout(tabLayout, 2, 2, 0, 1); - tqlayout->addMultiCellWidget(m_vertScrollBar, 0, 1, 2, 2); - tqlayout->setRowStretch(1, 10); - tqlayout->setColStretch(1, 10); + TQGridLayout* layout = new TQGridLayout(pRightSide); + layout->addWidget(hRuler, 0, 1); + layout->addWidget(vRuler, 1, 0); + layout->addWidget(canvasBase, 1, 1); + layout->addMultiCellLayout(tabLayout, 2, 2, 0, 1); + layout->addMultiCellWidget(m_vertScrollBar, 0, 1, 2, 2); + layout->setRowStretch(1, 10); + layout->setColStretch(1, 10); TQWidget::setFocusPolicy( TQ_StrongFocus ); setFocusProxy( m_pCanvas ); connect( TQT_TQOBJECT(this), TQT_SIGNAL( invalidated() ), m_pCanvas, TQT_SLOT( update() ) ); - connect( TQT_TQOBJECT(this), TQT_SIGNAL( regionInvalidated( const TQRegion&, bool ) ), m_pCanvas, TQT_SLOT( tqrepaint( const TQRegion&, bool ) ) ); + connect( TQT_TQOBJECT(this), TQT_SIGNAL( regionInvalidated( const TQRegion&, bool ) ), m_pCanvas, TQT_SLOT( repaint( const TQRegion&, bool ) ) ); setInstance(KivioFactory::global()); if ( !m_pDoc->isReadWrite() ) @@ -390,7 +390,7 @@ void KivioView::setupActions() m_editCut = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT(cutStencil()), actionCollection(), "cutStencil" ); m_editCopy = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(copyStencil()), actionCollection(), "copyStencil" ); m_editPaste = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT(pasteStencil()), actionCollection(), "pasteStencil" ); - connect(TQApplication::tqclipboard(), TQT_SIGNAL(dataChanged()), TQT_TQOBJECT(this), TQT_SLOT(clipboardDataChanged())); + connect(TQApplication::clipboard(), TQT_SIGNAL(dataChanged()), TQT_TQOBJECT(this), TQT_SLOT(clipboardDataChanged())); m_selectAll = KStdAction::selectAll(TQT_TQOBJECT(this), TQT_SLOT(selectAllStencils()), actionCollection(), "selectAllStencils"); m_selectNone = KStdAction::deselect(TQT_TQOBJECT(this), TQT_SLOT(unselectAllStencils()), actionCollection(), "unselectAllStencils"); @@ -1134,13 +1134,13 @@ void KivioView::ungroupStencils() void KivioView::selectAllStencils() { m_pActivePage->selectAllStencils(); - m_pCanvas->tqrepaint(); + m_pCanvas->repaint(); } void KivioView::unselectAllStencils() { m_pActivePage->unselectAllStencils(); - m_pCanvas->tqrepaint(); + m_pCanvas->repaint(); } TQColor KivioView::fgColor() const @@ -1733,7 +1733,7 @@ void KivioView::addStencilFromSpawner( KivioStencilSpawner *pSpawner, double x, m_pActivePage->addStencil( pStencil ); m_pActivePage->selectStencil( pStencil ); - // Mark the page as modified and tqrepaint + // Mark the page as modified and repaint m_pDoc->updateView(m_pActivePage); pluginManager()->activateDefaultTool(); m_pCanvas->updateAutoGuideLines(); @@ -1748,7 +1748,7 @@ void KivioView::alignStencilsDlg() m_pActivePage->alignStencils(dlg->align()); m_pActivePage->distributeStencils(dlg->distribute()); - m_pCanvas->tqrepaint(); + m_pCanvas->repaint(); } delete dlg; @@ -1842,8 +1842,8 @@ void KivioView::setMousePos( int mx, int my ) KoPoint xy = m_pCanvas->mapFromScreen(TQPoint(mx, my)); xy.setX(KoUnit::toUserValue(xy.x(), m_pDoc->unit())); xy.setY(KoUnit::toUserValue(xy.y(), m_pDoc->unit())); - TQString text = i18n("X: %1 %3 Y: %2 %4").tqarg(KGlobal::_locale->formatNumber(xy.x(), 2)) - .tqarg(KGlobal::_locale->formatNumber(xy.y(), 2)).tqarg(unit).tqarg(unit); + TQString text = i18n("X: %1 %3 Y: %2 %4").arg(KGlobal::_locale->formatNumber(xy.x(), 2)) + .arg(KGlobal::_locale->formatNumber(xy.y(), 2)).arg(unit).arg(unit); m_coordSLbl->setText(text); } } @@ -2113,7 +2113,7 @@ Kivio::PluginManager* KivioView::pluginManager() void KivioView::clipboardDataChanged() { - TQMimeSource* data = TQApplication::tqclipboard()->data(); + TQMimeSource* data = TQApplication::clipboard()->data(); KivioDragObject decoder(this); bool paste = decoder.canDecode(data); m_editPaste->setEnabled(paste); @@ -2191,7 +2191,7 @@ int KivioView::vTextAlign() void KivioView::updatePageStatusLabel() { - TQString text = i18n("Page %1/%2").tqarg(m_pDoc->map()->pageList().find(activePage()) + 1).tqarg(m_pDoc->map()->count()); + TQString text = i18n("Page %1/%2").arg(m_pDoc->map()->pageList().find(activePage()) + 1).arg(m_pDoc->map()->count()); m_pageCountSLbl->setText(text); } diff --git a/kivio/kiviopart/kivio_zoomaction.cpp b/kivio/kiviopart/kivio_zoomaction.cpp index c500f34a..dde3103a 100644 --- a/kivio/kiviopart/kivio_zoomaction.cpp +++ b/kivio/kiviopart/kivio_zoomaction.cpp @@ -29,18 +29,18 @@ ZoomAction::ZoomAction(TQObject* parent, const char* name) { setEditable(true); TQStringList lst; - lst << i18n("%1%").tqarg("33"); - lst << i18n("%1%").tqarg("50"); - lst << i18n("%1%").tqarg("75"); - lst << i18n("%1%").tqarg("100"); - lst << i18n("%1%").tqarg("125"); - lst << i18n("%1%").tqarg("150"); - lst << i18n("%1%").tqarg("200"); - lst << i18n("%1%").tqarg("250"); - lst << i18n("%1%").tqarg("350"); - lst << i18n("%1%").tqarg("400"); - lst << i18n("%1%").tqarg("450"); - lst << i18n("%1%").tqarg("500"); + lst << i18n("%1%").arg("33"); + lst << i18n("%1%").arg("50"); + lst << i18n("%1%").arg("75"); + lst << i18n("%1%").arg("100"); + lst << i18n("%1%").arg("125"); + lst << i18n("%1%").arg("150"); + lst << i18n("%1%").arg("200"); + lst << i18n("%1%").arg("250"); + lst << i18n("%1%").arg("350"); + lst << i18n("%1%").arg("400"); + lst << i18n("%1%").arg("450"); + lst << i18n("%1%").arg("500"); setItems(lst); } @@ -84,14 +84,14 @@ void ZoomAction::insertItem( int zoom ) TQStringList lst; for (TQValueList<int>::Iterator it = list.begin() ; it != list.end() ; ++it) - lst.append( i18n("%1%").tqarg(*it) ); + lst.append( i18n("%1%").arg(*it) ); setItems(lst); - setCurrentItem(lst.findIndex(i18n("%1%").tqarg(zoom))); + setCurrentItem(lst.findIndex(i18n("%1%").arg(zoom))); } void ZoomAction::setEditZoom( int zoom ) { - const TQString zt(i18n("%1%").tqarg(zoom)); + const TQString zt(i18n("%1%").arg(zoom)); setEditText(zt); } #include "kivio_zoomaction.moc" diff --git a/kivio/kiviopart/kiviodragobject.cpp b/kivio/kiviopart/kiviodragobject.cpp index 35a6d7ff..574afddc 100644 --- a/kivio/kiviopart/kiviodragobject.cpp +++ b/kivio/kiviopart/kiviodragobject.cpp @@ -22,7 +22,7 @@ #include <tqcstring.h> #include <tqstringlist.h> #include <tqdom.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqpixmap.h> #include <tqimage.h> @@ -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/kivioglobal.cpp b/kivio/kiviopart/kivioglobal.cpp index 7479af08..201eea08 100644 --- a/kivio/kiviopart/kivioglobal.cpp +++ b/kivio/kiviopart/kivioglobal.cpp @@ -44,52 +44,52 @@ struct PaperSizeDef { int unit; }; -void Kivio::savePageLayout(TQDomElement& e, const KoPageLayout& tqlayout) +void Kivio::savePageLayout(TQDomElement& e, const KoPageLayout& layout) { - XmlWriteFloat(e, "width", tqlayout.ptWidth); - XmlWriteFloat(e, "height", tqlayout.ptHeight); - XmlWriteFloat(e, "marginLeft", tqlayout.ptLeft); - XmlWriteFloat(e, "marginRight", tqlayout.ptRight); - XmlWriteFloat(e, "marginTop", tqlayout.ptTop); - XmlWriteFloat(e, "marginBottom", tqlayout.ptBottom); - XmlWriteString(e, "format", KoPageFormat::formatString(tqlayout.format)); - XmlWriteString(e, "orientation", Kivio::orientationString(tqlayout.orientation)); + XmlWriteFloat(e, "width", layout.ptWidth); + XmlWriteFloat(e, "height", layout.ptHeight); + XmlWriteFloat(e, "marginLeft", layout.ptLeft); + XmlWriteFloat(e, "marginRight", layout.ptRight); + XmlWriteFloat(e, "marginTop", layout.ptTop); + XmlWriteFloat(e, "marginBottom", layout.ptBottom); + XmlWriteString(e, "format", KoPageFormat::formatString(layout.format)); + XmlWriteString(e, "orientation", Kivio::orientationString(layout.orientation)); } -// ## TODO: remove this method, now that tqlayout.saveOasis() does it all -KoGenStyle Kivio::savePageLayout(const KoPageLayout& tqlayout) +// ## TODO: remove this method, now that layout.saveOasis() does it all +KoGenStyle Kivio::savePageLayout(const KoPageLayout& layout) { - return tqlayout.saveOasis(); + return layout.saveOasis(); } KoPageLayout Kivio::loadPageLayout(const TQDomElement& e) { - KoPageLayout tqlayout; + KoPageLayout layout; if(e.hasAttribute("unit")) { // Compatibility with Kivio <= 1.2.x kdDebug(43000) << "Compatibility mode..." << endl; KoUnit::Unit unit = Kivio::convToKoUnit(XmlReadInt(e, "unit", 0)); - tqlayout.ptWidth = KoUnit::fromUserValue(XmlReadFloat(e, "width", 0.0), unit); - tqlayout.ptHeight = KoUnit::fromUserValue(XmlReadFloat(e, "height", 0.0), unit); - tqlayout.ptLeft = KoUnit::fromUserValue(XmlReadFloat(e, "marginLeft", 0.0), unit); - tqlayout.ptRight = KoUnit::fromUserValue(XmlReadFloat(e, "marginRight", 0.0), unit); - tqlayout.ptTop = KoUnit::fromUserValue(XmlReadFloat(e, "marginTop", 0.0), unit); - tqlayout.ptBottom = KoUnit::fromUserValue(XmlReadFloat(e, "marginBottom", 0.0), unit); - Kivio::setFormatOrientation(tqlayout); + layout.ptWidth = KoUnit::fromUserValue(XmlReadFloat(e, "width", 0.0), unit); + layout.ptHeight = KoUnit::fromUserValue(XmlReadFloat(e, "height", 0.0), unit); + layout.ptLeft = KoUnit::fromUserValue(XmlReadFloat(e, "marginLeft", 0.0), unit); + layout.ptRight = KoUnit::fromUserValue(XmlReadFloat(e, "marginRight", 0.0), unit); + layout.ptTop = KoUnit::fromUserValue(XmlReadFloat(e, "marginTop", 0.0), unit); + layout.ptBottom = KoUnit::fromUserValue(XmlReadFloat(e, "marginBottom", 0.0), unit); + Kivio::setFormatOrientation(layout); kdDebug(43000) << "Ready." << endl; } else { - tqlayout.ptWidth = XmlReadFloat(e, "width", 0.0); - tqlayout.ptHeight = XmlReadFloat(e, "height", 0.0); - tqlayout.ptLeft = XmlReadFloat(e, "marginLeft", 0.0); - tqlayout.ptRight = XmlReadFloat(e, "marginRight", 0.0); - tqlayout.ptTop = XmlReadFloat(e, "marginTop", 0.0); - tqlayout.ptBottom = XmlReadFloat(e, "marginBottom", 0.0); - tqlayout.format = KoPageFormat::formatFromString(XmlReadString(e, "format", pageSizeString(KGlobal::locale()->pageSize()))); - tqlayout.orientation = Kivio::orientationFromString(XmlReadString(e, "orientation", "Portrait")); + layout.ptWidth = XmlReadFloat(e, "width", 0.0); + layout.ptHeight = XmlReadFloat(e, "height", 0.0); + layout.ptLeft = XmlReadFloat(e, "marginLeft", 0.0); + layout.ptRight = XmlReadFloat(e, "marginRight", 0.0); + layout.ptTop = XmlReadFloat(e, "marginTop", 0.0); + layout.ptBottom = XmlReadFloat(e, "marginBottom", 0.0); + layout.format = KoPageFormat::formatFromString(XmlReadString(e, "format", pageSizeString(KGlobal::locale()->pageSize()))); + layout.orientation = Kivio::orientationFromString(XmlReadString(e, "orientation", "Portrait")); } - return tqlayout; + return layout; } KoUnit::Unit Kivio::convToKoUnit(int tkUnit) @@ -132,7 +132,7 @@ KoOrientation Kivio::orientationFromString(const TQString& s) return PG_PORTRAIT; } -void Kivio::setFormatOrientation(KoPageLayout& tqlayout) +void Kivio::setFormatOrientation(KoPageLayout& layout) { const PaperSizeDef PapersTable[] = { {"A0",841,1189,KoUnit::U_MM}, @@ -166,20 +166,20 @@ void Kivio::setFormatOrientation(KoPageLayout& tqlayout) PaperSizeDef sizeDef = PapersTable[0]; bool found = false; float width, height; - tqlayout.format = PG_CUSTOM; - tqlayout.orientation = PG_PORTRAIT; + layout.format = PG_CUSTOM; + layout.orientation = PG_PORTRAIT; while((sizeDef.unit != -2) && !found) { width = KoUnit::fromUserValue(sizeDef.width, static_cast<KoUnit::Unit>(sizeDef.unit)); height = KoUnit::fromUserValue(sizeDef.height, static_cast<KoUnit::Unit>(sizeDef.unit)); - if((tqlayout.ptWidth == width) && (tqlayout.ptHeight == height)) { - tqlayout.format = KoPageFormat::formatFromString(sizeDef.title); - tqlayout.orientation = PG_PORTRAIT; + if((layout.ptWidth == width) && (layout.ptHeight == height)) { + layout.format = KoPageFormat::formatFromString(sizeDef.title); + layout.orientation = PG_PORTRAIT; found = true; - } else if((tqlayout.ptWidth == height) && (tqlayout.ptHeight == width)) { - tqlayout.format = KoPageFormat::formatFromString(sizeDef.title); - tqlayout.orientation = PG_LANDSCAPE; + } else if((layout.ptWidth == height) && (layout.ptHeight == width)) { + layout.format = KoPageFormat::formatFromString(sizeDef.title); + layout.orientation = PG_LANDSCAPE; found = true; } diff --git a/kivio/kiviopart/kivioglobal.h b/kivio/kiviopart/kivioglobal.h index 1e94f79b..cd0fe3d6 100644 --- a/kivio/kiviopart/kivioglobal.h +++ b/kivio/kiviopart/kivioglobal.h @@ -37,12 +37,12 @@ namespace Kivio }; /** - * Save a page tqlayout to a TQDomElement + * Save a page layout to a TQDomElement */ - void savePageLayout(TQDomElement& e, const KoPageLayout& tqlayout); - KoGenStyle savePageLayout(const KoPageLayout& tqlayout); + void savePageLayout(TQDomElement& e, const KoPageLayout& layout); + KoGenStyle savePageLayout(const KoPageLayout& layout); /** - * Load a page tqlayout from a TQDomElement + * Load a page layout from a TQDomElement */ KoPageLayout loadPageLayout(const TQDomElement& e); /** @@ -57,7 +57,7 @@ namespace Kivio * Return the orientation based on the string */ KoOrientation orientationFromString(const TQString& s); - void setFormatOrientation(KoPageLayout& tqlayout); + void setFormatOrientation(KoPageLayout& layout); /** * Load a KoSize from a TQDomElement diff --git a/kivio/kiviopart/kiviosdk/diapathparser.cpp b/kivio/kiviopart/kiviosdk/diapathparser.cpp index 1af85056..e071a8e6 100644 --- a/kivio/kiviopart/kiviosdk/diapathparser.cpp +++ b/kivio/kiviopart/kiviosdk/diapathparser.cpp @@ -48,8 +48,8 @@ void DiaPointFinder::svgClosePath() { } -DiaPathParser::DiaPathParser(TQDomDocument *doc, TQDomElement *tqshape, float xscale, float yscale, float lowestx, float lowesty) : - SVGPathParser(), m_doc(doc), m_tqshape(tqshape), +DiaPathParser::DiaPathParser(TQDomDocument *doc, TQDomElement *shape, float xscale, float yscale, float lowestx, float lowesty) : + SVGPathParser(), m_doc(doc), m_shape(shape), m_xscale(xscale), m_yscale(yscale), m_lowestx(lowestx), m_lowesty(lowesty) { @@ -72,12 +72,12 @@ void DiaPathParser::svgLineTo( double x1, double y1, bool ) TQDomElement kivioPointElement = m_doc->createElement("KivioPoint"); kivioPointElement.setAttribute("x", TQString::number(diaPointToKivio(lastX,true) * m_xscale)); kivioPointElement.setAttribute("y", TQString::number(diaPointToKivio(lastY, false) * m_yscale)); - m_tqshape->appendChild(kivioPointElement); + m_shape->appendChild(kivioPointElement); kivioPointElement = m_doc->createElement("KivioPoint"); kivioPointElement.setAttribute("x", TQString::number(diaPointToKivio(currentX,true) * m_xscale)); kivioPointElement.setAttribute("y", TQString::number(diaPointToKivio(currentY, false) * m_yscale)); - m_tqshape->appendChild(kivioPointElement); + m_shape->appendChild(kivioPointElement); lastX = currentX; lastY = currentY; } @@ -99,7 +99,7 @@ void DiaPathParser::svgCurveToCubic( double x1, double y1, double x2, double y2, kivioPointElement.setAttribute("y", TQString::number(diaPointToKivio(lastY, false) * m_yscale)); kivioPointElement.setAttribute("type", "bezier"); - m_tqshape->appendChild(kivioPointElement); + m_shape->appendChild(kivioPointElement); kivioPointElement = m_doc->createElement("KivioPoint"); kivioPointElement.setAttribute("x", @@ -107,7 +107,7 @@ void DiaPathParser::svgCurveToCubic( double x1, double y1, double x2, double y2, kivioPointElement.setAttribute("y", TQString::number(diaPointToKivio(lastControlY, false) * m_yscale)); kivioPointElement.setAttribute("type", "bezier"); - m_tqshape->appendChild(kivioPointElement); + m_shape->appendChild(kivioPointElement); kivioPointElement = m_doc->createElement("KivioPoint"); kivioPointElement.setAttribute("x", @@ -115,7 +115,7 @@ void DiaPathParser::svgCurveToCubic( double x1, double y1, double x2, double y2, kivioPointElement.setAttribute("y", TQString::number(diaPointToKivio(currentControlY, false) * m_yscale)); kivioPointElement.setAttribute("type", "bezier"); - m_tqshape->appendChild(kivioPointElement); + m_shape->appendChild(kivioPointElement); kivioPointElement = m_doc->createElement("KivioPoint"); kivioPointElement.setAttribute("x", @@ -123,7 +123,7 @@ void DiaPathParser::svgCurveToCubic( double x1, double y1, double x2, double y2, kivioPointElement.setAttribute("y", TQString::number(diaPointToKivio(currentY, false) * m_yscale)); kivioPointElement.setAttribute("type", "bezier"); - m_tqshape->appendChild(kivioPointElement); + m_shape->appendChild(kivioPointElement); lastX = currentX; lastY = currentY; } diff --git a/kivio/kiviopart/kiviosdk/diapathparser.h b/kivio/kiviopart/kiviosdk/diapathparser.h index 0a9439f6..5308c468 100644 --- a/kivio/kiviopart/kiviosdk/diapathparser.h +++ b/kivio/kiviopart/kiviosdk/diapathparser.h @@ -41,7 +41,7 @@ class DiaPointFinder : public SVGPathParser class DiaPathParser : public SVGPathParser { public: - DiaPathParser(TQDomDocument *doc, TQDomElement *tqshape, float xscale, float yscale, float lowestx, float lowesty); + DiaPathParser(TQDomDocument *doc, TQDomElement *shape, float xscale, float yscale, float lowestx, float lowesty); void svgMoveTo( double x1, double y1, bool abs = true ); void svgLineTo( double x1, double y1, bool abs = true ); @@ -52,7 +52,7 @@ class DiaPathParser : public SVGPathParser float diaPointToKivio(float point, bool xpoint); TQDomDocument *m_doc; - TQDomElement *m_tqshape; + TQDomElement *m_shape; float lastX; float lastY; float m_xscale; diff --git a/kivio/kiviopart/kiviosdk/kivio_1d_stencil.h b/kivio/kiviopart/kiviosdk/kivio_1d_stencil.h index b42d650b..8162bcd2 100644 --- a/kivio/kiviopart/kiviosdk/kivio_1d_stencil.h +++ b/kivio/kiviopart/kiviosdk/kivio_1d_stencil.h @@ -124,7 +124,7 @@ public: virtual void customDrag( KivioCustomDragData * ); - // tqgeometry management + // geometry management virtual void updateGeometry(); virtual void updateConnectorPoints( KivioConnectorPoint *, double, double ); diff --git a/kivio/kiviopart/kiviosdk/kivio_base_connector_stencil.h b/kivio/kiviopart/kiviosdk/kivio_base_connector_stencil.h index f7e2dddb..1e0a76de 100644 --- a/kivio/kiviopart/kiviosdk/kivio_base_connector_stencil.h +++ b/kivio/kiviopart/kiviosdk/kivio_base_connector_stencil.h @@ -100,7 +100,7 @@ public: virtual void customDrag( KivioCustomDragData * ); - // tqgeometry management + // geometry management virtual void updateGeometry(); diff --git a/kivio/kiviopart/kiviosdk/kivio_base_target_stencil.cpp b/kivio/kiviopart/kiviosdk/kivio_base_target_stencil.cpp index e41f5788..b290fb62 100644 --- a/kivio/kiviopart/kiviosdk/kivio_base_target_stencil.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_base_target_stencil.cpp @@ -501,7 +501,7 @@ void KivioBaseTargetStencil::copyBasicInto( KivioBaseTargetStencil *pStencil ) pTgTarget = pStencil->m_pTargets->next(); } - // Copy the tqgeometry + // Copy the geometry pStencil->m_x = m_x; pStencil->m_y = m_y; pStencil->m_w = m_w; diff --git a/kivio/kiviopart/kiviosdk/kivio_common.cpp b/kivio/kiviopart/kiviosdk/kivio_common.cpp index b67efc23..3dd8b428 100644 --- a/kivio/kiviopart/kiviosdk/kivio_common.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_common.cpp @@ -330,7 +330,7 @@ void XmlWriteDouble( TQDomElement &e, const TQString &att, const double &val ) * across two quadrants, you need to determine which side of the test point it crossed, and then * either add or subtract 2. * - * Quad tqlayout: + * Quad layout: * 1 2 * 4 3 */ @@ -423,7 +423,7 @@ KoRect XmlReadRect( const TQDomElement &e, const TQString &att, const KoRect &de void XmlWriteRect( TQDomElement &e, const TQString &att, const KoRect &val ) { - e.setAttribute( att, TQString("[%1,%2,%3,%4]").tqarg(val.x()).tqarg(val.y()).tqarg(val.width()).tqarg(val.height()) ); + e.setAttribute( att, TQString("[%1,%2,%3,%4]").arg(val.x()).arg(val.y()).arg(val.width()).arg(val.height()) ); } diff --git a/kivio/kiviopart/kiviosdk/kivio_connector_point.cpp b/kivio/kiviopart/kiviosdk/kivio_connector_point.cpp index 0208f932..d408bee6 100644 --- a/kivio/kiviopart/kiviosdk/kivio_connector_point.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_connector_point.cpp @@ -83,10 +83,10 @@ void KivioConnectorPoint::setTarget( KivioConnectorTarget *pTarget ) * Sets the x coordinate. * * @param newX The new value - * @param updateStencil Whether or not the stencil's tqgeometry should be updated (def=true) + * @param updateStencil Whether or not the stencil's geometry should be updated (def=true) * * Sets the X coordinate to a new value, and optionally - * updates the stencil's tqgeometry if updateStencil is true. + * updates the stencil's geometry if updateStencil is true. */ void KivioConnectorPoint::setX( double newX, bool updateStencil ) { @@ -102,10 +102,10 @@ void KivioConnectorPoint::setX( double newX, bool updateStencil ) * Sets the y coordinate. * * @param newY The new value - * @param updateStencil Whether or not the stencil's tqgeometry should be updated (def=true) + * @param updateStencil Whether or not the stencil's geometry should be updated (def=true) * * Sets the Y coordinate to a new value, and optionally - * updates the stencil's tqgeometry if updateStencil is true. + * updates the stencil's geometry if updateStencil is true. */ void KivioConnectorPoint::setY( double newY, bool updateStencil ) { @@ -122,10 +122,10 @@ void KivioConnectorPoint::setY( double newY, bool updateStencil ) * * @param newX The new x value * @param newY The new y value - * @param updateStencil Whether or not the stencil's tqgeometry should be updated (def=true) + * @param updateStencil Whether or not the stencil's geometry should be updated (def=true) * * Sets the X & Y coordinates to new values, and optionally - * updates the stencil's tqgeometry if updateStencil is true. + * updates the stencil's geometry if updateStencil is true. */ void KivioConnectorPoint::setPosition( double newX, double newY, bool updateStencil ) { diff --git a/kivio/kiviopart/kiviosdk/kivio_dia_stencil_spawner.cpp b/kivio/kiviopart/kiviosdk/kivio_dia_stencil_spawner.cpp index 4407d2d0..ada33c4c 100644 --- a/kivio/kiviopart/kiviosdk/kivio_dia_stencil_spawner.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_dia_stencil_spawner.cpp @@ -83,7 +83,7 @@ bool KivioDiaStencilSpawner::load(const TQString &file) return false; } dia.setContent(&f); - TQDomNode diaMain = dia.namedItem("tqshape"); + TQDomNode diaMain = dia.namedItem("shape"); // Set "creator" attribute TQDomElement firstElement = kivio.createElement("KivioShapeStencil"); @@ -250,7 +250,7 @@ bool KivioDiaStencilSpawner::load(const TQString &file) //} //else { - // scale the tqshape to be close to 30 by 30 + // scale the shape to be close to 30 by 30 m_yscale = 30.0/(m_highesty - m_lowesty); m_xscale = 30.0/(m_highestx - m_lowestx); } @@ -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_fill_style.h b/kivio/kiviopart/kiviosdk/kivio_fill_style.h index 4be7303b..ea776f20 100644 --- a/kivio/kiviopart/kiviosdk/kivio_fill_style.h +++ b/kivio/kiviopart/kiviosdk/kivio_fill_style.h @@ -19,7 +19,7 @@ #ifndef KIVIO_FILL_STYLE_H #define KIVIO_FILL_STYLE_H -#include <tqbrush.h> +#include <brush.h> #include <tqcolor.h> #include <tqdom.h> diff --git a/kivio/kiviopart/kiviosdk/kivio_py_stencil.cpp b/kivio/kiviopart/kiviosdk/kivio_py_stencil.cpp index cc8eb0e3..f966dc07 100644 --- a/kivio/kiviopart/kiviosdk/kivio_py_stencil.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_py_stencil.cpp @@ -25,7 +25,7 @@ KivioView *view; #include "kivio_page.h" #include <tqpainter.h> -#include <tqbrush.h> +#include <brush.h> #include <tqcolor.h> #include <kdebug.h> #include <math.h> @@ -63,7 +63,7 @@ KivioPyStencil::KivioPyStencil() vars = Py_BuildValue( "{s:d,s:d,s:d,s:d,s:d,s:d,s:{},s:[],s:[],s:{}}", - "x", m_x, "y", m_y, "w", m_w, "h", m_h, "x2", x2, "y2", y2 , "style","connectors","connector_targets","tqshapes"); + "x", m_x, "y", m_y, "w", m_w, "h", m_h, "x2", x2, "y2", y2 , "style","connectors","connector_targets","shapes"); resizeCode = ""; } @@ -406,45 +406,45 @@ void KivioPyStencil::paint( KivioIntraStencilData *d, bool outlined ) { KoZoomHandler* zoomHandler = d->zoomHandler; - PyObject *tqshapes = PyDict_Values( PyDict_GetItemString( vars, "tqshapes" ) ); + PyObject *shapes = PyDict_Values( PyDict_GetItemString( vars, "shapes" ) ); - if ( !tqshapes ) { + if ( !shapes ) { return; } - int size = PyList_Size( tqshapes ); + int size = PyList_Size( shapes ); for ( int i=0; i<size; i++ ) { - PyObject *tqshape = PyList_GetItem( tqshapes, i ); - if ( !PyDict_Check(tqshape) ) + PyObject *shape = PyList_GetItem( shapes, i ); + if ( !PyDict_Check(shape) ) continue; int fill = KivioFillStyle::kcsNone; - // if style dosn't defined for tqshape, applay default for stencil + // if style dosn't defined for shape, applay default for stencil setStyle( d, PyDict_GetItemString( vars, "style" ) , fill ); - setStyle( d, tqshape, fill ); + setStyle( d, shape, fill ); if ( isSelected() ) - setStyle( d, PyDict_GetItemString( tqshape, "selected" ) , fill ); + setStyle( d, PyDict_GetItemString( shape, "selected" ) , fill ); if ( outlined ) fill = KivioFillStyle::kcsNone; - TQString stype = getStringFromDict( tqshape, "type" ); + TQString stype = getStringFromDict( shape, "type" ); stype = stype.lower(); - double x = zoomHandler->zoomItX(getDoubleFromDict(tqshape,"x")); - double y = zoomHandler->zoomItY(getDoubleFromDict(tqshape,"y")); - double w = zoomHandler->zoomItX(getDoubleFromDict(tqshape,"w")); - double h = zoomHandler->zoomItY(getDoubleFromDict(tqshape,"h")); - //double x2 = zoomHandler->zoomItX(getDoubleFromDict(tqshape,"x2")); - //double y2 = zoomHandler->zoomItY(getDoubleFromDict(tqshape,"y2")); + double x = zoomHandler->zoomItX(getDoubleFromDict(shape,"x")); + double y = zoomHandler->zoomItY(getDoubleFromDict(shape,"y")); + double w = zoomHandler->zoomItX(getDoubleFromDict(shape,"w")); + double h = zoomHandler->zoomItY(getDoubleFromDict(shape,"h")); + //double x2 = zoomHandler->zoomItX(getDoubleFromDict(shape,"x2")); + //double y2 = zoomHandler->zoomItY(getDoubleFromDict(shape,"y2")); // get points list TQPtrList<KivioPoint> points; points.setAutoDelete(true); - PyObject *pyPoints = PyDict_GetItemString( tqshape, "points" ); + PyObject *pyPoints = PyDict_GetItemString( shape, "points" ); if ( pyPoints && PyList_Check(pyPoints) ) { int size = PyList_Size(pyPoints); for ( int i=0; i<size; i++ ) { @@ -470,7 +470,7 @@ void KivioPyStencil::paint( KivioIntraStencilData *d, bool outlined ) f.setPointSizeFloat(f.pointSizeFloat() * (((float)zoomHandler->zoom()) / 100.0)); d->painter->setFont( f ); - TQString text = getStringFromDict(tqshape,"text"); + TQString text = getStringFromDict(shape,"text"); if ( !text.isEmpty() ) { d->painter->drawText( int( x ), int( y ), int( w ), int( h ), tf | TQt::WordBreak, text ); @@ -478,14 +478,14 @@ void KivioPyStencil::paint( KivioIntraStencilData *d, bool outlined ) } if ( stype == "arc" ) { - double a1 = getDoubleFromDict(tqshape,"a1"); - double a2 = getDoubleFromDict(tqshape,"a2"); + double a1 = getDoubleFromDict(shape,"a1"); + double a2 = getDoubleFromDict(shape,"a2"); d->painter->drawArc(x,y,w,h,a1,a2); } if ( stype == "roundrect" ) { - double rx = zoomHandler->zoomItX(getDoubleFromDict(tqshape,"rx")); - double ry = zoomHandler->zoomItY(getDoubleFromDict(tqshape,"ry")); + double rx = zoomHandler->zoomItX(getDoubleFromDict(shape,"rx")); + double ry = zoomHandler->zoomItY(getDoubleFromDict(shape,"ry")); if (fill) { d->painter->fillRoundRect( x, y, w, h, rx, ry ); @@ -924,7 +924,7 @@ void KivioPyStencil::setLineWidth( double w ) void KivioPyStencil::setText( const TQString &s ) { - PyObject *to = PyDict_GetItemString( PyDict_GetItemString(vars,"tqshapes"), "text" ); + PyObject *to = PyDict_GetItemString( PyDict_GetItemString(vars,"shapes"), "text" ); if ( to ) PyDict_SetItemString(to, "text", Py_BuildValue("s", s.latin1() )); } @@ -932,7 +932,7 @@ void KivioPyStencil::setText( const TQString &s ) TQString KivioPyStencil::text() { - PyObject *to = PyDict_GetItemString( PyDict_GetItemString(vars,"tqshapes"), "text" ); + PyObject *to = PyDict_GetItemString( PyDict_GetItemString(vars,"shapes"), "text" ); if ( to ) { return getStringFromDict(to, "text"); } diff --git a/kivio/kiviopart/kiviosdk/kivio_screen_painter.cpp b/kivio/kiviopart/kiviosdk/kivio_screen_painter.cpp index 07f005fa..307a86e3 100644 --- a/kivio/kiviopart/kiviosdk/kivio_screen_painter.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_screen_painter.cpp @@ -23,9 +23,9 @@ #include <tqimage.h> #include <tqpen.h> -#include <tqbrush.h> +#include <brush.h> #include <tqsimplerichtext.h> -#include <tqpalette.h> +#include <palette.h> #include <kdebug.h> @@ -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/kiviosdk/kivio_shape.cpp b/kivio/kiviopart/kiviosdk/kivio_shape.cpp index dad8459a..302c6547 100644 --- a/kivio/kiviopart/kiviosdk/kivio_shape.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_shape.cpp @@ -44,7 +44,7 @@ KivioShape::KivioShape() */ KivioShape::KivioShape( const KivioShape &source ) { - source.m_tqshapeData.copyInto( &m_tqshapeData ); + source.m_shapeData.copyInto( &m_shapeData ); } @@ -68,7 +68,7 @@ void KivioShape::copyInto( KivioShape *pTarget ) const if( !pTarget ) return; - m_tqshapeData.copyInto( &(pTarget->m_tqshapeData) ); + m_shapeData.copyInto( &(pTarget->m_shapeData) ); } @@ -84,13 +84,13 @@ bool KivioShape::loadXML( const TQDomElement &e ) TQDomNode node = e.firstChild(); TQString name = XmlReadString( e, "name", "" ); - m_tqshapeData.setName( name ); - m_tqshapeData.setShapeType( (KivioShapeData::KivioShapeType)XmlReadInt( e, "tqshapeType", -1 )); + m_shapeData.setName( name ); + m_shapeData.setShapeType( (KivioShapeData::KivioShapeType)XmlReadInt( e, "shapeType", -1 )); - if( m_tqshapeData.name().isEmpty() || - m_tqshapeData.tqshapeType() == -1 ) + if( m_shapeData.name().isEmpty() || + m_shapeData.shapeType() == -1 ) { - kdWarning(43000) << "-LOAD KivioShape::loadXML() - Unknown tqshape or bad name read. Shape load aborted." << endl; + kdWarning(43000) << "-LOAD KivioShape::loadXML() - Unknown shape or bad name read. Shape load aborted." << endl; return false; } @@ -101,7 +101,7 @@ bool KivioShape::loadXML( const TQDomElement &e ) if( nodeName == "KivioShapeData" ) { - m_tqshapeData.loadXML( ele ); + m_shapeData.loadXML( ele ); } node = node.nextSibling(); @@ -120,17 +120,17 @@ TQDomElement KivioShape::saveXML( TQDomDocument &doc ) { TQDomElement e = doc.createElement("KivioShape"); - XmlWriteString( e, "name", m_tqshapeData.m_name ); - XmlWriteInt( e, "tqshapeType", m_tqshapeData.m_tqshapeType ); + XmlWriteString( e, "name", m_shapeData.m_name ); + XmlWriteInt( e, "shapeType", m_shapeData.m_shapeType ); - e.appendChild( m_tqshapeData.saveXML( doc ) ); + e.appendChild( m_shapeData.saveXML( doc ) ); return e; } /** - * Loads a tqshape of type arc + * Loads a shape of type arc * * @param e The element to load from * @returns A newly allocated KivioShape, or NULL on error. @@ -144,7 +144,7 @@ KivioShape *KivioShape::loadShapeArc( const TQDomElement & ) /** - * Loads a tqshape of type closed-path. + * Loads a shape of type closed-path. * * @param e The element to load from. * @returns A newly allocated KivioShape, or NULL on error. @@ -157,12 +157,12 @@ KivioShape *KivioShape::loadShapeClosedPath( const TQDomElement &e ) TQString nodeName; - // Create the new tqshape to load into + // Create the new shape to load into pShape = new KivioShape(); // Load the type, name, and lineWidth properties - pShape->m_tqshapeData.m_tqshapeType = KivioShapeData::kstClosedPath; - pShape->m_tqshapeData.m_name = XmlReadString( e, "name", "" ); + pShape->m_shapeData.m_shapeType = KivioShapeData::kstClosedPath; + pShape->m_shapeData.m_name = XmlReadString( e, "name", "" ); // Iterate through the nodes loading the various items node = e.firstChild(); @@ -176,16 +176,16 @@ KivioShape *KivioShape::loadShapeClosedPath( const TQDomElement &e ) // Allocate a new point, load it, and store it in the list pPoint = new KivioPoint(0.0f, 0.0f, KivioPoint::kptBezier); pPoint->loadXML( node.toElement() ); - pShape->m_tqshapeData.m_pOriginalPointList->append( pPoint ); + pShape->m_shapeData.m_pOriginalPointList->append( pPoint ); pPoint = NULL; } else if( nodeName == "KivioFillStyle" ) { - pShape->m_tqshapeData.m_pFillStyle->loadXML( node.toElement() ); + pShape->m_shapeData.m_pFillStyle->loadXML( node.toElement() ); } else if( nodeName == "KivioLineStyle" ) { - pShape->m_tqshapeData.m_pLineStyle->loadXML( node.toElement() ); + pShape->m_shapeData.m_pLineStyle->loadXML( node.toElement() ); } node = node.nextSibling(); @@ -196,7 +196,7 @@ KivioShape *KivioShape::loadShapeClosedPath( const TQDomElement &e ) /** - * Loads a tqshape of type bezier + * Loads a shape of type bezier * * @param e The element to load from. * @returns A newly allocated KivioShape, or NULL on error. @@ -209,12 +209,12 @@ KivioShape *KivioShape::loadShapeBezier( const TQDomElement &e ) TQString nodeName; - // Create the new tqshape to load into + // Create the new shape to load into pShape = new KivioShape(); // Load the type, name, and lineWidth properties - pShape->m_tqshapeData.m_tqshapeType = KivioShapeData::kstBezier; - pShape->m_tqshapeData.m_name = XmlReadString( e, "name", "" ); + pShape->m_shapeData.m_shapeType = KivioShapeData::kstBezier; + pShape->m_shapeData.m_name = XmlReadString( e, "name", "" ); // Iterate through the nodes loading the various items node = e.firstChild(); @@ -230,25 +230,25 @@ KivioShape *KivioShape::loadShapeBezier( const TQDomElement &e ) pPoint->loadXML( node.toElement() ); if( pPoint->pointType() != KivioPoint::kptBezier ) { - kdDebug(43000) << "KivioShape::loadShapeBezier() - Non-bezier point found. Aborting tqshape." << endl; + kdDebug(43000) << "KivioShape::loadShapeBezier() - Non-bezier point found. Aborting shape." << endl; delete pPoint; delete pShape; return NULL; } - pShape->m_tqshapeData.m_pOriginalPointList->append( pPoint ); + pShape->m_shapeData.m_pOriginalPointList->append( pPoint ); pPoint = NULL; } else if( nodeName == "KivioLineStyle" ) { - pShape->m_tqshapeData.m_pLineStyle->loadXML( node.toElement() ); + pShape->m_shapeData.m_pLineStyle->loadXML( node.toElement() ); } node = node.nextSibling(); } - if( pShape->m_tqshapeData.m_pOriginalPointList->count() != 4 ) + if( pShape->m_shapeData.m_pOriginalPointList->count() != 4 ) { - kdDebug(43000) << "KivioShape::loadShapeBezier() - Wrong number of points loaded, should be 4, tqshape aborted" << endl; + kdDebug(43000) << "KivioShape::loadShapeBezier() - Wrong number of points loaded, should be 4, shape aborted" << endl; delete pShape; return NULL; } @@ -258,7 +258,7 @@ KivioShape *KivioShape::loadShapeBezier( const TQDomElement &e ) /** - * Loads a tqshape of type ellipse. + * Loads a shape of type ellipse. * * @param e The element to load from. * @returns A newly allocated KivioShape, or NULL on error. @@ -270,15 +270,15 @@ KivioShape *KivioShape::loadShapeEllipse( const TQDomElement &e ) TQString nodeName; - // Create the new tqshape to load into + // Create the new shape to load into pShape = new KivioShape(); // Load the type, name, and lineWidth properties - pShape->m_tqshapeData.m_tqshapeType = KivioShapeData::kstEllipse; - pShape->m_tqshapeData.m_name = XmlReadString( e, "name", "" ); + pShape->m_shapeData.m_shapeType = KivioShapeData::kstEllipse; + pShape->m_shapeData.m_name = XmlReadString( e, "name", "" ); - pShape->m_tqshapeData.m_position.set( XmlReadFloat( e, "x", 0.0f ), XmlReadFloat( e, "y", 0.0f ) ); - pShape->m_tqshapeData.m_dimensions.set( XmlReadFloat( e, "w", 0.0f ), XmlReadFloat( e, "h", 0.0f ) ); + pShape->m_shapeData.m_position.set( XmlReadFloat( e, "x", 0.0f ), XmlReadFloat( e, "y", 0.0f ) ); + pShape->m_shapeData.m_dimensions.set( XmlReadFloat( e, "w", 0.0f ), XmlReadFloat( e, "h", 0.0f ) ); // Iterate through the nodes loading the various items node = e.firstChild(); @@ -288,11 +288,11 @@ KivioShape *KivioShape::loadShapeEllipse( const TQDomElement &e ) if( nodeName == "KivioFillStyle" ) { - pShape->m_tqshapeData.m_pFillStyle->loadXML( node.toElement() ); + pShape->m_shapeData.m_pFillStyle->loadXML( node.toElement() ); } else if( nodeName == "KivioLineStyle" ) { - pShape->m_tqshapeData.m_pLineStyle->loadXML( node.toElement() ); + pShape->m_shapeData.m_pLineStyle->loadXML( node.toElement() ); } node = node.nextSibling(); @@ -303,7 +303,7 @@ KivioShape *KivioShape::loadShapeEllipse( const TQDomElement &e ) /** - * Loads a tqshape of type line-array. + * Loads a shape of type line-array. * * @param e The element to load from. * @returns A newly allocated KivioShape, or NULL on error. @@ -317,12 +317,12 @@ KivioShape *KivioShape::loadShapeLineArray( const TQDomElement &e ) TQDomElement lineElement; - // Create the new tqshape to load into + // Create the new shape to load into pShape = new KivioShape(); // Load the type, name, and lineWidth properties - pShape->m_tqshapeData.m_tqshapeType = KivioShapeData::kstLineArray; - pShape->m_tqshapeData.m_name = XmlReadString( e, "name", "" ); + pShape->m_shapeData.m_shapeType = KivioShapeData::kstLineArray; + pShape->m_shapeData.m_name = XmlReadString( e, "name", "" ); // Iterate through the nodes loading the various items node = e.firstChild(); @@ -337,14 +337,14 @@ KivioShape *KivioShape::loadShapeLineArray( const TQDomElement &e ) // Allocate a new point, load it, and store it in the list pPoint = new KivioPoint( XmlReadFloat( lineElement, "x1", 0.0f ), XmlReadFloat( lineElement, "y1", 0.0f ) ); - pShape->m_tqshapeData.m_pOriginalPointList->append( pPoint ); + pShape->m_shapeData.m_pOriginalPointList->append( pPoint ); pPoint = new KivioPoint( XmlReadFloat( lineElement, "x2", 0.0f ), XmlReadFloat( lineElement, "y2", 0.0f ) ); - pShape->m_tqshapeData.m_pOriginalPointList->append( pPoint ); + pShape->m_shapeData.m_pOriginalPointList->append( pPoint ); pPoint = NULL; } else if( nodeName == "KivioLineStyle" ) { - pShape->m_tqshapeData.m_pLineStyle->loadXML( node.toElement() ); + pShape->m_shapeData.m_pLineStyle->loadXML( node.toElement() ); } node = node.nextSibling(); @@ -355,7 +355,7 @@ KivioShape *KivioShape::loadShapeLineArray( const TQDomElement &e ) /** - * Loads a tqshape of type open-path. + * Loads a shape of type open-path. * * @param e The element to load from. * @returns A newly allocated KivioShape, or NULL on error. @@ -368,12 +368,12 @@ KivioShape *KivioShape::loadShapeOpenPath( const TQDomElement &e ) TQString nodeName; - // Create the new tqshape to load into + // Create the new shape to load into pShape = new KivioShape(); // Load the type, name, and lineWidth properties - pShape->m_tqshapeData.m_tqshapeType = KivioShapeData::kstOpenPath; - pShape->m_tqshapeData.m_name = XmlReadString( e, "name", "" ); + pShape->m_shapeData.m_shapeType = KivioShapeData::kstOpenPath; + pShape->m_shapeData.m_name = XmlReadString( e, "name", "" ); // Iterate through the nodes loading the various items node = e.firstChild(); @@ -387,12 +387,12 @@ KivioShape *KivioShape::loadShapeOpenPath( const TQDomElement &e ) // Allocate a new point, load it, and store it in the list pPoint = new KivioPoint(0.0f, 0.0f, KivioPoint::kptBezier); pPoint->loadXML( node.toElement() ); - pShape->m_tqshapeData.m_pOriginalPointList->append( pPoint ); + pShape->m_shapeData.m_pOriginalPointList->append( pPoint ); pPoint = NULL; } else if( nodeName == "KivioLineStyle" ) { - pShape->m_tqshapeData.m_pLineStyle->loadXML( node.toElement() ); + pShape->m_shapeData.m_pLineStyle->loadXML( node.toElement() ); } node = node.nextSibling(); @@ -403,7 +403,7 @@ KivioShape *KivioShape::loadShapeOpenPath( const TQDomElement &e ) /** - * Loads a tqshape of type pie. + * Loads a shape of type pie. * * @param e The element to load from. * @returns A newly allocated KivioShape, or NULL on error. @@ -417,7 +417,7 @@ KivioShape *KivioShape::loadShapePie( const TQDomElement & ) /** - * Loads a tqshape of type polygon. + * Loads a shape of type polygon. * * @param e The element to load from. * @returns A newly allocated KivioShape, or NULL on error. @@ -430,12 +430,12 @@ KivioShape *KivioShape::loadShapePolygon( const TQDomElement &e ) TQString nodeName; - // Create the new tqshape to load into + // Create the new shape to load into pShape = new KivioShape(); // Load the type, name, and lineWidth properties - pShape->m_tqshapeData.m_tqshapeType = KivioShapeData::kstPolygon; - pShape->m_tqshapeData.m_name = XmlReadString( e, "name", "" ); + pShape->m_shapeData.m_shapeType = KivioShapeData::kstPolygon; + pShape->m_shapeData.m_name = XmlReadString( e, "name", "" ); // Iterate through the nodes loading the various items node = e.firstChild(); @@ -449,16 +449,16 @@ KivioShape *KivioShape::loadShapePolygon( const TQDomElement &e ) // Allocate a new point, load it, and store it in the list pPoint = new KivioPoint(); pPoint->loadXML( node.toElement() ); - pShape->m_tqshapeData.m_pOriginalPointList->append( pPoint ); + pShape->m_shapeData.m_pOriginalPointList->append( pPoint ); pPoint = NULL; } else if( nodeName == "KivioFillStyle" ) { - pShape->m_tqshapeData.m_pFillStyle->loadXML( node.toElement() ); + pShape->m_shapeData.m_pFillStyle->loadXML( node.toElement() ); } else if( nodeName == "KivioLineStyle" ) { - pShape->m_tqshapeData.m_pLineStyle->loadXML( node.toElement() ); + pShape->m_shapeData.m_pLineStyle->loadXML( node.toElement() ); } node = node.nextSibling(); @@ -469,7 +469,7 @@ KivioShape *KivioShape::loadShapePolygon( const TQDomElement &e ) /** - * Loads a tqshape of type polyline. + * Loads a shape of type polyline. * * @param e The element to load from. * @returns A newly allocated KivioShape, or NULL on error. @@ -482,12 +482,12 @@ KivioShape *KivioShape::loadShapePolyline( const TQDomElement &e ) TQString nodeName; - // Create the new tqshape to load into + // Create the new shape to load into pShape = new KivioShape(); // Load the type, name, and lineWidth properties - pShape->m_tqshapeData.m_tqshapeType = KivioShapeData::kstPolyline; - pShape->m_tqshapeData.m_name = XmlReadString( e, "name", "" ); + pShape->m_shapeData.m_shapeType = KivioShapeData::kstPolyline; + pShape->m_shapeData.m_name = XmlReadString( e, "name", "" ); // Iterate through the nodes loading the various items node = e.firstChild(); @@ -501,12 +501,12 @@ KivioShape *KivioShape::loadShapePolyline( const TQDomElement &e ) // Allocate a new point, load it, and store it in the list pPoint = new KivioPoint(); pPoint->loadXML( node.toElement() ); - pShape->m_tqshapeData.m_pOriginalPointList->append( pPoint ); + pShape->m_shapeData.m_pOriginalPointList->append( pPoint ); pPoint = NULL; } else if( nodeName == "KivioLineStyle" ) { - pShape->m_tqshapeData.m_pLineStyle->loadXML( node.toElement() ); + pShape->m_shapeData.m_pLineStyle->loadXML( node.toElement() ); } node = node.nextSibling(); @@ -517,7 +517,7 @@ KivioShape *KivioShape::loadShapePolyline( const TQDomElement &e ) /** - * Loads a tqshape of type rectangle. + * Loads a shape of type rectangle. * * @param e The element to load from. * @returns A newly allocated KivioShape, or NULL on error. @@ -529,15 +529,15 @@ KivioShape *KivioShape::loadShapeRectangle( const TQDomElement &e ) TQString nodeName; - // Create the new tqshape to load into + // Create the new shape to load into pShape = new KivioShape(); // Load the type, name, and lineWidth properties - pShape->m_tqshapeData.m_tqshapeType = KivioShapeData::kstRectangle; - pShape->m_tqshapeData.m_name = XmlReadString( e, "name", "" ); + pShape->m_shapeData.m_shapeType = KivioShapeData::kstRectangle; + pShape->m_shapeData.m_name = XmlReadString( e, "name", "" ); - pShape->m_tqshapeData.m_position.set( XmlReadFloat( e, "x", 0.0f ), XmlReadFloat( e, "y", 0.0f ) ); - pShape->m_tqshapeData.m_dimensions.set( XmlReadFloat( e, "w", 72.0f ), XmlReadFloat( e, "h", 72.0f ) ); + pShape->m_shapeData.m_position.set( XmlReadFloat( e, "x", 0.0f ), XmlReadFloat( e, "y", 0.0f ) ); + pShape->m_shapeData.m_dimensions.set( XmlReadFloat( e, "w", 72.0f ), XmlReadFloat( e, "h", 72.0f ) ); // Iterate through the nodes loading the various items node = e.firstChild(); @@ -548,11 +548,11 @@ KivioShape *KivioShape::loadShapeRectangle( const TQDomElement &e ) // Read the fill style if( nodeName == "KivioFillStyle" ) { - pShape->m_tqshapeData.m_pFillStyle->loadXML( node.toElement() ); + pShape->m_shapeData.m_pFillStyle->loadXML( node.toElement() ); } else if( nodeName == "KivioLineStyle" ) { - pShape->m_tqshapeData.m_pLineStyle->loadXML( node.toElement() ); + pShape->m_shapeData.m_pLineStyle->loadXML( node.toElement() ); } node = node.nextSibling(); @@ -564,7 +564,7 @@ KivioShape *KivioShape::loadShapeRectangle( const TQDomElement &e ) /** - * Loads a tqshape of type round rectangle. + * Loads a shape of type round rectangle. * * @param e The element to load from. * @returns A newly allocated KivioShape, or NULL on error. @@ -577,20 +577,20 @@ KivioShape *KivioShape::loadShapeRoundRectangle( const TQDomElement &e ) TQString nodeName; - // Create the new tqshape to load into + // Create the new shape to load into pShape = new KivioShape(); // Load the type, name, and lineWidth properties - pShape->m_tqshapeData.m_tqshapeType = KivioShapeData::kstRoundRectangle; - pShape->m_tqshapeData.m_name = XmlReadString( e, "name", "" ); + pShape->m_shapeData.m_shapeType = KivioShapeData::kstRoundRectangle; + pShape->m_shapeData.m_name = XmlReadString( e, "name", "" ); - pShape->m_tqshapeData.m_position.set( XmlReadFloat( e, "x", 0.0f ), XmlReadFloat( e, "y", 0.0f ) ); - pShape->m_tqshapeData.m_dimensions.set( XmlReadFloat( e, "w", 72.0f ), XmlReadFloat( e, "h", 72.0f ) ); + pShape->m_shapeData.m_position.set( XmlReadFloat( e, "x", 0.0f ), XmlReadFloat( e, "y", 0.0f ) ); + pShape->m_shapeData.m_dimensions.set( XmlReadFloat( e, "w", 72.0f ), XmlReadFloat( e, "h", 72.0f ) ); // Read and store the radii of the curves pPoint = new KivioPoint(0.0f, 0.0f); pPoint->set( XmlReadFloat( e, "r1", 1.0f ), XmlReadFloat( e, "r2", 1.0f ) ); - pShape->m_tqshapeData.m_pOriginalPointList->append( pPoint ); + pShape->m_shapeData.m_pOriginalPointList->append( pPoint ); // Iterate through the nodes loading the various items node = e.firstChild(); @@ -601,11 +601,11 @@ KivioShape *KivioShape::loadShapeRoundRectangle( const TQDomElement &e ) // Read the fill style if( nodeName == "KivioFillStyle" ) { - pShape->m_tqshapeData.m_pFillStyle->loadXML( node.toElement() ); + pShape->m_shapeData.m_pFillStyle->loadXML( node.toElement() ); } else if( nodeName == "KivioLineStyle" ) { - pShape->m_tqshapeData.m_pLineStyle->loadXML( node.toElement() ); + pShape->m_shapeData.m_pLineStyle->loadXML( node.toElement() ); } node = node.nextSibling(); @@ -616,7 +616,7 @@ KivioShape *KivioShape::loadShapeRoundRectangle( const TQDomElement &e ) /** - * Loads a tqshape of type textbox. + * Loads a shape of type textbox. * * @param e The element to load from. * @returns A newly allocated KivioShape, or NULL on error. @@ -630,17 +630,17 @@ KivioShape *KivioShape::loadShapeTextBox( const TQDomElement &e ) TQString name; - // Create the new tqshape to load into + // Create the new shape to load into pShape = new KivioShape(); // Load the type and name - pShape->m_tqshapeData.setShapeType(KivioShapeData::kstTextBox); - pShape->m_tqshapeData.setName( XmlReadString( e, "name", "" ) ); - pShape->m_tqshapeData.setTextColor(XmlReadColor(e,"color",TQColor(0,0,0))); + pShape->m_shapeData.setShapeType(KivioShapeData::kstTextBox); + pShape->m_shapeData.setName( XmlReadString( e, "name", "" ) ); + pShape->m_shapeData.setTextColor(XmlReadColor(e,"color",TQColor(0,0,0))); - pShape->m_tqshapeData.m_position.set( + pShape->m_shapeData.m_position.set( XmlReadFloat( e, "x", 0.0f ), XmlReadFloat( e, "y", 0.0f ) ); - pShape->m_tqshapeData.m_dimensions.set( + pShape->m_shapeData.m_dimensions.set( XmlReadFloat( e, "w", 72.0f ), XmlReadFloat( e, "h", 72.0f ) ); // Now look for the KivioTextStyle @@ -651,13 +651,13 @@ KivioShape *KivioShape::loadShapeTextBox( const TQDomElement &e ) if( nodeName == "KivioTextStyle" ) { ts.loadXML( node.toElement() ); - pShape->m_tqshapeData.setTextStyle( &ts ); + pShape->m_shapeData.setTextStyle( &ts ); } node = node.nextSibling(); } // TQString text = XmlReadString( e, "text", "" ); -// pShape->m_tqshapeData.setText( text ); +// pShape->m_shapeData.setText( text ); return pShape; diff --git a/kivio/kiviopart/kiviosdk/kivio_shape.h b/kivio/kiviopart/kiviosdk/kivio_shape.h index c83607d7..42adfed6 100644 --- a/kivio/kiviopart/kiviosdk/kivio_shape.h +++ b/kivio/kiviopart/kiviosdk/kivio_shape.h @@ -26,7 +26,7 @@ class KivioShape { protected: - KivioShapeData m_tqshapeData; // The data inside this tqshape + KivioShapeData m_shapeData; // The data inside this shape public: KivioShape(); @@ -39,9 +39,9 @@ public: bool loadXML( const TQDomElement & ); TQDomElement saveXML( TQDomDocument & ); - KivioShapeData::KivioShapeType tqshapeType() { return m_tqshapeData.tqshapeType(); } + KivioShapeData::KivioShapeType shapeType() { return m_shapeData.shapeType(); } - KivioShapeData *tqshapeData() { return &m_tqshapeData; } + KivioShapeData *shapeData() { return &m_shapeData; } static KivioShape *loadShapeArc( const TQDomElement & ); static KivioShape *loadShapeClosedPath( const TQDomElement & ); diff --git a/kivio/kiviopart/kiviosdk/kivio_shape_data.cpp b/kivio/kiviopart/kiviosdk/kivio_shape_data.cpp index 5305fe13..431d7987 100644 --- a/kivio/kiviopart/kiviosdk/kivio_shape_data.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_shape_data.cpp @@ -27,7 +27,7 @@ #include <kdebug.h> /* - * Struct for holding information about a tqshape type + * Struct for holding information about a shape type */ struct KivioShapeTypeInfo { @@ -36,10 +36,10 @@ struct KivioShapeTypeInfo }; /* - * Array of tqshape info used for loading/saving. + * Array of shape info used for loading/saving. */ static const int numShapeInfo = 12; -static struct KivioShapeTypeInfo tqshapeInfo[] = { +static struct KivioShapeTypeInfo shapeInfo[] = { { "Arc", KivioShapeData::kstArc }, { "Pie", KivioShapeData::kstPie }, { "LineArray", KivioShapeData::kstLineArray }, @@ -84,7 +84,7 @@ KivioShapeData::KivioShapeData() m_pLineStyle = new KivioLineStyle(); // m_fgColor = TQColor( 0, 0, 0 ); - m_tqshapeType = kstNone; + m_shapeType = kstNone; m_name = ""; // m_lineWidth = 1.0f; @@ -119,7 +119,7 @@ KivioShapeData::KivioShapeData( const KivioShapeData &source ) //m_fgColor = source.m_fgColor; // Copy the rest - m_tqshapeType = source.m_tqshapeType; + m_shapeType = source.m_shapeType; m_name = TQString(source.m_name); //m_lineWidth = source.m_lineWidth; @@ -127,8 +127,8 @@ KivioShapeData::KivioShapeData( const KivioShapeData &source ) source.m_position.copyInto( &m_position ); source.m_dimensions.copyInto( &m_dimensions ); - // If this is a text tqshape, allocate a text data struct and copy the info - if( m_tqshapeType == kstTextBox ) + // If this is a text shape, allocate a text data struct and copy the info + if( m_shapeType == kstTextBox ) { m_pTextData = new KivioTextStyle(); @@ -208,7 +208,7 @@ void KivioShapeData::copyInto( KivioShapeData *pTarget ) const //pTarget->m_fgColor = m_fgColor; // Copy the rest - pTarget->m_tqshapeType = m_tqshapeType; + pTarget->m_shapeType = m_shapeType; pTarget->m_name = TQString(m_name); //pTarget->m_lineWidth = m_lineWidth; @@ -217,7 +217,7 @@ void KivioShapeData::copyInto( KivioShapeData *pTarget ) const // If this is a textbox, allocate & copy - if( m_tqshapeType == kstTextBox ) + if( m_shapeType == kstTextBox ) { if( !pTarget->m_pTextData ) { @@ -283,7 +283,7 @@ bool KivioShapeData::loadXML( const TQDomElement &e ) { // First make sure we are a text box - if( m_tqshapeType == kstTextBox ) + if( m_shapeType == kstTextBox ) { // If we don't have text data, allocate it if( !m_pTextData ) @@ -291,12 +291,12 @@ bool KivioShapeData::loadXML( const TQDomElement &e ) m_pTextData->loadXML( ele ); - } // end if m_tqshapeType==kstTextBox + } // end if m_shapeType==kstTextBox } else if( nodeName == "KivioText" ) { // First make sure we are a text box - if( m_tqshapeType == kstTextBox ) + if( m_shapeType == kstTextBox ) { KivioTextShapeData *pData = new KivioTextShapeData; @@ -338,7 +338,7 @@ bool KivioShapeData::loadXML( const TQDomElement &e ) m_pTextData->setFont( pData->m_textFont ); m_pTextData->setColor( pData->m_textColor ); - } // end if m_tqshapeType==kstTextBox + } // end if m_shapeType==kstTextBox else { kdDebug(43000) << "KivioShapeData::loadXML() - Loading KivioText, but this is not a textbox!" << endl; @@ -385,7 +385,7 @@ TQDomElement KivioShapeData::saveXML( TQDomDocument &doc ) // Save if we are a text box etc... - if( m_tqshapeType == kstTextBox ) + if( m_shapeType == kstTextBox ) { if( m_pTextData ) { @@ -420,21 +420,21 @@ TQDomElement KivioShapeData::saveXML( TQDomDocument &doc ) // The BGFillStyle e.appendChild( m_pFillStyle->saveXML( doc ) ); - // Shape type & name are stored in the tqshape node - //XmlWriteInt( e, "tqshapeType", m_tqshapeType ); + // Shape type & name are stored in the shape node + //XmlWriteInt( e, "shapeType", m_shapeType ); //XmlWriteString( e, "name", m_name ); return e; } -KivioShapeData::KivioShapeType KivioShapeData::tqshapeTypeFromString( const TQString &str ) +KivioShapeData::KivioShapeType KivioShapeData::shapeTypeFromString( const TQString &str ) { for( int i=0; i<numShapeInfo; i++ ) { - if( str.compare( tqshapeInfo[i].name )==0 ) - return tqshapeInfo[i].type; + if( str.compare( shapeInfo[i].name )==0 ) + return shapeInfo[i].type; } return kstNone; @@ -442,7 +442,7 @@ KivioShapeData::KivioShapeType KivioShapeData::tqshapeTypeFromString( const TQSt void KivioShapeData::setShapeType( KivioShapeType st ) { - m_tqshapeType = st; + m_shapeType = st; // If it is a text box, make sure we have text data if( st == kstTextBox ) diff --git a/kivio/kiviopart/kiviosdk/kivio_shape_data.h b/kivio/kiviopart/kiviosdk/kivio_shape_data.h index f97e5ec9..bd89dcc8 100644 --- a/kivio/kiviopart/kiviosdk/kivio_shape_data.h +++ b/kivio/kiviopart/kiviosdk/kivio_shape_data.h @@ -36,11 +36,11 @@ class KivioTextShapeData public: KivioTextShapeData(); - TQString m_text; // The text inside this tqshape + TQString m_text; // The text inside this shape TQColor m_textColor; // The text color TQFont m_textFont; // The text font bool m_isHtml; // Is the text HTML formatted? - int m_hTextAlign, m_vTextAlign; //Qt::Horizontal and vertical text tqalignment flags + int m_hTextAlign, m_vTextAlign; //Qt::Horizontal and vertical text alignment flags }; /** @@ -52,7 +52,7 @@ class KivioShapeData { public: /** - * The possible tqshape types. + * The possible shape types. */ typedef enum { kstNone = 0, @@ -75,7 +75,7 @@ protected: TQPtrList <KivioPoint> *m_pOriginalPointList; // Original point list loaded from an SML file - KivioShapeType m_tqshapeType; // The tqshape type + KivioShapeType m_shapeType; // The shape type KivioPoint m_position, m_dimensions; // The position and dimensions KivioFillStyle *m_pFillStyle; // The fill style @@ -83,7 +83,7 @@ protected: // float m_lineWidth; // The line width KivioLineStyle *m_pLineStyle; - TQString m_name; // The name of this tqshape + TQString m_name; // The name of this shape KivioTextStyle *m_pTextData; // A pointer to text data (if applicable, e.g. TextBox) @@ -98,10 +98,10 @@ public: virtual TQDomElement saveXML( TQDomDocument & ); - KivioShapeType tqshapeType() const { return m_tqshapeType; } + KivioShapeType shapeType() const { return m_shapeType; } void setShapeType( KivioShapeType st ); - static KivioShapeType tqshapeTypeFromString( const TQString & ); + static KivioShapeType shapeTypeFromString( const TQString & ); TQPtrList<KivioPoint> *pointList() { return m_pOriginalPointList; } diff --git a/kivio/kiviopart/kiviosdk/kivio_shape_painter.cpp b/kivio/kiviopart/kiviosdk/kivio_shape_painter.cpp index fbdad979..f1ca2c8f 100644 --- a/kivio/kiviopart/kiviosdk/kivio_shape_painter.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_shape_painter.cpp @@ -37,9 +37,9 @@ void KivioShapePainter::drawShape( KivioShape *pShape, float x, float y, float w m_pShape = pShape; - pShapeData = pShape->tqshapeData(); + pShapeData = pShape->shapeData(); - switch( pShapeData->tqshapeType() ) + switch( pShapeData->shapeType() ) { case KivioShapeData::kstArc: drawArc(); diff --git a/kivio/kiviopart/kiviosdk/kivio_sml_stencil.cpp b/kivio/kiviopart/kiviosdk/kivio_sml_stencil.cpp index 6f00df1a..035ede78 100644 --- a/kivio/kiviopart/kiviosdk/kivio_sml_stencil.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_sml_stencil.cpp @@ -37,9 +37,9 @@ #include <tqdom.h> #include <tqpainter.h> -#include <tqbrush.h> +#include <brush.h> #include <tqcolor.h> -#include <tqpalette.h> +#include <palette.h> #include <tqrect.h> #include <tqbitmap.h> #include <kdebug.h> @@ -50,7 +50,7 @@ /** * Default constructor * - * Allocates a new tqshape list, connector targets, and original connector targets. + * Allocates a new shape list, connector targets, and original connector targets. */ KivioSMLStencil::KivioSMLStencil() : KivioStencil(), @@ -111,7 +111,7 @@ bool KivioSMLStencil::loadXML( const TQDomElement &e ) } else if( nodeName == "KivioShape" ) { - // Locate the tqshape we are supposed to load into + // Locate the shape we are supposed to load into KivioShape *pShape = locateShape( XmlReadString( ele, "name", "" ) ); if(pShape) { @@ -173,7 +173,7 @@ void KivioSMLStencil::loadConnectorTargetListXML( const TQDomElement &e ) /** - * Locates a tqshape in the tqshape list by name. + * Locates a shape in the shape list by name. */ KivioShape *KivioSMLStencil::locateShape( const TQString &name ) { @@ -185,7 +185,7 @@ KivioShape *KivioSMLStencil::locateShape( const TQString &name ) pShape = m_pShapeList->first(); while( pShape ) { - if( pShape->tqshapeData()->name() == name ) + if( pShape->shapeData()->name() == name ) { return pShape; } @@ -233,7 +233,7 @@ TQDomElement KivioSMLStencil::saveXML( TQDomDocument &doc ) } e.appendChild( clE ); - // The tqshape list + // The shape list KivioShape *pShape = m_pShapeList->first(); while( pShape ) { @@ -268,7 +268,7 @@ KivioStencil *KivioSMLStencil::duplicate() pNewStencil->m_pSpawner = m_pSpawner; - // Copy the tqshape list + // Copy the shape list pShape = m_pShapeList->first(); while( pShape ) { @@ -313,9 +313,9 @@ void KivioSMLStencil::paintOutline( KivioIntraStencilData *pData ) pShape = m_pShapeList->first(); while( pShape ) { - pShapeData = pShape->tqshapeData(); + pShapeData = pShape->shapeData(); - switch( pShapeData->tqshapeType() ) + switch( pShapeData->shapeType() ) { case KivioShapeData::kstArc: drawOutlineArc( pShape, pData ); @@ -396,7 +396,7 @@ void KivioSMLStencil::drawOutlineArc( KivioShape *pShape, KivioIntraStencilData KivioPoint *pPosition, *pDimensions; KivioPoint *pPoint; - pShapeData = pShape->tqshapeData(); + pShapeData = pShape->shapeData(); pPosition = pShapeData->position(); pDimensions = pShapeData->dimensions(); @@ -420,14 +420,14 @@ void KivioSMLStencil::drawOutlineArc( KivioShape *pShape, KivioIntraStencilData void KivioSMLStencil::drawOutlineBezier( KivioShape *pShape, KivioIntraStencilData *pData ) { KivioPainter *painter; - KivioShapeData *pShapeData = pShape->tqshapeData(); + KivioShapeData *pShapeData = pShape->shapeData(); double defWidth = m_pSpawner->defWidth(); double defHeight = m_pSpawner->defHeight(); painter = pData->painter; - pShapeData = pShape->tqshapeData(); + pShapeData = pShape->shapeData(); KivioPoint *pPoint, *pPoint2, *pPoint3, *pPoint4; TQPtrList <KivioPoint> *pPointList = pShapeData->pointList(); @@ -456,7 +456,7 @@ void KivioSMLStencil::drawOutlineBezier( KivioShape *pShape, KivioIntraStencilDa void KivioSMLStencil::drawOutlineOpenPath( KivioShape *pShape, KivioIntraStencilData *pData ) { KivioPainter *painter; - KivioShapeData *pShapeData = pShape->tqshapeData(); + KivioShapeData *pShapeData = pShape->shapeData(); KivioPoint *pPoint, *pNewPoint; double defWidth = m_pSpawner->defWidth(); @@ -487,7 +487,7 @@ void KivioSMLStencil::drawOutlineOpenPath( KivioShape *pShape, KivioIntraStencil void KivioSMLStencil::drawOutlineClosedPath( KivioShape *pShape, KivioIntraStencilData *pData ) { KivioPainter *painter; - KivioShapeData *pShapeData = pShape->tqshapeData(); + KivioShapeData *pShapeData = pShape->shapeData(); KivioPoint *pPoint, *pNewPoint; double defWidth = m_pSpawner->defWidth(); @@ -521,7 +521,7 @@ void KivioSMLStencil::drawOutlineEllipse( KivioShape *pShape, KivioIntraStencilD KivioShapeData *pShapeData; KivioPoint *pPosition, *pDimensions; - pShapeData = pShape->tqshapeData(); + pShapeData = pShape->shapeData(); pPosition = pShapeData->position(); pDimensions = pShapeData->dimensions(); @@ -546,7 +546,7 @@ void KivioSMLStencil::drawOutlineLineArray( KivioShape *pShape, KivioIntraStenci KivioShapeData *pShapeData; TQPtrList <KivioPoint> *pList; - pShapeData = pShape->tqshapeData(); + pShapeData = pShape->shapeData(); defWidth = m_pSpawner->defWidth(); defHeight = m_pSpawner->defHeight(); @@ -582,7 +582,7 @@ void KivioSMLStencil::drawOutlineRectangle( KivioShape *pShape, KivioIntraStenci KivioShapeData *pShapeData; KivioPoint *pPosition, *pDimensions; - pShapeData = pShape->tqshapeData(); + pShapeData = pShape->shapeData(); pPosition = pShapeData->position(); pDimensions = pShapeData->dimensions(); @@ -606,7 +606,7 @@ void KivioSMLStencil::drawOutlineRoundRectangle( KivioShape *pShape, KivioIntraS KivioShapeData *pShapeData; KivioPoint *pPosition, *pDimensions; - pShapeData = pShape->tqshapeData(); + pShapeData = pShape->shapeData(); pPosition = pShapeData->position(); pDimensions = pShapeData->dimensions(); @@ -643,7 +643,7 @@ void KivioSMLStencil::drawOutlinePolygon( KivioShape *pShape, KivioIntraStencilD KivioShapeData *pShapeData; TQPtrList <KivioPoint> *pList; - pShapeData = pShape->tqshapeData(); + pShapeData = pShape->shapeData(); defWidth = m_pSpawner->defWidth(); defHeight = m_pSpawner->defHeight(); @@ -679,7 +679,7 @@ void KivioSMLStencil::drawOutlinePolyline( KivioShape *pShape, KivioIntraStencil KivioShapeData *pShapeData; TQPtrList <KivioPoint> *pList; - pShapeData = pShape->tqshapeData(); + pShapeData = pShape->shapeData(); defWidth = m_pSpawner->defWidth(); defHeight = m_pSpawner->defHeight(); @@ -714,7 +714,7 @@ void KivioSMLStencil::drawOutlineTextBox( KivioShape *pShape, KivioIntraStencilD double defWidth = m_pSpawner->defWidth(); double defHeight = m_pSpawner->defHeight(); int _x, _y, _w, _h; - KivioShapeData *pShapeData = pShape->tqshapeData(); + KivioShapeData *pShapeData = pShape->shapeData(); KivioPoint *pPosition = pShapeData->position(); KivioPoint *pDimensions = pShapeData->dimensions(); KivioPainter *painter = pData->painter; @@ -765,9 +765,9 @@ void KivioSMLStencil::paint( KivioIntraStencilData *pData ) pShape = m_pShapeList->first(); while( pShape ) { - pShapeData = pShape->tqshapeData(); + pShapeData = pShape->shapeData(); - switch( pShapeData->tqshapeType() ) + switch( pShapeData->shapeType() ) { case KivioShapeData::kstArc: drawArc( pShape, pData ); @@ -873,7 +873,7 @@ void KivioSMLStencil::drawArc( KivioShape *pShape, KivioIntraStencilData *pData KivioPoint *pPosition, *pDimensions; KivioPoint *pPoint; - pShapeData = pShape->tqshapeData(); + pShapeData = pShape->shapeData(); pPosition = pShapeData->position(); pDimensions = pShapeData->dimensions(); @@ -915,14 +915,14 @@ void KivioSMLStencil::drawArc( KivioShape *pShape, KivioIntraStencilData *pData void KivioSMLStencil::drawBezier( KivioShape *pShape, KivioIntraStencilData *pData ) { KivioPainter *painter; - KivioShapeData *pShapeData = pShape->tqshapeData(); + KivioShapeData *pShapeData = pShape->shapeData(); double defWidth = m_pSpawner->defWidth(); double defHeight = m_pSpawner->defHeight(); painter = pData->painter; - pShapeData = pShape->tqshapeData(); + pShapeData = pShape->shapeData(); KivioPoint *pPoint, *pPoint2, *pPoint3, *pPoint4; TQPtrList <KivioPoint> *pPointList = pShapeData->pointList(); @@ -954,7 +954,7 @@ void KivioSMLStencil::drawBezier( KivioShape *pShape, KivioIntraStencilData *pDa void KivioSMLStencil::drawOpenPath( KivioShape *pShape, KivioIntraStencilData *pData ) { KivioPainter *painter; - KivioShapeData *pShapeData = pShape->tqshapeData(); + KivioShapeData *pShapeData = pShape->shapeData(); KivioPoint *pPoint, *pNewPoint; double defWidth = m_pSpawner->defWidth(); @@ -988,7 +988,7 @@ void KivioSMLStencil::drawOpenPath( KivioShape *pShape, KivioIntraStencilData *p void KivioSMLStencil::drawClosedPath( KivioShape *pShape, KivioIntraStencilData *pData ) { KivioPainter *painter; - KivioShapeData *pShapeData = pShape->tqshapeData(); + KivioShapeData *pShapeData = pShape->shapeData(); KivioPoint *pPoint, *pNewPoint; double defWidth = m_pSpawner->defWidth(); @@ -1046,7 +1046,7 @@ void KivioSMLStencil::drawEllipse( KivioShape *pShape, KivioIntraStencilData *pD KivioShapeData *pShapeData; KivioPoint *pPosition, *pDimensions; - pShapeData = pShape->tqshapeData(); + pShapeData = pShape->shapeData(); pPosition = pShapeData->position(); pDimensions = pShapeData->dimensions(); @@ -1089,7 +1089,7 @@ void KivioSMLStencil::drawLineArray( KivioShape *pShape, KivioIntraStencilData * KivioShapeData *pShapeData; TQPtrList <KivioPoint> *pList; - pShapeData = pShape->tqshapeData(); + pShapeData = pShape->shapeData(); defWidth = m_pSpawner->defWidth(); defHeight = m_pSpawner->defHeight(); @@ -1130,7 +1130,7 @@ void KivioSMLStencil::drawRectangle( KivioShape *pShape, KivioIntraStencilData * KivioShapeData *pShapeData; KivioPoint *pPosition, *pDimensions; - pShapeData = pShape->tqshapeData(); + pShapeData = pShape->shapeData(); pPosition = pShapeData->position(); pDimensions = pShapeData->dimensions(); @@ -1174,7 +1174,7 @@ void KivioSMLStencil::drawRoundRectangle( KivioShape *pShape, KivioIntraStencilD KivioPoint *pPosition, *pDimensions; KivioPoint *pPoint; - pShapeData = pShape->tqshapeData(); + pShapeData = pShape->shapeData(); pPosition = pShapeData->position(); pDimensions = pShapeData->dimensions(); @@ -1221,7 +1221,7 @@ void KivioSMLStencil::drawPolygon( KivioShape *pShape, KivioIntraStencilData *pD KivioShapeData *pShapeData; TQPtrList <KivioPoint> *pList; - pShapeData = pShape->tqshapeData(); + pShapeData = pShape->shapeData(); defWidth = m_pSpawner->defWidth(); defHeight = m_pSpawner->defHeight(); @@ -1280,7 +1280,7 @@ void KivioSMLStencil::drawPolyline( KivioShape *pShape, KivioIntraStencilData *p KivioShapeData *pShapeData; TQPtrList <KivioPoint> *pList; - pShapeData = pShape->tqshapeData(); + pShapeData = pShape->shapeData(); defWidth = m_pSpawner->defWidth(); defHeight = m_pSpawner->defHeight(); @@ -1317,7 +1317,7 @@ void KivioSMLStencil::drawTextBox( KivioShape *pShape, KivioIntraStencilData *pD { double defWidth = m_pSpawner->defWidth(); double defHeight = m_pSpawner->defHeight(); - KivioShapeData *pShapeData = pShape->tqshapeData(); + KivioShapeData *pShapeData = pShape->shapeData(); KivioPoint *pPosition = pShapeData->position(); KivioPoint *pDimensions = pShapeData->dimensions(); KivioPainter *painter = pData->painter; @@ -1358,7 +1358,7 @@ void KivioSMLStencil::setFGColor( TQColor c ) pShape = m_pShapeList->first(); while( pShape ) { - pShape->tqshapeData()->lineStyle()->setColor( c ); + pShape->shapeData()->lineStyle()->setColor( c ); pShape = m_pShapeList->next(); } @@ -1375,7 +1375,7 @@ void KivioSMLStencil::setBGColor( TQColor c ) pShape = m_pShapeList->first(); while( pShape ) { - pShape->tqshapeData()->fillStyle()->setColor( c ); + pShape->shapeData()->fillStyle()->setColor( c ); pShape = m_pShapeList->next(); } @@ -1388,7 +1388,7 @@ void KivioSMLStencil::setFillPattern(int p) pShape = m_pShapeList->first(); while( pShape ) { - pShape->tqshapeData()->fillStyle()->setBrushStyle( static_cast<Qt::BrushStyle>(p) ); + pShape->shapeData()->fillStyle()->setBrushStyle( static_cast<Qt::BrushStyle>(p) ); pShape = m_pShapeList->next(); } @@ -1405,7 +1405,7 @@ void KivioSMLStencil::setTextColor( TQColor c ) pShape = m_pShapeList->first(); while( pShape ) { - pShape->tqshapeData()->setTextColor( c ); + pShape->shapeData()->setTextColor( c ); pShape = m_pShapeList->next(); } @@ -1422,7 +1422,7 @@ void KivioSMLStencil::setTextFont( const TQFont &f ) pShape = m_pShapeList->first(); while( pShape ) { - pShape->tqshapeData()->setTextFont( f ); + pShape->shapeData()->setTextFont( f ); pShape = m_pShapeList->next(); } @@ -1439,7 +1439,7 @@ void KivioSMLStencil::setLineWidth( double f ) pShape = m_pShapeList->first(); while( pShape ) { - pShape->tqshapeData()->lineStyle()->setWidth( f ); + pShape->shapeData()->lineStyle()->setWidth( f ); pShape = m_pShapeList->next(); } @@ -1451,7 +1451,7 @@ void KivioSMLStencil::setLinePattern(int p) while( pShape ) { - pShape->tqshapeData()->lineStyle()->setStyle( p ); + pShape->shapeData()->lineStyle()->setStyle( p ); pShape = m_pShapeList->next(); } } @@ -1550,7 +1550,7 @@ KivioConnectorTarget *KivioSMLStencil::connectToTarget( KivioConnectorPoint *p, /** - * Updates the tqgeometry of this stencil. + * Updates the geometry of this stencil. * * This function rearranges the KivioConnectorTargets to reflect * that of the width/height/position. @@ -1590,9 +1590,9 @@ TQFont KivioSMLStencil::textFont() pShape = m_pShapeList->first(); while( pShape ) { - if( pShape->tqshapeData()->tqshapeType() == KivioShapeData::kstTextBox ) + if( pShape->shapeData()->shapeType() == KivioShapeData::kstTextBox ) { - return pShape->tqshapeData()->textFont(); + return pShape->shapeData()->textFont(); } pShape = m_pShapeList->next(); @@ -1609,9 +1609,9 @@ TQColor KivioSMLStencil::textColor() pShape = m_pShapeList->first(); while( pShape ) { - if( pShape->tqshapeData()->tqshapeType() == KivioShapeData::kstTextBox ) + if( pShape->shapeData()->shapeType() == KivioShapeData::kstTextBox ) { - return pShape->tqshapeData()->textColor(); + return pShape->shapeData()->textColor(); } pShape = m_pShapeList->next(); @@ -1631,8 +1631,8 @@ void KivioSMLStencil::setHTextAlign(int i) pShape = m_pShapeList->first(); while( pShape ) { - if( pShape->tqshapeData()->tqshapeType() == KivioShapeData::kstTextBox ) - pShape->tqshapeData()->setHTextAlign( i ); + if( pShape->shapeData()->shapeType() == KivioShapeData::kstTextBox ) + pShape->shapeData()->setHTextAlign( i ); pShape = m_pShapeList->next(); } @@ -1640,7 +1640,7 @@ void KivioSMLStencil::setHTextAlign(int i) /** - * Set the vertical tqalignment of this stencil + * Set the vertical alignment of this stencil */ void KivioSMLStencil::setVTextAlign(int i) { @@ -1650,8 +1650,8 @@ void KivioSMLStencil::setVTextAlign(int i) pShape = m_pShapeList->first(); while( pShape ) { - if( pShape->tqshapeData()->tqshapeType() == KivioShapeData::kstTextBox ) - pShape->tqshapeData()->setVTextAlign( i ); + if( pShape->shapeData()->shapeType() == KivioShapeData::kstTextBox ) + pShape->shapeData()->setVTextAlign( i ); pShape = m_pShapeList->next(); } @@ -1659,7 +1659,7 @@ void KivioSMLStencil::setVTextAlign(int i) /** - * Get the horizontal tqalignment of this stencil. + * Get the horizontal alignment of this stencil. */ int KivioSMLStencil::hTextAlign() { @@ -1668,9 +1668,9 @@ int KivioSMLStencil::hTextAlign() pShape = m_pShapeList->first(); while( pShape ) { - if( pShape->tqshapeData()->tqshapeType() == KivioShapeData::kstTextBox ) + if( pShape->shapeData()->shapeType() == KivioShapeData::kstTextBox ) { - return pShape->tqshapeData()->hTextAlign(); + return pShape->shapeData()->hTextAlign(); } pShape = m_pShapeList->next(); @@ -1681,7 +1681,7 @@ int KivioSMLStencil::hTextAlign() /** - * Get the vertical text tqalignment of this stencil. + * Get the vertical text alignment of this stencil. */ int KivioSMLStencil::vTextAlign() { @@ -1690,9 +1690,9 @@ int KivioSMLStencil::vTextAlign() pShape = m_pShapeList->first(); while( pShape ) { - if( pShape->tqshapeData()->tqshapeType() == KivioShapeData::kstTextBox ) + if( pShape->shapeData()->shapeType() == KivioShapeData::kstTextBox ) { - return pShape->tqshapeData()->vTextAlign(); + return pShape->shapeData()->vTextAlign(); } pShape = m_pShapeList->next(); @@ -1712,9 +1712,9 @@ TQString KivioSMLStencil::text() pShape = m_pShapeList->first(); while( pShape ) { - if( pShape->tqshapeData()->tqshapeType() == KivioShapeData::kstTextBox ) + if( pShape->shapeData()->shapeType() == KivioShapeData::kstTextBox ) { - return pShape->tqshapeData()->text(); + return pShape->shapeData()->text(); } pShape = m_pShapeList->next(); @@ -1734,9 +1734,9 @@ void KivioSMLStencil::setText( const TQString &t ) pShape = m_pShapeList->first(); while( pShape ) { - if( pShape->tqshapeData()->tqshapeType() == KivioShapeData::kstTextBox ) + if( pShape->shapeData()->shapeType() == KivioShapeData::kstTextBox ) { - pShape->tqshapeData()->setText(t); + pShape->shapeData()->setText(t); } pShape = m_pShapeList->next(); @@ -1753,7 +1753,7 @@ double KivioSMLStencil::lineWidth() pShape = m_pShapeList->first(); if( pShape ) - return pShape->tqshapeData()->lineStyle()->width(); + return pShape->shapeData()->lineStyle()->width(); return 1.0f; } @@ -1763,7 +1763,7 @@ int KivioSMLStencil::linePattern() KivioShape *pShape = m_pShapeList->first(); if( pShape ) - return pShape->tqshapeData()->lineStyle()->style(); + return pShape->shapeData()->lineStyle()->style(); return 1; } @@ -1777,7 +1777,7 @@ TQColor KivioSMLStencil::fgColor() pShape = m_pShapeList->first(); if( pShape ) - return pShape->tqshapeData()->lineStyle()->color(); + return pShape->shapeData()->lineStyle()->color(); return TQColor(0,0,0); } @@ -1792,7 +1792,7 @@ TQColor KivioSMLStencil::bgColor() pShape = m_pShapeList->first(); if( pShape ) - return pShape->tqshapeData()->fillStyle()->color(); + return pShape->shapeData()->fillStyle()->color(); return TQColor(0,0,0); } @@ -1803,7 +1803,7 @@ int KivioSMLStencil::fillPattern() pShape = m_pShapeList->first(); if( pShape ) - return pShape->tqshapeData()->fillStyle()->brushStyle(); + return pShape->shapeData()->fillStyle()->brushStyle(); return 1; } @@ -1923,7 +1923,7 @@ bool KivioSMLStencil::checkCollisionPolygon( KivioShape *pShape, KoPoint *pCheck TQPtrList<KivioPoint> *pList; KoPoint *pPoints; - pShapeData = pShape->tqshapeData(); + pShapeData = pShape->shapeData(); defWidth = m_pSpawner->defWidth(); defHeight = m_pSpawner->defHeight(); @@ -2001,7 +2001,7 @@ KivioLineStyle KivioSMLStencil::lineStyle() KivioShape *pShape = m_pShapeList->first(); if( pShape ) - return *(pShape->tqshapeData()->lineStyle()); + return *(pShape->shapeData()->lineStyle()); return KivioLineStyle(); } @@ -2012,7 +2012,7 @@ void KivioSMLStencil::setLineStyle(KivioLineStyle ls) while( pShape ) { - pShape->tqshapeData()->setLineStyle(ls);; + pShape->shapeData()->setLineStyle(ls);; pShape = m_pShapeList->next(); } } @@ -2032,12 +2032,12 @@ TQString KivioSMLStencil::getTextBoxName(const KoPoint& p) while(pShape) { - if(pShape->tqshapeData()->tqshapeType() == KivioShapeData::kstTextBox) + if(pShape->shapeData()->shapeType() == KivioShapeData::kstTextBox) { - double x = pShape->tqshapeData()->x(); - double y = pShape->tqshapeData()->y(); - double x2 = pShape->tqshapeData()->w() + x; - double y2 = pShape->tqshapeData()->h() + y; + double x = pShape->shapeData()->x(); + double y = pShape->shapeData()->y(); + double x2 = pShape->shapeData()->w() + x; + double y2 = pShape->shapeData()->h() + y; // Create the rotated rectangle KoPoint pPoints[4]; @@ -2051,7 +2051,7 @@ TQString KivioSMLStencil::getTextBoxName(const KoPoint& p) pPoints[3].setY(x * m.m12() + y2 * m.m22() + m.dy()); if(PointInPoly(pPoints, 4, &pos)) { - return pShape->tqshapeData()->name(); + return pShape->shapeData()->name(); } if(!first) { @@ -2063,7 +2063,7 @@ TQString KivioSMLStencil::getTextBoxName(const KoPoint& p) } if(first) { - return first->tqshapeData()->name(); + return first->shapeData()->name(); } return TQString(); @@ -2075,9 +2075,9 @@ void KivioSMLStencil::setText(const TQString& text, const TQString& name) while(pShape) { - if(pShape->tqshapeData()->name() == name) + if(pShape->shapeData()->name() == name) { - pShape->tqshapeData()->setText(text); + pShape->shapeData()->setText(text); return; } @@ -2091,9 +2091,9 @@ TQString KivioSMLStencil::text(const TQString& name) while(pShape) { - if(pShape->tqshapeData()->name() == name) + if(pShape->shapeData()->name() == name) { - return pShape->tqshapeData()->text(); + return pShape->shapeData()->text(); } pShape = m_pShapeList->next(); @@ -2128,7 +2128,7 @@ bool KivioSMLStencil::hasTextBox() const { KivioShape* pShape = m_pShapeList->first(); while(pShape) { - if(pShape->tqshapeData()->tqshapeType() == KivioShapeData::kstTextBox) { + if(pShape->shapeData()->shapeType() == KivioShapeData::kstTextBox) { return true; } @@ -2140,89 +2140,89 @@ bool KivioSMLStencil::hasTextBox() const TQColor KivioSMLStencil::textColor(const TQString& textBoxName) { - KivioShape* tqshape = locateShape(textBoxName); + KivioShape* shape = locateShape(textBoxName); - if(!tqshape) + if(!shape) return textColor(); - return tqshape->tqshapeData()->textColor(); + return shape->shapeData()->textColor(); } void KivioSMLStencil::setTextColor(const TQString& textBoxName, const TQColor& color) { - KivioShape* tqshape = locateShape(textBoxName); + KivioShape* shape = locateShape(textBoxName); - // If we didn't find the tqshape set the color stencil wide - if(!tqshape) { + // If we didn't find the shape set the color stencil wide + if(!shape) { setTextColor(color); return; } - tqshape->tqshapeData()->setTextColor(color); + shape->shapeData()->setTextColor(color); } TQFont KivioSMLStencil::textFont(const TQString& textBoxName) { - KivioShape* tqshape = locateShape(textBoxName); + KivioShape* shape = locateShape(textBoxName); - if(!tqshape) + if(!shape) return textFont(); - return tqshape->tqshapeData()->textFont(); + return shape->shapeData()->textFont(); } void KivioSMLStencil::setTextFont(const TQString& textBoxName, const TQFont& font) { - KivioShape* tqshape = locateShape(textBoxName); + KivioShape* shape = locateShape(textBoxName); - if(!tqshape) { + if(!shape) { setTextFont(font); return; } - tqshape->tqshapeData()->setTextFont(font); + shape->shapeData()->setTextFont(font); } int KivioSMLStencil::hTextAlign(const TQString& textBoxName) { - KivioShape* tqshape = locateShape(textBoxName); + KivioShape* shape = locateShape(textBoxName); - if(!tqshape) + if(!shape) return hTextAlign(); - return tqshape->tqshapeData()->hTextAlign(); + return shape->shapeData()->hTextAlign(); } int KivioSMLStencil::vTextAlign(const TQString& textBoxName) { - KivioShape* tqshape = locateShape(textBoxName); + KivioShape* shape = locateShape(textBoxName); - if(!tqshape) + if(!shape) return vTextAlign(); - return tqshape->tqshapeData()->vTextAlign(); + return shape->shapeData()->vTextAlign(); } void KivioSMLStencil::setHTextAlign(const TQString& textBoxName, int align) { - KivioShape* tqshape = locateShape(textBoxName); + KivioShape* shape = locateShape(textBoxName); - if(!tqshape) { + if(!shape) { setHTextAlign(align); return; } - tqshape->tqshapeData()->setHTextAlign(align); + shape->shapeData()->setHTextAlign(align); } void KivioSMLStencil::setVTextAlign(const TQString& textBoxName, int align) { - KivioShape* tqshape = locateShape(textBoxName); + KivioShape* shape = locateShape(textBoxName); - if(!tqshape) { + if(!shape) { setVTextAlign(align); return; } - tqshape->tqshapeData()->setVTextAlign(align); + shape->shapeData()->setVTextAlign(align); } diff --git a/kivio/kiviopart/kiviosdk/kivio_sml_stencil.h b/kivio/kiviopart/kiviosdk/kivio_sml_stencil.h index 30e53e93..c9ebcc6c 100644 --- a/kivio/kiviopart/kiviosdk/kivio_sml_stencil.h +++ b/kivio/kiviopart/kiviosdk/kivio_sml_stencil.h @@ -101,7 +101,7 @@ public: virtual bool loadXML( const TQDomElement & ); virtual TQDomElement saveXML( TQDomDocument & ); - virtual TQPtrList<KivioShape> *tqshapeList() { return m_pShapeList; } + virtual TQPtrList<KivioShape> *shapeList() { return m_pShapeList; } virtual KivioShape *subSelection() { return m_pSubSelection; } virtual void paintOutline( KivioIntraStencilData * ); diff --git a/kivio/kiviopart/kiviosdk/kivio_sml_stencil_spawner.cpp b/kivio/kiviopart/kiviosdk/kivio_sml_stencil_spawner.cpp index 588a468e..d18caae8 100644 --- a/kivio/kiviopart/kiviosdk/kivio_sml_stencil_spawner.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_sml_stencil_spawner.cpp @@ -164,15 +164,15 @@ bool KivioSMLStencilSpawner::loadXML( const TQString &file, TQDomDocument &d ) /** - * Loads a tqshape from an XML node. + * Loads a shape from an XML node. */ -void KivioSMLStencilSpawner::loadShape( TQDomNode &tqshapeNode ) +void KivioSMLStencilSpawner::loadShape( TQDomNode &shapeNode ) { KivioShapeData::KivioShapeType t; KivioShape *pShape = NULL; - TQDomElement tqshapeElement = tqshapeNode.toElement(); + TQDomElement shapeElement = shapeNode.toElement(); - t = KivioShapeData::tqshapeTypeFromString( XmlReadString( tqshapeElement, "type", "None" ) ); + t = KivioShapeData::shapeTypeFromString( XmlReadString( shapeElement, "type", "None" ) ); switch( t ) { @@ -180,51 +180,51 @@ void KivioSMLStencilSpawner::loadShape( TQDomNode &tqshapeNode ) break; case KivioShapeData::kstArc: - pShape = KivioShape::loadShapeArc( tqshapeElement ); + pShape = KivioShape::loadShapeArc( shapeElement ); break; case KivioShapeData::kstPie: - pShape = KivioShape::loadShapePie( tqshapeElement ); + pShape = KivioShape::loadShapePie( shapeElement ); break; case KivioShapeData::kstLineArray: - pShape = KivioShape::loadShapeLineArray( tqshapeElement ); + pShape = KivioShape::loadShapeLineArray( shapeElement ); break; case KivioShapeData::kstPolyline: - pShape = KivioShape::loadShapePolyline( tqshapeElement ); + pShape = KivioShape::loadShapePolyline( shapeElement ); break; case KivioShapeData::kstPolygon: - pShape = KivioShape::loadShapePolygon( tqshapeElement ); + pShape = KivioShape::loadShapePolygon( shapeElement ); break; case KivioShapeData::kstBezier: - pShape = KivioShape::loadShapeBezier( tqshapeElement ); + pShape = KivioShape::loadShapeBezier( shapeElement ); break; case KivioShapeData::kstRectangle: - pShape = KivioShape::loadShapeRectangle( tqshapeElement ); + pShape = KivioShape::loadShapeRectangle( shapeElement ); break; case KivioShapeData::kstRoundRectangle: - pShape = KivioShape::loadShapeRoundRectangle( tqshapeElement ); + pShape = KivioShape::loadShapeRoundRectangle( shapeElement ); break; case KivioShapeData::kstEllipse: - pShape = KivioShape::loadShapeEllipse( tqshapeElement ); + pShape = KivioShape::loadShapeEllipse( shapeElement ); break; case KivioShapeData::kstOpenPath: - pShape = KivioShape::loadShapeOpenPath( tqshapeElement ); + pShape = KivioShape::loadShapeOpenPath( shapeElement ); break; case KivioShapeData::kstClosedPath: - pShape = KivioShape::loadShapeClosedPath( tqshapeElement ); + pShape = KivioShape::loadShapeClosedPath( shapeElement ); break; case KivioShapeData::kstTextBox: - pShape = KivioShape::loadShapeTextBox( tqshapeElement ); + pShape = KivioShape::loadShapeTextBox( shapeElement ); break; default: diff --git a/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.cpp b/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.cpp index c2e54a58..0fdd2ac1 100644 --- a/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.cpp @@ -104,7 +104,7 @@ bool KivioStencilSpawnerSet::loadDir( const TQString &dirName ) m_name = readTitle( dirName ); m_id = readId( dirName ); - d.setNameFilter("*.so *.sml *.ksp *.spy *.tqshape"); + d.setNameFilter("*.so *.sml *.ksp *.spy *.shape"); m_files = d.entryList(); return true; @@ -134,7 +134,7 @@ KivioStencilSpawner* KivioStencilSpawnerSet::loadFile( const TQString &fileName { pSpawner = new KivioPyStencilSpawner(this); } - else if( fileName.contains( ".tqshape", false ) ) + else if( fileName.contains( ".shape", false ) ) { pSpawner = new KivioDiaStencilSpawner(this); } diff --git a/kivio/kiviopart/kiviosdk/kivio_text_style.h b/kivio/kiviopart/kiviosdk/kivio_text_style.h index 2a8ecd62..73c13e0e 100644 --- a/kivio/kiviopart/kiviosdk/kivio_text_style.h +++ b/kivio/kiviopart/kiviosdk/kivio_text_style.h @@ -14,11 +14,11 @@ class TQPainter; class KivioTextStyle { protected: - TQString m_text; // The text inside this tqshape + TQString m_text; // The text inside this shape TQColor m_color; // The text color TQFont m_font; // The text font bool m_isHtml; // Is the text HTML formatted? - int m_hTextAlign, m_vTextAlign; //Qt::Horizontal and vertical text tqalignment flags + int m_hTextAlign, m_vTextAlign; //Qt::Horizontal and vertical text alignment flags public: KivioTextStyle(); diff --git a/kivio/kiviopart/kiviostencilsetinstaller.cpp b/kivio/kiviopart/kiviostencilsetinstaller.cpp index e0d2b363..67cb4d87 100644 --- a/kivio/kiviopart/kiviostencilsetinstaller.cpp +++ b/kivio/kiviopart/kiviostencilsetinstaller.cpp @@ -24,7 +24,7 @@ #include "kiviostencilsetinstaller.h" #include <tqframe.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <tqstringlist.h> @@ -74,7 +74,7 @@ namespace Kivio { TQString tmpFile; if(!KIO::NetAccess::download(url, tmpFile, this)) { - KMessageBox::error(this, i18n("Could not find the stencil set archive %1.").tqarg(url.prettyURL())); + KMessageBox::error(this, i18n("Could not find the stencil set archive %1.").arg(url.prettyURL())); return; } diff --git a/kivio/kiviopart/stencilbarbutton.cpp b/kivio/kiviopart/stencilbarbutton.cpp index d3d30dae..39fb22ef 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; @@ -231,7 +231,7 @@ void DragBarButton::mousePressEvent( TQMouseEvent* ev ) if ( closeRect.contains(ev->pos())) { m_bClose = true; - tqrepaint(); + repaint(); return; } @@ -243,7 +243,7 @@ void DragBarButton::mouseReleaseEvent( TQMouseEvent* ev ) { if ( m_bClose ) { m_bClose = false; - tqrepaint(); + repaint(); TQRect closeRect; if(m_orientation == Qt::Vertical) { @@ -285,14 +285,14 @@ void DragBarButton::enterEvent( TQEvent* ev ) { TQPushButton::enterEvent(ev); m_bMouseOn = true; - tqrepaint(false); + repaint(false); } void DragBarButton::leaveEvent( TQEvent* ev ) { TQPushButton::leaveEvent(ev); m_bMouseOn = false; - tqrepaint(); + repaint(); } void DragBarButton::setOrientation(Qt::Orientation orientation) @@ -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..aa5c30c4 100644 --- a/kivio/kiviopart/stencilbardockmanager.cpp +++ b/kivio/kiviopart/stencilbardockmanager.cpp @@ -179,7 +179,7 @@ void StencilBarDockManager::slotFinishDragPage( DragBarButton* ) KivioStackBar* bar = (KivioStackBar*)sender(); bar->removePage(dragWidget); - insertStencilSet(dragWidget,caption,dragPos,moveManager->tqgeometry(),m_destinationBar); + insertStencilSet(dragWidget,caption,dragPos,moveManager->geometry(),m_destinationBar); // remove KivioStackBar if no more pages if (!bar->visiblePage()) { @@ -205,13 +205,13 @@ void StencilBarDockManager::slotMoving() // check existing bars for ( KivioStackBar* bar = m_pBars.first(); bar; bar = m_pBars.next() ) { - if ( bar->tqgeometry().contains(p) ) { + if ( bar->geometry().contains(p) ) { if(bar->place() == TQDockWindow::OutsideDock) { dragPos = OnTopLevelBar; - globalPos = bar->tqgeometry().topLeft(); + globalPos = bar->geometry().topLeft(); } else { dragPos = AutoSelect; - globalPos = bar->mapToGlobal(bar->tqgeometry().topLeft()); + globalPos = bar->mapToGlobal(bar->geometry().topLeft()); } m_destinationBar = bar; @@ -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(); @@ -631,7 +631,7 @@ bool KoToolDockMoveManager::check(int& x, int& y, int& w, int& h, bool change) return f1&&f2; } -TQRect KoToolDockMoveManager::tqgeometry() +TQRect KoToolDockMoveManager::geometry() { int x0 = xp; int y0 = yp; diff --git a/kivio/kiviopart/stencilbardockmanager.h b/kivio/kiviopart/stencilbardockmanager.h index 8406e5f0..73d48301 100644 --- a/kivio/kiviopart/stencilbardockmanager.h +++ b/kivio/kiviopart/stencilbardockmanager.h @@ -114,7 +114,7 @@ class KoToolDockMoveManager: public TQObject void setGeometry( const TQRect& r ); void setGeometry(int x, int y, int w, int h); - TQRect tqgeometry(); + TQRect geometry(); void resize( const TQSize& s ) { setGeometry(xp, yp, s.width(), s.height()); } void resize(int rw, int rh) { setGeometry(xp, yp, rw, rh); } diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-chevron.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-chevron.shape index 7d7cb3cb..8ff02c32 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-chevron.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-chevron.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Block Arrow - Chevron</name><!-- Block Arrow - Chevron, as seen in PowerPoint 97 --> <icon>arrow-chevron.png</icon> @@ -32,4 +32,4 @@ <svg:polygon style="fill: default" points="0,0 2,0 3,1 2,2 0,2 1,1 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,0 2,0 3,1 2,2 0,2 1,1 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-down.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-down.shape index b0e44553..6e1388fe 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-down.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-down.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Down Arrow</name> <icon>arrow-down.png</icon> @@ -36,4 +36,4 @@ <svg:polygon style="fill: default" points="1,0 1,2 0,2 2,4 4,2 3,2 3,0 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="1,0 1,2 0,2 2,4 4,2 3,2 3,0 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-notched.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-notched.shape index d536a6b6..a4f20839 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-notched.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-notched.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Notched Left Arrow</name> <icon>arrow-left-notched.png</icon> @@ -40,4 +40,4 @@ <svg:polygon style="fill: default" points="4,1 2,1 2,0 0,2 2,4 2,3 4,3 3,2 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="4,1 2,1 2,0 0,2 2,4 2,3 4,3 3,2 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-right-up.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-right-up.shape index d2579d6d..54babdd8 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-right-up.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-right-up.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Left-Right-Up Arrow</name> <icon>arrow-left-right-up.png</icon> @@ -76,4 +76,4 @@ <svg:polygon style="fill: default" points="8,4 6,4 6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7 2,6 8,6 8,7 10,5 8,3 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="8,4 6,4 6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7 2,6 8,6 8,7 10,5 8,3 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-right.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-right.shape index b2e85882..03b7787c 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-right.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-right.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Left-Right Arrow</name> <icon>arrow-left-right.png</icon> @@ -48,4 +48,4 @@ <svg:polygon style="fill: default" points="6,1 2,1 2,0 0,2 2,4 2,3 6,3 6,4 8,2 6,0 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="6,1 2,1 2,0 0,2 2,4 2,3 6,3 6,4 8,2 6,0 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-up.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-up.shape index e70c0d2a..e3c0c008 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-up.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-up.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Assorted - Left-Up Arrow</name> <icon>arrow-left-up.png</icon> @@ -56,4 +56,4 @@ <svg:polygon style="fill: #ffffff" points="6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7 2,6 6,6 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7 2,6 6,6 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left.shape index e2e513af..8eb15cd4 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Left Arrow</name> <icon>arrow-left.png</icon> @@ -36,4 +36,4 @@ <svg:polygon style="fill: default" points="4,1 2,1 2,0 0,2 2,4 2,3 4,3 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="4,1 2,1 2,0 0,2 2,4 2,3 4,3 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-pentagon.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-pentagon.shape index b99c3461..ef0f7f47 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-pentagon.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-pentagon.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Block Arrow - Pentagon</name><!-- Arrow Pentagon as seen in Powerpoint 97 --> <icon>arrow-pentagon.png</icon> @@ -28,4 +28,4 @@ <svg:polygon style="fill: default" points="0,0 2,0 3,1 2,2 0,2 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,0 2,0 3,1 2,2 0,2 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-quad.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-quad.shape index 1886293b..6351e8dd 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-quad.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-quad.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Quad Arrow</name> <icon>arrow-quad.png</icon> @@ -57,4 +57,4 @@ <svg:polygon style="fill: default" points="8,4 6,4 6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7 2,6 4,6 4,8 3,8 5,10 7,8 6,8 6,6 8,6 8,7 10,5 8,3 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="8,4 6,4 6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7 2,6 4,6 4,8 3,8 5,10 7,8 6,8 6,6 8,6 8,7 10,5 8,3 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-right-notched.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-right-notched.shape index 8738ffea..17d670fc 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-right-notched.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-right-notched.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Notched Right Arrow</name> <icon>arrow-right-notched.png</icon> @@ -40,4 +40,4 @@ <svg:polygon style="fill: default" points="0,1 2,1 2,0 4,2 2,4 2,3 0,3 1,2 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,1 2,1 2,0 4,2 2,4 2,3 0,3 1,2 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-right.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-right.shape index be5bf79c..8e9fea1d 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-right.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-right.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Right Arrow</name> <icon>arrow-right.png</icon> @@ -36,4 +36,4 @@ <svg:polygon style="fill: default" points="0,1 2,1 2,0 4,2 2,4 2,3 0,3 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,1 2,1 2,0 4,2 2,4 2,3 0,3 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-up-down-left.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-up-down-left.shape index 0549dbe8..8d418022 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-up-down-left.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-up-down-left.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Up-Down-Left Arrow</name> <icon>arrow-up-down-left.png</icon> @@ -76,4 +76,4 @@ <svg:polygon style="fill: default" points="6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7 2,6 4,6 4,8 3,8 5,10 7,8 6,8 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7 2,6 4,6 4,8 3,8 5,10 7,8 6,8 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-up-down.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-up-down.shape index f0f8623e..e94d2d17 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-up-down.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-up-down.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Up-Down Arrow</name> <icon>arrow-up-down.png</icon> @@ -48,4 +48,4 @@ <svg:polygon style="fill: default" points="1,6 1,2 0,2 2,0 4,2 3,2 3,6 4,6 2,8 0,6 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="1,6 1,2 0,2 2,0 4,2 3,2 3,6 4,6 2,8 0,6 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-up.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-up.shape index 83222aa8..791f8a78 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-up.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-up.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Up Arrow</name> <icon>arrow-up.png</icon> @@ -36,4 +36,4 @@ <svg:polygon style="fill: default" points="1,4 1,2 0,2 2,0 4,2 3,2 3,4 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="1,4 1,2 0,2 2,0 4,2 3,2 3,4 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/circle.shape b/kivio/kiviopart/stencils/Dia/Assorted/circle.shape index ae10097e..26647def 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/circle.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/circle.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Perfect Circle</name> <icon>circle.png</icon> @@ -18,4 +18,4 @@ <svg:ellipse style="fill: default" cx="1.5" cy="2" rx="1" ry="1"/> <svg:ellipse style="stroke-width: 0.1; stroke: #000000" cx="1.5" cy="2" rx="1" ry="1"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/cross-maltese.shape b/kivio/kiviopart/stencils/Dia/Assorted/cross-maltese.shape index 2b6a598c..2bc02249 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/cross-maltese.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/cross-maltese.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Maltese Cross</name><!-- St. John's Ambulance --> <icon>cross-maltese.png</icon> @@ -41,4 +41,4 @@ <svg:polygon style="fill: default" points="7,6 7.5,5 7,4 9,5 8,3 9,3.5 10,3 9,5 11,4 10.5,5 11,6 9,5 10,7 9,6.5 8,7 9,5 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="7,6 7.5,5 7,4 9,5 8,3 9,3.5 10,3 9,5 11,4 10.5,5 11,6 9,5 10,7 9,6.5 8,7 9,5 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/cross-swiss.shape b/kivio/kiviopart/stencils/Dia/Assorted/cross-swiss.shape index 88d86baa..2aeef611 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/cross-swiss.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/cross-swiss.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Swiss Cross</name> <!-- Swiss flag has a white cross on red --> @@ -59,4 +59,4 @@ <svg:polygon style="fill: default" points="2.55,3.05 2.55,2.55 3.05,2.55 3.05,2.05 3.55,2.05 3.55,2.55 4.05,2.55 4.05,3.05 3.55,3.05 3.55,3.55 3.05,3.55 3.05,3.05 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="2.55,3.05 2.55,2.55 3.05,2.55 3.05,2.05 3.55,2.05 3.55,2.55 4.05,2.55 4.05,3.05 3.55,3.05 3.55,3.55 3.05,3.55 3.05,3.05 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/diamond.shape b/kivio/kiviopart/stencils/Dia/Assorted/diamond.shape index a031d369..88948942 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/diamond.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/diamond.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Diamond</name> <icon>diamond.png</icon> @@ -18,4 +18,4 @@ <svg:polygon style="fill: default" points="1,0 2,1 1,2 0,1 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="1,0 2,1 1,2 0,1 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/heptagon.shape b/kivio/kiviopart/stencils/Dia/Assorted/heptagon.shape index ecfac8e2..ea2c2400 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/heptagon.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/heptagon.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Heptagon</name> <icon>heptagon.png</icon> @@ -36,4 +36,4 @@ <svg:polygon style="fill: #ffffff" points="0,6 0.5,2 5,0 9.5,2 10,6 7.5,9.5 2.5,9.5 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,6 0.5,2 5,0 9.5,2 10,6 7.5,9.5 2.5,9.5 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/hexagon.shape b/kivio/kiviopart/stencils/Dia/Assorted/hexagon.shape index 71bedc8d..a21aa220 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/hexagon.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/hexagon.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Hexagon</name> <icon>hexagon.png</icon> @@ -32,4 +32,4 @@ <svg:polygon style="fill: default" points="1.5,1 3,1 4,2.5 3,4 1.5,4 0.5,2.5 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="1.5,1 3,1 4,2.5 3,4 1.5,4 0.5,2.5 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/octagon.shape b/kivio/kiviopart/stencils/Dia/Assorted/octagon.shape index 794cd4b8..c0dceb97 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/octagon.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/octagon.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Octagon</name> <icon>octagon.png</icon> @@ -25,4 +25,4 @@ <svg:polygon style="fill: default" points="3.55,2.05 5.05,2.05 6.05,3.05 6.05,4.55 5.05,5.55 3.55,5.55 2.55,4.55 2.55,3.05 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="3.55,2.05 5.05,2.05 6.05,3.05 6.05,4.55 5.05,5.55 3.55,5.55 2.55,4.55 2.55,3.05 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/parallelogram-horizontal.shape b/kivio/kiviopart/stencils/Dia/Assorted/parallelogram-horizontal.shape index b85fa737..1c37662b 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/parallelogram-horizontal.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/parallelogram-horizontal.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric -Qt::Horizontal Parallelogram</name> <icon>parallelogram-horizontal.png</icon> @@ -24,4 +24,4 @@ <svg:polygon style="fill: default" points="1,0 2,0 1,1 0,1 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="1,0 2,0 1,1 0,1 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/parallelogram-vertical.shape b/kivio/kiviopart/stencils/Dia/Assorted/parallelogram-vertical.shape index d5794080..0f344091 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/parallelogram-vertical.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/parallelogram-vertical.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric -Qt::Vertical Parallelogram</name> <icon>parallelogram-vertical.png</icon> @@ -24,4 +24,4 @@ <svg:polygon style="fill: default" points="0,1 1,0 1,1 0,2 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,1 1,0 1,1 0,2 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/pentagon.shape b/kivio/kiviopart/stencils/Dia/Assorted/pentagon.shape index a3941127..89db85e7 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/pentagon.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/pentagon.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Pentagon</name> <icon>pentagon.png</icon> @@ -28,4 +28,4 @@ <svg:polygon style="fill: default" points="0,1.5 2,0 4,1.5 3,3.5 1,3.5 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,1.5 2,0 4,1.5 3,3.5 1,3.5 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/square.shape b/kivio/kiviopart/stencils/Dia/Assorted/square.shape index e7be1a89..67d58bf4 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/square.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/square.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Perfect Square</name> <icon>square.png</icon> @@ -26,4 +26,4 @@ <svg:rect style="fill: default" x="4.5" y="2.45" width="1.5" height="1.55"/> <svg:rect style="stroke-width: 0.1; stroke: #000000" x="4.5" y="2.45" width="1.5" height="1.55"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/star4.shape b/kivio/kiviopart/stencils/Dia/Assorted/star4.shape index 5d66851c..d57432a9 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/star4.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/star4.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Four Point Star</name> <icon>star4.png</icon> @@ -25,4 +25,4 @@ <svg:polygon style="fill: default" points="0,2.5 1.5,2 2,0.5 2.5,2 4,2.5 2.5,3 2,4.5 1.5,3 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,2.5 1.5,2 2,0.5 2.5,2 4,2.5 2.5,3 2,4.5 1.5,3 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/star5.shape b/kivio/kiviopart/stencils/Dia/Assorted/star5.shape index 379b74c6..20d55b99 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/star5.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/star5.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Five Point Star</name> <!-- Eventually decided that it was better to get these done than worry about them being perfect --> @@ -50,5 +50,5 @@ <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,4.5 5,4.5 7,0 9,4.5 14,4.5 10,7.5 12,12.5 7,9 2,12.5 4,7.5 "/> </svg:svg> <!-- Alan Horkan was here 2002 --> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/star6.shape b/kivio/kiviopart/stencils/Dia/Assorted/star6.shape index 2c2f5cac..bbaf2853 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/star6.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/star6.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Six Point Star</name><!-- aka Star of David --> <icon>star6.png</icon> @@ -56,4 +56,4 @@ <svg:polygon style="fill: default" points="0,1 1,1 1.5,0 2,1 3,1 2.5,2 3,3 2,3 1.5,4 1,3 0,3 0.5,2 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,1 1,1 1.5,0 2,1 3,1 2.5,2 3,3 2,3 1.5,4 1,3 0,3 0.5,2 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/star7.shape b/kivio/kiviopart/stencils/Dia/Assorted/star7.shape index adef753f..cb008f12 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/star7.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/star7.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Seven Point Star</name> <!-- It may not be a perfect Heptagon, but it looks good and it is at least Symmetrical. --> @@ -65,4 +65,4 @@ <svg:polygon style="fill: default" points="5,0 6.5,2 9,2 8.5,4.5 10,6.5 8,7 7.5,9.5 5,8 2.5,9.5 2,7 0,6.5 1.5,4.5 1,2 3.5,2 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="5,0 6.5,2 9,2 8.5,4.5 10,6.5 8,7 7.5,9.5 5,8 2.5,9.5 2,7 0,6.5 1.5,4.5 1,2 3.5,2 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/star8.shape b/kivio/kiviopart/stencils/Dia/Assorted/star8.shape index 80664b5f..b67bdb42 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/star8.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/star8.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Eight Point Star</name> <!-- The points all have Nintey Degree Angles --> @@ -74,4 +74,4 @@ <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,3.5 1,2.5 1,1 2.5,1 3.5,0 4.5,1 6,1 6,2.5 7,3.5 6,4.5 6,6 4.5,6 3.5,7 2.5,6 1,6 1,4.5 "/> </svg:svg> <!-- Alan Horkan, 2002, horkana@tcd.ie --> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/star8sharp.shape b/kivio/kiviopart/stencils/Dia/Assorted/star8sharp.shape index 1e97b53b..c68e257c 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/star8sharp.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/star8sharp.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Sharp Eight Point Star</name> <!-- Angles in this Star are much sharper, about Thirty degrees --> @@ -73,5 +73,5 @@ <svg:polygon style="fill: default" points="0,7.5 5,6.5 2.5,2.5 6.5,5 7.5,0 8.5,5 12.5,2.5 10,6.5 15,7.5 10,8.5 12.5,12.5 8.5,10 7.5,15 6.5,10 2.5,12.5 5,8.5 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,7.5 5,6.5 2.5,2.5 6.5,5 7.5,0 8.5,5 12.5,2.5 10,6.5 15,7.5 10,8.5 12.5,12.5 8.5,10 7.5,15 6.5,10 2.5,12.5 5,8.5 "/> </svg:svg> -</tqshape> +</shape> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/sun.shape b/kivio/kiviopart/stencils/Dia/Assorted/sun.shape index b638e315..48ae7b4e 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/sun.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/sun.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Assorted - Sun</name> <icon>sun.png</icon> @@ -94,7 +94,7 @@ <point x="1.25" y="5.5"/> </connections> <aspectratio type="fixed"/> - <!-- I orignally used a nice warm gold colour #ffcc00, but tqshape files + <!-- I orignally used a nice warm gold colour #ffcc00, but shape files have to use default if you want to allow the user to change the fill colour --> <svg:svg> <svg:polygon style="fill: default" points="3.5,0 4,1 3,1 "/> @@ -116,5 +116,5 @@ have to use default if you want to allow the user to change the fill colour --> <svg:polygon style="fill: default" points="2,5.5 1.5,5 1,6 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="2,5.5 1.5,5 1,6 "/> </svg:svg> -</tqshape> +</shape> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/trapezoid.shape b/kivio/kiviopart/stencils/Dia/Assorted/trapezoid.shape index 474317f5..fb971a58 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/trapezoid.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/trapezoid.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Trapezoid</name> <icon>trapezoid.png</icon> @@ -18,4 +18,4 @@ <svg:polygon style="fill: #ffffff" points="1,0 3,0 4,2 0,2 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="1,0 3,0 4,2 0,2 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/triangle-isoceles.shape b/kivio/kiviopart/stencils/Dia/Assorted/triangle-isoceles.shape index 74245a0c..2708c5c0 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/triangle-isoceles.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/triangle-isoceles.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Isosceles Triangle</name><!-- Triangle with two sides of equal length --> <icon>triangle-isoceles.png</icon> @@ -20,4 +20,4 @@ <svg:polygon style="fill: default" points="5.5,4 6.5,6 4.5,6 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="5.5,4 6.5,6 4.5,6 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/triangle-rightangle.shape b/kivio/kiviopart/stencils/Dia/Assorted/triangle-rightangle.shape index 5d38874a..3d7097ac 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/triangle-rightangle.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/triangle-rightangle.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Right Angle Triangle</name> <icon>triangle-rightangle.png</icon> @@ -18,5 +18,5 @@ <svg:polygon style="fill: #ffffff" points="0,2 2,2 0,0 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,2 2,2 0,0 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Circuit/npn.shape b/kivio/kiviopart/stencils/Dia/Circuit/npn.shape index d57fe166..d0636820 100644 --- a/kivio/kiviopart/stencils/Dia/Circuit/npn.shape +++ b/kivio/kiviopart/stencils/Dia/Circuit/npn.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Circuit - NPN Transistor</name> <!-- @@ -24,5 +24,5 @@ <svg:polyline points="5,4 6,4 5.6154,3.0769" /> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Circuit/opamp.shape b/kivio/kiviopart/stencils/Dia/Circuit/opamp.shape index 756cf865..f6e83ce1 100644 --- a/kivio/kiviopart/stencils/Dia/Circuit/opamp.shape +++ b/kivio/kiviopart/stencils/Dia/Circuit/opamp.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Circuit - Op Amp</name> <description>An operational amplifier</description> @@ -22,5 +22,5 @@ <svg:line x1="1.2" y1="1" x2="2" y2="1" /> <svg:line x1="4.5" y1="0" x2="5.5" y2="0" /> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Circuit/pnp.shape b/kivio/kiviopart/stencils/Dia/Circuit/pnp.shape index c89b7832..3e0e59ef 100644 --- a/kivio/kiviopart/stencils/Dia/Circuit/pnp.shape +++ b/kivio/kiviopart/stencils/Dia/Circuit/pnp.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Circuit - PNP Transistor</name> <!-- @@ -24,5 +24,5 @@ <svg:polyline points="4,2 3,2 3.3846,2.9231" /> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_arrow_right.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_arrow_right.shape index 66f3b1ba..9032094b 100644 --- a/kivio/kiviopart/stencils/Dia/Civil/civil_arrow_right.shape +++ b/kivio/kiviopart/stencils/Dia/Civil/civil_arrow_right.shape @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Civil - Right Arrow</name> @@ -78,5 +78,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> <svg:polygon style="stroke-width: 1; stroke: foreground" points="0,0.5 1.5,0.5 2,0.5 2,0 3,1 2,2 2,1.5 0,1.5 " /> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_arrow_up.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_arrow_up.shape index 2053db21..b1a15619 100644 --- a/kivio/kiviopart/stencils/Dia/Civil/civil_arrow_up.shape +++ b/kivio/kiviopart/stencils/Dia/Civil/civil_arrow_up.shape @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Civil - Up Arrow</name> @@ -76,5 +76,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> <svg:polygon style="stroke-width: 1; stroke: foreground" points="0.5,3 0.5,1 0,1 1,0 1,0 2,1 1.5,1 1.5,3 " /> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_backflow_preventer.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_backflow_preventer.shape index 5abe7185..9168966d 100644 --- a/kivio/kiviopart/stencils/Dia/Civil/civil_backflow_preventer.shape +++ b/kivio/kiviopart/stencils/Dia/Civil/civil_backflow_preventer.shape @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Civil - Backflow Preventer</name> @@ -55,5 +55,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> <svg:line style="stroke-width: 1; stroke: #000000" x1="0.2" y1="0.8" x2="0.8" y2="0.2" /> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_basin.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_basin.shape index 0d7c4231..ea4d47a9 100644 --- a/kivio/kiviopart/stencils/Dia/Civil/civil_basin.shape +++ b/kivio/kiviopart/stencils/Dia/Civil/civil_basin.shape @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Civil - Basin</name> @@ -74,5 +74,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> <svg:polygon style="stroke-width: 1; stroke: #000000" points="0,0 0.2,0 0.2,2.8 4.8,2.8 4.8,0 5,0 5,3 0,3 " /> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_final-settling_basin.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_final-settling_basin.shape index 5add8f35..84a2002f 100644 --- a/kivio/kiviopart/stencils/Dia/Civil/civil_final-settling_basin.shape +++ b/kivio/kiviopart/stencils/Dia/Civil/civil_final-settling_basin.shape @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Civil - Final-Settling Basin</name> @@ -106,5 +106,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> style="stroke-width: 1; stroke: foreground; fill: background" points="0,0 0.3,0 0.3,1.9 1.4,3.7 1.6,3.7 2.7,1.9 2.7,0 3,0 3,2 1.8,4 1.2,4 0,2 " /> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_frequency_converter.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_frequency_converter.shape index bdfcb107..ac143720 100644 --- a/kivio/kiviopart/stencils/Dia/Civil/civil_frequency_converter.shape +++ b/kivio/kiviopart/stencils/Dia/Civil/civil_frequency_converter.shape @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Civil - Frequency Converter</name> @@ -57,5 +57,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> <svg:line style="stroke-width: 1; stroke: #000000" x1="0" y1="2" x2="3" y2="0" /> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_horizontal_valve.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_horizontal_valve.shape index bbe4d3dc..83d94349 100644 --- a/kivio/kiviopart/stencils/Dia/Civil/civil_horizontal_valve.shape +++ b/kivio/kiviopart/stencils/Dia/Civil/civil_horizontal_valve.shape @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Civil -Qt::Horizontal Valve</name> @@ -62,5 +62,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> <svg:polygon style="stroke-width: 1; stroke: foreground" points="0,1 0,0 0.5,0.5 1,0 1,1 0.5,0.5 " /> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_motor.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_motor.shape index beec8aa1..270628be 100644 --- a/kivio/kiviopart/stencils/Dia/Civil/civil_motor.shape +++ b/kivio/kiviopart/stencils/Dia/Civil/civil_motor.shape @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Civil - Motor</name> @@ -53,5 +53,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> <svg:polyline style="stroke-width: 1; stroke: #000000" points="0.3,0.7 0.3,0.3 0.5,0.5 0.7,0.3 0.7,0.7 " /> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_preliminary_clarification_tank.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_preliminary_clarification_tank.shape index c78f62f0..36c4f89b 100644 --- a/kivio/kiviopart/stencils/Dia/Civil/civil_preliminary_clarification_tank.shape +++ b/kivio/kiviopart/stencils/Dia/Civil/civil_preliminary_clarification_tank.shape @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Civil - Preliminary Clarification Tank</name> @@ -257,5 +257,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> <svg:line style="stroke-width: 0.5; stroke: #000000" x1="3.4" y1="0.4" x2="5.8" y2="0.4" /> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_rotor.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_rotor.shape index a721ed0e..4f0f98df 100644 --- a/kivio/kiviopart/stencils/Dia/Civil/civil_rotor.shape +++ b/kivio/kiviopart/stencils/Dia/Civil/civil_rotor.shape @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Civil - Rotor</name> @@ -104,5 +104,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> <svg:line style="stroke-width: 1; stroke: #000000" x1="2.20711" y1="0.792893" x2="2.56066" y2="0.43934" /> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_soil.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_soil.shape index 03f859e5..a658df14 100644 --- a/kivio/kiviopart/stencils/Dia/Civil/civil_soil.shape +++ b/kivio/kiviopart/stencils/Dia/Civil/civil_soil.shape @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Civil - Soil</name> @@ -71,5 +71,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> <svg:line style="stroke-width: 0.8; stroke: foreground" x1="2.36192" y1="0" x2="1.75837" y2="1" /> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Contact/c_if.shape b/kivio/kiviopart/stencils/Dia/Contact/c_if.shape index 43b9495f..57cdbdb7 100644 --- a/kivio/kiviopart/stencils/Dia/Contact/c_if.shape +++ b/kivio/kiviopart/stencils/Dia/Contact/c_if.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- -*- xml -*- --> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Contact - if</name> <!-- XXX - OBSOLETE --> <description>if</description> @@ -18,6 +18,6 @@ <svg:polyline points="-2,0 -.75,0" /> <svg:polyline points="-1,1 1,0 2,0 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Contact/c_ifnot.shape b/kivio/kiviopart/stencils/Dia/Contact/c_ifnot.shape index 667e75f6..d8ae4d62 100644 --- a/kivio/kiviopart/stencils/Dia/Contact/c_ifnot.shape +++ b/kivio/kiviopart/stencils/Dia/Contact/c_ifnot.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- -*- xml -*- --> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Contact - ifnot</name> <!-- XXX - OBSOLETE --> <description>if not</description> @@ -20,6 +20,6 @@ <svg:line x1="-.5" y1="-2.2" x2=".5" y2="-2.2" svg:style="stroke-width:.05"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Contact/c_lamp.shape b/kivio/kiviopart/stencils/Dia/Contact/c_lamp.shape index 1e3d1042..15cc5257 100644 --- a/kivio/kiviopart/stencils/Dia/Contact/c_lamp.shape +++ b/kivio/kiviopart/stencils/Dia/Contact/c_lamp.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- -*- xml -*- --> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Contact - lamp</name> <!-- XXX OBSOLETE --> <description>lamp</description> @@ -20,6 +20,6 @@ <svg:polyline points="-.707,-.707 .707,.707"/> <svg:polyline points="-.707,.707 .707,-.707"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Contact/c_relay.shape b/kivio/kiviopart/stencils/Dia/Contact/c_relay.shape index 4016df10..f933cf5b 100644 --- a/kivio/kiviopart/stencils/Dia/Contact/c_relay.shape +++ b/kivio/kiviopart/stencils/Dia/Contact/c_relay.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- -*- xml -*- --> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Contact - relay</name> <!-- XXX OBSOLETE --> <description>relay</description> @@ -21,6 +21,6 @@ <svg:rect x="-1" y="-1" width="2" height="2"/> <svg:polyline points="-1,.5 1,-.5"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_ifnot.shape b/kivio/kiviopart/stencils/Dia/Contact/l_ifnot.shape index 1a7fd4e7..a58db432 100644 --- a/kivio/kiviopart/stencils/Dia/Contact/l_ifnot.shape +++ b/kivio/kiviopart/stencils/Dia/Contact/l_ifnot.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- -*- xml -*- --> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>LADDER - ifnot</name> <description>if not</description> @@ -23,4 +23,4 @@ <svg:line x1="-.5" y1="-2.2" x2=".5" y2="-2.2" svg:style="stroke-width:.05"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_out.shape b/kivio/kiviopart/stencils/Dia/Contact/l_out.shape index 124c3069..f595cb6a 100644 --- a/kivio/kiviopart/stencils/Dia/Contact/l_out.shape +++ b/kivio/kiviopart/stencils/Dia/Contact/l_out.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- -*- xml -*- --> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>LADDER - out</name> <description>out</description> @@ -22,6 +22,6 @@ <svg:path d="M .5,.75 C .75,.5 .75,.25 .75,0 C .75,-.25 .75,-.5 .5,-.75" /> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_outj.shape b/kivio/kiviopart/stencils/Dia/Contact/l_outj.shape index 49060cdf..427fd724 100644 --- a/kivio/kiviopart/stencils/Dia/Contact/l_outj.shape +++ b/kivio/kiviopart/stencils/Dia/Contact/l_outj.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- -*- xml -*- --> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>LADDER - outj</name> <description>out jump</description> @@ -25,6 +25,6 @@ C .25,.5 .5,.5 .5,.25 L .5,-.5"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_outnot.shape b/kivio/kiviopart/stencils/Dia/Contact/l_outnot.shape index 5a360fc5..15c078bd 100644 --- a/kivio/kiviopart/stencils/Dia/Contact/l_outnot.shape +++ b/kivio/kiviopart/stencils/Dia/Contact/l_outnot.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- -*- xml -*- --> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>LADDER - outnot</name> <description>outnot</description> @@ -23,6 +23,6 @@ C .75,-.25 .75,-.5 .5,-.75" /> <svg:polyline points="-.5,.5 .5,-.5"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_outr.shape b/kivio/kiviopart/stencils/Dia/Contact/l_outr.shape index 94761257..830eaae1 100644 --- a/kivio/kiviopart/stencils/Dia/Contact/l_outr.shape +++ b/kivio/kiviopart/stencils/Dia/Contact/l_outr.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- -*- xml -*- --> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>LADDER - outr</name> <description>out reset</description> @@ -28,6 +28,6 @@ <svg:polyline points="-.5,0 0,0" /> <svg:path d="M -.25,0 C 0,.25 0,.25 .5,.5"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_outs.shape b/kivio/kiviopart/stencils/Dia/Contact/l_outs.shape index 2ef92bd0..03cf0f4f 100644 --- a/kivio/kiviopart/stencils/Dia/Contact/l_outs.shape +++ b/kivio/kiviopart/stencils/Dia/Contact/l_outs.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- -*- xml -*- --> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>LADDER - outs</name> <description>out set</description> @@ -28,6 +28,6 @@ C .5,.5 .25,.5 0,.5 C -.25,.5 -.5,.5 -.5,.25"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_sout.shape b/kivio/kiviopart/stencils/Dia/Contact/l_sout.shape index db9a6228..6635c317 100644 --- a/kivio/kiviopart/stencils/Dia/Contact/l_sout.shape +++ b/kivio/kiviopart/stencils/Dia/Contact/l_sout.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- -*- xml -*- --> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>LADDER - sout</name> <description>ps out</description> @@ -28,7 +28,7 @@ <svg:path d="M 1.25,-1.125 C 1.375,-1 1.625,-1 1.75,-1.125"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_soutnot.shape b/kivio/kiviopart/stencils/Dia/Contact/l_soutnot.shape index 5a2f6f18..45fc49a4 100644 --- a/kivio/kiviopart/stencils/Dia/Contact/l_soutnot.shape +++ b/kivio/kiviopart/stencils/Dia/Contact/l_soutnot.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- -*- xml -*- --> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>LADDER - soutnot</name> <description>ps outnot</description> @@ -29,6 +29,6 @@ <svg:path d="M 1.25,-1.125 C 1.375,-1 1.625,-1 1.75,-1.125"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_soutr.shape b/kivio/kiviopart/stencils/Dia/Contact/l_soutr.shape index 8d54e7be..f2c48f8f 100644 --- a/kivio/kiviopart/stencils/Dia/Contact/l_soutr.shape +++ b/kivio/kiviopart/stencils/Dia/Contact/l_soutr.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- -*- xml -*- --> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>LADDER - soutr</name> <description>ps out reset</description> @@ -34,7 +34,7 @@ <svg:path d="M 1.25,-1.125 C 1.375,-1 1.625,-1 1.75,-1.125"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_souts.shape b/kivio/kiviopart/stencils/Dia/Contact/l_souts.shape index 0cd35bbb..32520cae 100644 --- a/kivio/kiviopart/stencils/Dia/Contact/l_souts.shape +++ b/kivio/kiviopart/stencils/Dia/Contact/l_souts.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- -*- xml -*- --> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>LADDER - souts</name> <description>ps out set</description> @@ -34,6 +34,6 @@ <svg:path d="M 1.25,-1.125 C 1.375,-1 1.625,-1 1.75,-1.125"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Electric/command.shape b/kivio/kiviopart/stencils/Dia/Electric/command.shape index 7ea6d2b8..b76f2aa9 100644 --- a/kivio/kiviopart/stencils/Dia/Electric/command.shape +++ b/kivio/kiviopart/stencils/Dia/Electric/command.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- -*- xml -*- --> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Electric - command</name> <description>command</description> @@ -18,7 +18,7 @@ <svg:line x1="0" y1=".5" x2="1" y2=".5"/> <svg:rect x=".3" y=".2" width=".4" height=".6" svg:style="fill:background"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Electric/contact_f.shape b/kivio/kiviopart/stencils/Dia/Electric/contact_f.shape index 31057db1..43208f14 100644 --- a/kivio/kiviopart/stencils/Dia/Electric/contact_f.shape +++ b/kivio/kiviopart/stencils/Dia/Electric/contact_f.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- -*- xml -*- --> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Electric - contact_f</name> <description>contact_f</description> @@ -18,6 +18,6 @@ <svg:polyline points="0,.5 .3,.5 .3,.3"/> <svg:polyline points="1,.5 .7,.5 .25,.275"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Electric/contact_o.shape b/kivio/kiviopart/stencils/Dia/Electric/contact_o.shape index ee1b2787..d2bea36d 100644 --- a/kivio/kiviopart/stencils/Dia/Electric/contact_o.shape +++ b/kivio/kiviopart/stencils/Dia/Electric/contact_o.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- -*- xml -*- --> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Electric - contact_o</name> <description>contact_o</description> @@ -17,6 +17,6 @@ <svg:line x1="0" y1=".5" x2=".3" y2=".5"/> <svg:polyline points="1,.5 .7,.5 .3,.7"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Electric/intpos_f.shape b/kivio/kiviopart/stencils/Dia/Electric/intpos_f.shape index 081ae768..87aa6861 100644 --- a/kivio/kiviopart/stencils/Dia/Electric/intpos_f.shape +++ b/kivio/kiviopart/stencils/Dia/Electric/intpos_f.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- -*- xml -*- --> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Electric - intpos_f</name> <description>intpos_f</description> @@ -20,6 +20,6 @@ <svg:polyline points="1,.5 .7,.5 .25,.275"/> <svg:polyline points=".6,.45 .35,.45 .4,.35"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Electric/intpos_o.shape b/kivio/kiviopart/stencils/Dia/Electric/intpos_o.shape index 086de61b..ceb72cb5 100644 --- a/kivio/kiviopart/stencils/Dia/Electric/intpos_o.shape +++ b/kivio/kiviopart/stencils/Dia/Electric/intpos_o.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- -*- xml -*- --> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Electric - intpos_o</name> <description>intpos_o</description> @@ -19,6 +19,6 @@ <svg:polyline points="1,.5 .7,.5 .3,.7"/> <svg:polyline points=".6,.55 .45,.75 .4,.65"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Electric/relay.shape b/kivio/kiviopart/stencils/Dia/Electric/relay.shape index 0a9461fb..0d506ff9 100644 --- a/kivio/kiviopart/stencils/Dia/Electric/relay.shape +++ b/kivio/kiviopart/stencils/Dia/Electric/relay.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- -*- xml -*- --> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Electric - relay</name> <description>relay</description> @@ -19,7 +19,7 @@ <svg:rect x=".3" y=".2" width=".4" height=".6" svg:style="fill:background"/> <svg:line x1=".3" y1=".6" x2=".7" y2=".4"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/MSE/demultiplexer.shape b/kivio/kiviopart/stencils/Dia/MSE/demultiplexer.shape index 4f8d788c..ea8ee9bf 100644 --- a/kivio/kiviopart/stencils/Dia/MSE/demultiplexer.shape +++ b/kivio/kiviopart/stencils/Dia/MSE/demultiplexer.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Demultiplexer</name> <description>Demultiplexer</description> @@ -24,4 +24,4 @@ <svg:line x1="10" y1="5" x2="0" y2="10"/> <svg:line x1="0" y1="0" x2="0" y2="10"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/MSE/large_extension_node.shape b/kivio/kiviopart/stencils/Dia/MSE/large_extension_node.shape index 96f90015..364565ff 100644 --- a/kivio/kiviopart/stencils/Dia/MSE/large_extension_node.shape +++ b/kivio/kiviopart/stencils/Dia/MSE/large_extension_node.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Large Extension Node</name> <description>Large Extension Node</description> @@ -26,5 +26,5 @@ <svg:line x1="1" y1="1" x2="1" y2="5"/> <svg:line x1="7" y1="1" x2="7" y2="5"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/MSE/multiplexer.shape b/kivio/kiviopart/stencils/Dia/MSE/multiplexer.shape index 9483a7df..371eef0d 100644 --- a/kivio/kiviopart/stencils/Dia/MSE/multiplexer.shape +++ b/kivio/kiviopart/stencils/Dia/MSE/multiplexer.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Multiplexer</name> <description>Multiplexer</description> @@ -24,4 +24,4 @@ <svg:line x1="0" y1="5" x2="10" y2="10"/> <svg:line x1="10" y1="0" x2="10" y2="10"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/MSE/node_center.shape b/kivio/kiviopart/stencils/Dia/MSE/node_center.shape index 3f59d4ca..31a84511 100644 --- a/kivio/kiviopart/stencils/Dia/MSE/node_center.shape +++ b/kivio/kiviopart/stencils/Dia/MSE/node_center.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Node Center</name> <description>Node Center</description> @@ -22,4 +22,4 @@ <svg:line x1="5" y1="10" x2="9.330126" y2="2.5"/> <svg:line x1="0.669874" y1="2.5" x2="9.330126" y2="2.5"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/MSE/small_extension_node.shape b/kivio/kiviopart/stencils/Dia/MSE/small_extension_node.shape index 1513e25b..19a8b68e 100644 --- a/kivio/kiviopart/stencils/Dia/MSE/small_extension_node.shape +++ b/kivio/kiviopart/stencils/Dia/MSE/small_extension_node.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Small Extension Node</name> <description>Small Extension Node</description> @@ -21,5 +21,5 @@ <svg:line x1="0" y1="0" x2="0" y2="6"/> <svg:line x1="8" y1="0" x2="8" y2="6"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/MSE/tacsat.shape b/kivio/kiviopart/stencils/Dia/MSE/tacsat.shape index 411bd80a..2964a28b 100644 --- a/kivio/kiviopart/stencils/Dia/MSE/tacsat.shape +++ b/kivio/kiviopart/stencils/Dia/MSE/tacsat.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Tactical Satellite Communications Terminal</name> <description>Tactical Satellite Communications Terminal</description> @@ -24,4 +24,4 @@ <svg:path d="M 3,0 C 0.5,2.5 8.5,10.5 11,8"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Network/dat_external.shape b/kivio/kiviopart/stencils/Dia/Network/dat_external.shape index c768f038..39d6a058 100644 --- a/kivio/kiviopart/stencils/Dia/Network/dat_external.shape +++ b/kivio/kiviopart/stencils/Dia/Network/dat_external.shape @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Network - An external DAT drive</name> <icon>dat_external.xpm</icon> @@ -33,4 +33,4 @@ <svg:line style="stroke-width: 0.1; stroke: #000000" x1="13.5" y1="6" x2="1.5" y2="6"/> <svg:line style="stroke-width: 0.1; stroke: #000000" x1="1.5" y1="6.5" x2="13.5" y2="6.5"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Network/digitizing_board.shape b/kivio/kiviopart/stencils/Dia/Network/digitizing_board.shape index 7b2b8e22..0b7f7ded 100644 --- a/kivio/kiviopart/stencils/Dia/Network/digitizing_board.shape +++ b/kivio/kiviopart/stencils/Dia/Network/digitizing_board.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Network - Digitizing Board</name> <icon>digitizing_board.png</icon> <connections> @@ -30,4 +30,4 @@ <svg:rect style="fill: #4c4c4c" x="10" y="9" width="3" height="0.5"/> <svg:rect style="stroke-width: 0.1; stroke: foreground" x="10" y="9" width="3" height="0.5"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Network/diskette.shape b/kivio/kiviopart/stencils/Dia/Network/diskette.shape index 280da134..904760e0 100644 --- a/kivio/kiviopart/stencils/Dia/Network/diskette.shape +++ b/kivio/kiviopart/stencils/Dia/Network/diskette.shape @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Network - A Diskette</name> <icon>diskette.xpm</icon> @@ -35,4 +35,4 @@ <svg:line style="stroke-width: 0.1; stroke: #000000" x1="3" y1="6" x2="13" y2="6"/> <svg:line style="stroke-width: 0.1; stroke: #000000" x1="13" y1="8" x2="3" y2="8"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Network/firewall.shape b/kivio/kiviopart/stencils/Dia/Network/firewall.shape index 53734fbc..ea128a59 100644 --- a/kivio/kiviopart/stencils/Dia/Network/firewall.shape +++ b/kivio/kiviopart/stencils/Dia/Network/firewall.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Network - Firewall</name> <icon>firewall.xpm</icon> @@ -78,4 +78,4 @@ <svg:polyline style="stroke:foreground; stroke-width:.5" points="0,0 .125,-.125 1.125,-.125,1.125,1.875 1,2 0,2 0,0"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Network/hub.shape b/kivio/kiviopart/stencils/Dia/Network/hub.shape index b2faadbb..62c624f1 100644 --- a/kivio/kiviopart/stencils/Dia/Network/hub.shape +++ b/kivio/kiviopart/stencils/Dia/Network/hub.shape @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Network - Hub</name> <icon>hub.xpm</icon> @@ -37,5 +37,5 @@ <svg:rect style="stroke:none; fill:foreground" x="4" y=".75" width=".25" height=".24"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Network/mobile_phone.shape b/kivio/kiviopart/stencils/Dia/Network/mobile_phone.shape index 431c5efd..ba006a8f 100644 --- a/kivio/kiviopart/stencils/Dia/Network/mobile_phone.shape +++ b/kivio/kiviopart/stencils/Dia/Network/mobile_phone.shape @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Network - A Mobile Phone</name> <icon>mobile_phone.xpm</icon> @@ -59,4 +59,4 @@ <svg:rect style="fill: #d0f4e5" x="5.5" y="11.5" width="2" height="2"/> <svg:rect style="stroke-width: 0.1; stroke: #000000" x="5.5" y="11.5" width="2" height="2"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Network/monitor.shape b/kivio/kiviopart/stencils/Dia/Network/monitor.shape index fcc21c3a..66fc1734 100644 --- a/kivio/kiviopart/stencils/Dia/Network/monitor.shape +++ b/kivio/kiviopart/stencils/Dia/Network/monitor.shape @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Network - A Workstation Monitor</name> <icon>monitor.xpm</icon> @@ -28,4 +28,4 @@ <svg:rect style="fill: #d9d9cd" x="3" y="17" width="12" height="1"/> <svg:rect style="stroke-width: 0.1; stroke: #000000" x="3" y="17" width="12" height="1"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Network/pc_bigtower.shape b/kivio/kiviopart/stencils/Dia/Network/pc_bigtower.shape index 2b2025ea..639f4b7a 100644 --- a/kivio/kiviopart/stencils/Dia/Network/pc_bigtower.shape +++ b/kivio/kiviopart/stencils/Dia/Network/pc_bigtower.shape @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Network - A Bigtower PC</name> <icon>pc_bigtower.xpm</icon> @@ -63,4 +63,4 @@ <svg:line style="stroke-width: 0.1; stroke: #000000" x1="2.5" y1="23.5" x2="11.5" y2="23.5"/> <svg:line style="stroke-width: 0.1; stroke: #000000" x1="11.5" y1="23" x2="2.5" y2="23"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Network/pc_desktop.shape b/kivio/kiviopart/stencils/Dia/Network/pc_desktop.shape index 7a3c7455..5847b063 100644 --- a/kivio/kiviopart/stencils/Dia/Network/pc_desktop.shape +++ b/kivio/kiviopart/stencils/Dia/Network/pc_desktop.shape @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Network - A Desktop PC</name> <icon>pc_desktop.xpm</icon> @@ -49,4 +49,4 @@ <svg:line style="stroke-width: 0.1; stroke: #000000" x1="11.5" y1="5.5" x2="11.5" y2="5"/> <svg:line style="stroke-width: 0.1; stroke: #000000" x1="11.5" y1="1.5" x2="11.5" y2="1"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Network/pc_miditower.shape b/kivio/kiviopart/stencils/Dia/Network/pc_miditower.shape index 409c6e12..daed926e 100644 --- a/kivio/kiviopart/stencils/Dia/Network/pc_miditower.shape +++ b/kivio/kiviopart/stencils/Dia/Network/pc_miditower.shape @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Network - A Midi-tower PC</name> <icon>pc_miditower.xpm</icon> @@ -54,4 +54,4 @@ <svg:line style="stroke-width: 0.1; stroke: #000000" x1="2.5" y1="17" x2="11.5" y2="17"/> <svg:line style="stroke-width: 0.1; stroke: #000000" x1="11.5" y1="16.5" x2="2.5" y2="16.5"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Network/pc_minitower.shape b/kivio/kiviopart/stencils/Dia/Network/pc_minitower.shape index 6b33ec5f..683e4ee1 100644 --- a/kivio/kiviopart/stencils/Dia/Network/pc_minitower.shape +++ b/kivio/kiviopart/stencils/Dia/Network/pc_minitower.shape @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Network - A Minitower PC</name> <icon>pc_minitower.xpm</icon> @@ -52,4 +52,4 @@ <svg:line style="stroke-width: 0.1; stroke: #000000" x1="2" y1="8" x2="2.5" y2="8"/> <svg:line style="stroke-width: 0.1; stroke: #000000" x1="6" y1="8" x2="6.5" y2="8"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Network/plotter.shape b/kivio/kiviopart/stencils/Dia/Network/plotter.shape index 3c0cc737..ed64d2eb 100644 --- a/kivio/kiviopart/stencils/Dia/Network/plotter.shape +++ b/kivio/kiviopart/stencils/Dia/Network/plotter.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Network - Plotter</name> <icon>plotter.png</icon> <connections> @@ -41,4 +41,4 @@ <svg:polyline style="stroke-width: 0.1; stroke: foreground" points="12.5,10.5 12.5,7.5 13.5,7.5 13.5,10.5 "/> <svg:polyline style="stroke-width: 0.1; stroke: foreground" points="14,10.5 14,7.5 15,7.5 15,10.5 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Network/workstation.shape b/kivio/kiviopart/stencils/Dia/Network/workstation.shape index 19003b8e..109a0651 100644 --- a/kivio/kiviopart/stencils/Dia/Network/workstation.shape +++ b/kivio/kiviopart/stencils/Dia/Network/workstation.shape @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Network - A Workstation</name> <icon>workstation.xpm</icon> @@ -56,4 +56,4 @@ <svg:rect style="fill: #cdcdcd" x="5" y="2" width="9" height="1"/> <svg:rect style="stroke-width: 0.1; stroke: #000000" x="5" y="2" width="9" height="1"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Network/zip-disk.shape b/kivio/kiviopart/stencils/Dia/Network/zip-disk.shape index e317f3e1..c071d1ca 100644 --- a/kivio/kiviopart/stencils/Dia/Network/zip-disk.shape +++ b/kivio/kiviopart/stencils/Dia/Network/zip-disk.shape @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Network - A ZIP Disk</name> <icon>zip-disk.xpm</icon> @@ -46,4 +46,4 @@ <svg:line style="stroke-width: 0.1; stroke: #000000" x1="2" y1="4.375" x2="2" y2="9.875"/> <svg:line style="stroke-width: 0.1; stroke: #000000" x1="7.75" y1="4.375" x2="7.75" y2="9.85"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Pneumatic/dejack.shape b/kivio/kiviopart/stencils/Dia/Pneumatic/dejack.shape index fe6bc807..25a05e72 100644 --- a/kivio/kiviopart/stencils/Dia/Pneumatic/dejack.shape +++ b/kivio/kiviopart/stencils/Dia/Pneumatic/dejack.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- -*- xml -*- --> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Pneum - DEJack</name> <description>dejack</description> @@ -25,6 +25,6 @@ <svg:rect x=".4" y=".2" width="2.6" height=".8" svg:style="stroke-width: 1.0"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Pneumatic/dist32.shape b/kivio/kiviopart/stencils/Dia/Pneumatic/dist32.shape index 0f484add..f0fd67e2 100644 --- a/kivio/kiviopart/stencils/Dia/Pneumatic/dist32.shape +++ b/kivio/kiviopart/stencils/Dia/Pneumatic/dist32.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- -*- xml -*- --> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Pneum - dist32</name> <description>dist32</description> @@ -34,6 +34,6 @@ <svg:polygon points="1.8,.8 1.8,1 1.6,.9" svg:style="stroke:none; fill:foreground"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Pneumatic/dist42.shape b/kivio/kiviopart/stencils/Dia/Pneumatic/dist42.shape index 04e644eb..b2f38fc7 100644 --- a/kivio/kiviopart/stencils/Dia/Pneumatic/dist42.shape +++ b/kivio/kiviopart/stencils/Dia/Pneumatic/dist42.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- -*- xml -*- --> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Pneum - dist42</name> <description>dist42</description> @@ -35,6 +35,6 @@ <svg:polygon points="1.8,0 1.8,.2 1.6,.1" svg:style="stroke:none; fill:foreground"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Pneumatic/dist52.shape b/kivio/kiviopart/stencils/Dia/Pneumatic/dist52.shape index 021db07e..c1902669 100644 --- a/kivio/kiviopart/stencils/Dia/Pneumatic/dist52.shape +++ b/kivio/kiviopart/stencils/Dia/Pneumatic/dist52.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- -*- xml -*- --> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Pneum - dist52</name> <description>dist52</description> @@ -44,6 +44,6 @@ <svg:polygon points=".750,1 .830,.80 .650,.84" svg:style="stroke:none; fill:foreground"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/SDL/block.shape b/kivio/kiviopart/stencils/Dia/SDL/block.shape index c697400d..4e18f2f5 100644 --- a/kivio/kiviopart/stencils/Dia/SDL/block.shape +++ b/kivio/kiviopart/stencils/Dia/SDL/block.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>SDL - Block</name> <description>Block Type Reference</description> @@ -16,4 +16,4 @@ <svg:polygon points="0,0 2.5,0 2.5,2 0,2" style="fill: default" /> <svg:polygon points="0.15,0.15 2.35,0.15 2.35,1.85 0.15,1.85" style="fill: default" /> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/SDL/decision.shape b/kivio/kiviopart/stencils/Dia/SDL/decision.shape index 6cb1fba7..2c2ce44f 100644 --- a/kivio/kiviopart/stencils/Dia/SDL/decision.shape +++ b/kivio/kiviopart/stencils/Dia/SDL/decision.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>SDL - Decision</name> <description>Decision</description> @@ -15,4 +15,4 @@ <svg:svg width="2.5" height="2.5"> <svg:polygon points="1.25,0 2.5,1.25 1.25,2.5 0,1.25" style="fill: default" /> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/SDL/process.shape b/kivio/kiviopart/stencils/Dia/SDL/process.shape index 95028b58..0a8512f5 100644 --- a/kivio/kiviopart/stencils/Dia/SDL/process.shape +++ b/kivio/kiviopart/stencils/Dia/SDL/process.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>SDL - Process</name> <description>Process Type Reference</description> @@ -16,4 +16,4 @@ <svg:polygon points="0.3,0 2.2,0 2.5,0.3 2.5,1.7 2.2,2 0.3,2 0,1.7 0,0.3" style="fill: default" /> <svg:polygon points="0.3,0.15 2.2,0.15 2.35,0.3 2.35,1.7 2.2,1.85 0.3,1.85 0.15,1.7 0.15,0.3" style="fill: default" /> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/SDL/service.shape b/kivio/kiviopart/stencils/Dia/SDL/service.shape index fd4936e7..3223741f 100644 --- a/kivio/kiviopart/stencils/Dia/SDL/service.shape +++ b/kivio/kiviopart/stencils/Dia/SDL/service.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>SDL - Service</name> <description>Service Type Reference</description> @@ -17,4 +17,4 @@ h -0.25 c -0.75,-0.4 -1.125,-0.6 -1.125,-1 c 0,-0.4 0.25,-0.6 1.125,-1 z" style="fill: default"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Sybase/client.shape b/kivio/kiviopart/stencils/Dia/Sybase/client.shape index 81ff9f03..4d3f913f 100644 --- a/kivio/kiviopart/stencils/Dia/Sybase/client.shape +++ b/kivio/kiviopart/stencils/Dia/Sybase/client.shape @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Sybase - Client Application</name> <icon>client.xpm</icon> @@ -21,5 +21,5 @@ <svg:path style="stroke:foreground; stroke-width: 0.5" d="M1.2,.8 L1.2,1.2 L1.6,1 L1.2,.8"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Sybase/dataserver.shape b/kivio/kiviopart/stencils/Dia/Sybase/dataserver.shape index 85340990..49cce15d 100644 --- a/kivio/kiviopart/stencils/Dia/Sybase/dataserver.shape +++ b/kivio/kiviopart/stencils/Dia/Sybase/dataserver.shape @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Sybase - Dataserver</name> <icon>dataserver.xpm</icon> @@ -19,7 +19,7 @@ M 0.0706,0.66667 L 1.5,0.66667 M 0,1 L 1.5,1 M 0.0706,1.33333 L 1.5,1.33333 M 0.24,1.66667 L 1.5,1.66667" /> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Sybase/ltm.shape b/kivio/kiviopart/stencils/Dia/Sybase/ltm.shape index 508b64bf..1df9b7fc 100644 --- a/kivio/kiviopart/stencils/Dia/Sybase/ltm.shape +++ b/kivio/kiviopart/stencils/Dia/Sybase/ltm.shape @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Sybase - Log Transfer Manager/Rep Agent</name> <icon>ltm.xpm</icon> @@ -28,4 +28,4 @@ d="M 1.4,1 L 1.8,1"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Sybase/repserver.shape b/kivio/kiviopart/stencils/Dia/Sybase/repserver.shape index bef14946..946603b1 100644 --- a/kivio/kiviopart/stencils/Dia/Sybase/repserver.shape +++ b/kivio/kiviopart/stencils/Dia/Sybase/repserver.shape @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Sybase - Replication Server</name> <icon>repserver.xpm</icon> @@ -26,6 +26,6 @@ points="1,1 .7,.85 .7,1.15"/> <svg:circle style="stroke:none; fill:foreground" cx="1" cy="1" r=".5"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Card.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Card.sml index 707882e9..704e66b0 100644 --- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Card.sml +++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Card.sml @@ -4,7 +4,7 @@ <Author data="Landshark"/> <Title data="Card"/> <Id data="Card"/> - <Description data="Basic flowcharting card tqshape"/> + <Description data="Basic flowcharting card shape"/> <Version data="0.1"/> <Web data="www.thekompany.com"/> <Email data="lndshark@speakeasy.net"/> diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Data.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Data.sml index a052fc1c..2fa28f24 100644 --- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Data.sml +++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Data.sml @@ -4,7 +4,7 @@ <Author data="Dave Marotti"/> <Title data="Data"/> <Id data="Data"/> - <Description data="Data tqshape for flowcharting"/> + <Description data="Data shape for flowcharting"/> <Version data="1.0"/> <Web data="www.thekompany.com"/> <Email data="lndshark@speakeasy.net"/> diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Decision.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Decision.sml index 2e83ee8e..e069d4ac 100644 --- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Decision.sml +++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Decision.sml @@ -4,7 +4,7 @@ <Author data="Landshark"/> <Title data="Decision"/> <Id data="Decision"/> - <Description data="Basic flowcharting decision tqshape"/> + <Description data="Basic flowcharting decision shape"/> <Version data="0.1"/> <Web data="www.thekompany.com"/> <Email data="lndshark@speakeasy.net"/> diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/DirectData.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/DirectData.sml index df9d3a5f..21661b74 100644 --- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/DirectData.sml +++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/DirectData.sml @@ -4,7 +4,7 @@ <Author data="Landshark"/> <Title data="Direct Data"/> <Id data="Direct Data"/> - <Description data="Basic flowcharting direct data tqshape"/> + <Description data="Basic flowcharting direct data shape"/> <Version data="0.1"/> <Web data="www.thekompany.com"/> <Email data="lndshark@speakeasy.net"/> diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Display.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Display.sml index 9634593e..f07580d2 100644 --- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Display.sml +++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Display.sml @@ -4,7 +4,7 @@ <Author data="Landshark"/> <Title data="Display"/> <Id data="Display"/> - <Description data="Basic flowcharting display tqshape"/> + <Description data="Basic flowcharting display shape"/> <Version data="0.1"/> <Web data="www.thekompany.com"/> <Email data="lndshark@speakeasy.net"/> diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/InternalStorage.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/InternalStorage.sml index d4051189..3a7a50ae 100644 --- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/InternalStorage.sml +++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/InternalStorage.sml @@ -4,7 +4,7 @@ <Author data="Landshark"/> <Title data="Internal Storage"/> <Id data="Internal Storage"/> - <Description data="Internal storage tqshape"/> + <Description data="Internal storage shape"/> <Version data="0.1"/> <Web data="www.thekompany.com"/> <Email data="lndshark@speakeasy.net"/> diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/LoopLimit.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/LoopLimit.sml index b409c57a..199072a6 100644 --- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/LoopLimit.sml +++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/LoopLimit.sml @@ -4,7 +4,7 @@ <Author data="Landshark"/> <Title data="Loop Limit"/> <Id data="Loop Limit"/> - <Description data="Basic flowcharting loop limit tqshape"/> + <Description data="Basic flowcharting loop limit shape"/> <Version data="0.1"/> <Web data="www.thekompany.com"/> <Email data="lndshark@speakeasy.net"/> diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/ManualInput.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/ManualInput.sml index 17691486..d6104506 100644 --- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/ManualInput.sml +++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/ManualInput.sml @@ -4,7 +4,7 @@ <Author data="Landshark"/> <Title data="Manual Input"/> <Id data="Manual Input"/> - <Description data="Basic flowcharting manual input tqshape"/> + <Description data="Basic flowcharting manual input shape"/> <Version data="0.1"/> <Web data="www.thekompany.com"/> <Email data="lndshark@speakeasy.net"/> diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/ManualOperation.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/ManualOperation.sml index 2536f822..bc452400 100644 --- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/ManualOperation.sml +++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/ManualOperation.sml @@ -4,7 +4,7 @@ <Author data="Landshark"/> <Title data="Manual Operation"/> <Id data="Manual Operation"/> - <Description data="Basic flowcharting manual operation tqshape"/> + <Description data="Basic flowcharting manual operation shape"/> <Version data="0.1"/> <Web data="www.thekompany.com"/> <Email data="lndshark@speakeasy.net"/> diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/PredefinedProcess.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/PredefinedProcess.sml index e1f80367..452e048a 100644 --- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/PredefinedProcess.sml +++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/PredefinedProcess.sml @@ -4,7 +4,7 @@ <Author data="Landshark"/> <Title data="Predefined Process"/> <Id data="Predefined Process"/> - <Description data="Predefined process tqshape"/> + <Description data="Predefined process shape"/> <Version data="0.1"/> <Web data="www.thekompany.com"/> <Email data="lndshark@speakeasy.net"/> diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Preperation.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Preperation.sml index b935d273..f79d2a51 100644 --- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Preperation.sml +++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Preperation.sml @@ -4,7 +4,7 @@ <Author data="Landshark"/> <Title data="Preparation"/> <Id data="Preperation"/> - <Description data="Basic flowcharting preparation tqshape"/> + <Description data="Basic flowcharting preparation shape"/> <Version data="0.1"/> <Web data="www.thekompany.com"/> <Email data="lndshark@speakeasy.net"/> diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Process.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Process.sml index 60a00732..94d129ac 100644 --- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Process.sml +++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Process.sml @@ -4,7 +4,7 @@ <Author data="Landshark"/> <Title data="Process"/> <Id data="Process"/> - <Description data="Basic flowcharting process tqshape"/> + <Description data="Basic flowcharting process shape"/> <Version data="0.1"/> <Web data="www.thekompany.com"/> <Email data="lndshark@speakeasy.net"/> diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/PyStencil.spy b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/PyStencil.spy index aa11f970..fc01b542 100644 --- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/PyStencil.spy +++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/PyStencil.spy @@ -4,7 +4,7 @@ <Author data="Dmitry Poplavsky"/> <Title data="Python"/> <Id data="Python"/> - <Description data="Basic flowcharting card tqshape"/> + <Description data="Basic flowcharting card shape"/> <Version data="0.1"/> <Web data="www.thekompany.com"/> <Email data="dima@kde.org"/> @@ -40,7 +40,7 @@ connector_targets = [ { "x":x+2, "y":y-2 }, ] -tqshapes = { +shapes = { "rect" :{ "type" : "Rectangle", "fillstyle" : "solid", @@ -96,12 +96,12 @@ connector_targets = [ { "x":x+2, "y":y-2 }, { "x":(x+x2)/2, "y":y } ] -tqshapes["rect2"]["x"] = x+w-35 -tqshapes["rect2"]["y"] = y+h-35 -tqshapes["rect2"]["w"] = 20 -tqshapes["rect2"]["h"] = 20 +shapes["rect2"]["x"] = x+w-35 +shapes["rect2"]["y"] = y+h-35 +shapes["rect2"]["w"] = 20 +shapes["rect2"]["h"] = 20 -if ( tqshapes["text"]["text"] == "1" ): +if ( shapes["text"]["text"] == "1" ): stencil = curLayer().firstStencil() stencil.setText( "x:"+str(x)+" y:"+str(y) ) diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/StoredData.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/StoredData.sml index 98ba2016..6a727990 100644 --- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/StoredData.sml +++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/StoredData.sml @@ -4,7 +4,7 @@ <Author data="Landshark"/> <Title data="Stored Data"/> <Id data="Stored Data"/> - <Description data="Basic flowcharting stored data tqshape"/> + <Description data="Basic flowcharting stored data shape"/> <Version data="0.1"/> <Web data="www.thekompany.com"/> <Email data="lndshark@speakeasy.net"/> diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Terminator.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Terminator.sml index a998b6ca..769d1f5d 100644 --- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Terminator.sml +++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Terminator.sml @@ -4,7 +4,7 @@ <Author data="Landshark"/> <Title data="Terminator"/> <Id data="Terminator"/> - <Description data="Terminator tqshape"/> + <Description data="Terminator shape"/> <Version data="0.1"/> <Web data="kivio.sourceforge.net"/> <Email data="lndshark@speakeasy.net"/> diff --git a/kivio/kiviopart/stencils/Flowcharting/Extended/Data_Store.sml b/kivio/kiviopart/stencils/Flowcharting/Extended/Data_Store.sml index 445fef79..c96361ce 100644 --- a/kivio/kiviopart/stencils/Flowcharting/Extended/Data_Store.sml +++ b/kivio/kiviopart/stencils/Flowcharting/Extended/Data_Store.sml @@ -4,7 +4,7 @@ <Author data="Kristof Borrey"/> <Title data="Data Store"/> <Id data="Data Store"/> - <Description data="Data Store tqshape"/> + <Description data="Data Store shape"/> <Version data="0.1"/> <Web data="www.koffice.org"/> <Email data="borrey@kde.org"/> diff --git a/kivio/kiviopart/stencils/Flowcharting/Extended/Database.sml b/kivio/kiviopart/stencils/Flowcharting/Extended/Database.sml index 622b0205..b1d1a835 100644 --- a/kivio/kiviopart/stencils/Flowcharting/Extended/Database.sml +++ b/kivio/kiviopart/stencils/Flowcharting/Extended/Database.sml @@ -4,7 +4,7 @@ <Author data="Kristof Borrey"/> <Title data="Database"/> <Id data="database"/> - <Description data="Database tqshape"/> + <Description data="Database shape"/> <Version data="0.1"/> <Web data="www.koffice.org"/> <Email data="borrey@kde.org"/> diff --git a/kivio/kiviopart/stencils/Flowcharting/Extended/Process.sml b/kivio/kiviopart/stencils/Flowcharting/Extended/Process.sml index fa1824de..57229b1a 100644 --- a/kivio/kiviopart/stencils/Flowcharting/Extended/Process.sml +++ b/kivio/kiviopart/stencils/Flowcharting/Extended/Process.sml @@ -4,7 +4,7 @@ <Author data="Kristof Borrey"/> <Title data="Process"/> <Id data="Process"/> - <Description data="Process tqshape"/> + <Description data="Process shape"/> <Version data="0.1"/> <Web data="www.koffice.org"/> <Email data="borrey@kde.org"/> diff --git a/kivio/kiviopart/stencils/Flowcharting/Extended/Source_or_Sink.sml b/kivio/kiviopart/stencils/Flowcharting/Extended/Source_or_Sink.sml index e3f53b8f..c68f8a79 100644 --- a/kivio/kiviopart/stencils/Flowcharting/Extended/Source_or_Sink.sml +++ b/kivio/kiviopart/stencils/Flowcharting/Extended/Source_or_Sink.sml @@ -4,7 +4,7 @@ <Author data="Kristof Borrey"/> <Title data="Source or Sink"/> <Id data="Source or Sink"/> - <Description data="Source or Sink tqshape"/> + <Description data="Source or Sink shape"/> <Version data="0.1"/> <Web data="www.koffice.org"/> <Email data="borrey@kde.org"/> diff --git a/kivio/kiviopart/stencils/Hardware/Computer/3FloppyDisk.sml b/kivio/kiviopart/stencils/Hardware/Computer/3FloppyDisk.sml index b3ecbefc..34c0b640 100644 --- a/kivio/kiviopart/stencils/Hardware/Computer/3FloppyDisk.sml +++ b/kivio/kiviopart/stencils/Hardware/Computer/3FloppyDisk.sml @@ -4,7 +4,7 @@ <Author data="Kristof Borrey"/> <Title data="Floppy Disk"/> <Id data="Floppy Disk"/> - <Description data="Floppy Disk tqshape"/> + <Description data="Floppy Disk shape"/> <Version data="0.1"/> <Web data="www.koffice.org"/> <Email data="borrey@kde.org"/> diff --git a/kivio/kiviopart/stencils/Hardware/Miscellaneous/key.sml b/kivio/kiviopart/stencils/Hardware/Miscellaneous/key.sml index aa34fe08..a03ce9cb 100644 --- a/kivio/kiviopart/stencils/Hardware/Miscellaneous/key.sml +++ b/kivio/kiviopart/stencils/Hardware/Miscellaneous/key.sml @@ -4,7 +4,7 @@ <Author data="Kristof Borrey"/> <Title data="Key"/> <Id data="Key"/> - <Description data="Key tqshape"/> + <Description data="Key shape"/> <Version data="0.1"/> <Web data="www.koffice.org"/> <Email data="borrey@kde.org"/> diff --git a/kivio/kiviopart/stencils/Miscellaneous/Arrows/Arrow.sml b/kivio/kiviopart/stencils/Miscellaneous/Arrows/Arrow.sml index a9013398..6470beb0 100644 --- a/kivio/kiviopart/stencils/Miscellaneous/Arrows/Arrow.sml +++ b/kivio/kiviopart/stencils/Miscellaneous/Arrows/Arrow.sml @@ -4,7 +4,7 @@ <Author data="Kristof Borrey"/> <Title data="Arrow"/> <Id data="Arrow"/> - <Description data="Arrow tqshape"/> + <Description data="Arrow shape"/> <Version data="0.1"/> <Web data="www.koffice.org"/> <Email data="borrey@kde.org"/> diff --git a/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_1.sml b/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_1.sml index 72a5cfd3..909e814c 100644 --- a/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_1.sml +++ b/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_1.sml @@ -4,7 +4,7 @@ <Author data="Kristof Borrey"/> <Title data="Multiple Arrow 1"/> <Id data="Multiple arrow 1"/> - <Description data="Multiple Arrow tqshape 1"/> + <Description data="Multiple Arrow shape 1"/> <Version data="0.1"/> <Web data="www.koffice.org"/> <Email data="borrey@kde.org"/> diff --git a/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_2.sml b/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_2.sml index 296f55fb..16599b33 100644 --- a/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_2.sml +++ b/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_2.sml @@ -4,7 +4,7 @@ <Author data="Kristof Borrey"/> <Title data="Multiple Arrow 2"/> <Id data="Multiple arrow 2"/> - <Description data="Multiple Arrow tqshape 2"/> + <Description data="Multiple Arrow shape 2"/> <Version data="0.1"/> <Web data="www.koffice.org"/> <Email data="borrey@kde.org"/> diff --git a/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_3.sml b/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_3.sml index 13fe1905..b0243201 100644 --- a/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_3.sml +++ b/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_3.sml @@ -4,7 +4,7 @@ <Author data="Kristof Borrey"/> <Title data="Multiple Arrow 3"/> <Id data="Multiple arrow 3"/> - <Description data="Multiple Arrow tqshape 3"/> + <Description data="Multiple Arrow shape 3"/> <Version data="0.1"/> <Web data="www.koffice.org"/> <Email data="borrey@kde.org"/> diff --git a/kivio/kiviopart/stencils/Miscellaneous/Arrows/Sun_Arrow.sml b/kivio/kiviopart/stencils/Miscellaneous/Arrows/Sun_Arrow.sml index 07bdf483..7cfdc307 100644 --- a/kivio/kiviopart/stencils/Miscellaneous/Arrows/Sun_Arrow.sml +++ b/kivio/kiviopart/stencils/Miscellaneous/Arrows/Sun_Arrow.sml @@ -4,7 +4,7 @@ <Author data="Kristof Borrey"/> <Title data="Sun Arrow"/> <Id data="Sun arrow"/> - <Description data="Sun Arrow tqshape"/> + <Description data="Sun Arrow shape"/> <Version data="0.1"/> <Web data="www.koffice.org"/> <Email data="borrey@kde.org"/> diff --git a/kivio/kiviopart/stencils/Miscellaneous/Buildings/Factory.sml b/kivio/kiviopart/stencils/Miscellaneous/Buildings/Factory.sml index 7d8390db..8ff9b029 100755 --- a/kivio/kiviopart/stencils/Miscellaneous/Buildings/Factory.sml +++ b/kivio/kiviopart/stencils/Miscellaneous/Buildings/Factory.sml @@ -4,7 +4,7 @@ <Author data="Kristof Borrey"/> <Title data="Factory"/> <Id data="Factory"/> - <Description data="Factory tqshape"/> + <Description data="Factory shape"/> <Version data="0.1"/> <Web data="www.koffice.org"/> <Email data="borrey@kde.org"/> diff --git a/kivio/kiviopart/stencils/Miscellaneous/Buildings/House.sml b/kivio/kiviopart/stencils/Miscellaneous/Buildings/House.sml index 9e1193cf..95075972 100755 --- a/kivio/kiviopart/stencils/Miscellaneous/Buildings/House.sml +++ b/kivio/kiviopart/stencils/Miscellaneous/Buildings/House.sml @@ -4,7 +4,7 @@ <Author data="Kristof Borrey"/> <Title data="House"/> <Id data="House"/> - <Description data="House tqshape"/> + <Description data="House shape"/> <Version data="0.1"/> <Web data="www.koffice.org"/> <Email data="borrey@kde.org"/> diff --git a/kivio/kiviopart/stencils/Miscellaneous/ER/attribute.sml b/kivio/kiviopart/stencils/Miscellaneous/ER/attribute.sml index af310f33..88e06fdb 100644 --- a/kivio/kiviopart/stencils/Miscellaneous/ER/attribute.sml +++ b/kivio/kiviopart/stencils/Miscellaneous/ER/attribute.sml @@ -3,7 +3,7 @@ <Title data="Attribute"/> <Id data="ER-Attribute"/> <Version data="1.0"/> - <Description data="Attribute tqshape used in ER diagrams"/> + <Description data="Attribute shape used in ER diagrams"/> <Copyright data="Copyright (C) 2005 Peter Simonsson. Distributed under the BSD license."/> <Author data="Peter Simonsson"/> <Email data="psn@linux.se"/> diff --git a/kivio/kiviopart/stencils/Miscellaneous/ER/derivedattribute.sml b/kivio/kiviopart/stencils/Miscellaneous/ER/derivedattribute.sml index 5c2e4f74..8c325c32 100644 --- a/kivio/kiviopart/stencils/Miscellaneous/ER/derivedattribute.sml +++ b/kivio/kiviopart/stencils/Miscellaneous/ER/derivedattribute.sml @@ -3,7 +3,7 @@ <Title data="Derived Attribute"/> <Id data="ER-DerivedAttribute"/> <Version data="1.0"/> - <Description data="Derived Attribute tqshape used in ER diagrams"/> + <Description data="Derived Attribute shape used in ER diagrams"/> <Copyright data="Copyright (C) 2005 Peter Simonsson. Distributed under the BSD license."/> <Author data="Peter Simonsson"/> <Email data="psn@linux.se"/> diff --git a/kivio/kiviopart/stencils/Miscellaneous/ER/entity.sml b/kivio/kiviopart/stencils/Miscellaneous/ER/entity.sml index 2b22e32a..6eaed85a 100644 --- a/kivio/kiviopart/stencils/Miscellaneous/ER/entity.sml +++ b/kivio/kiviopart/stencils/Miscellaneous/ER/entity.sml @@ -4,7 +4,7 @@ <Title data="Entity"/> <Id data="ER-Entity"/> <Version data="1.0"/> - <Description data="Entity tqshape used in ER diagrams"/> + <Description data="Entity shape used in ER diagrams"/> <Copyright data="Copyright (C) 2005 Peter Simonsson. Distributed under the BSD license."/> <Author data="Peter Simonsson"/> <Email data="psn@linux.se"/> diff --git a/kivio/kiviopart/stencils/Miscellaneous/ER/multivaluedattribute.sml b/kivio/kiviopart/stencils/Miscellaneous/ER/multivaluedattribute.sml index 56329cf1..baef5b76 100644 --- a/kivio/kiviopart/stencils/Miscellaneous/ER/multivaluedattribute.sml +++ b/kivio/kiviopart/stencils/Miscellaneous/ER/multivaluedattribute.sml @@ -3,7 +3,7 @@ <Title data="Multivalued Attribute"/> <Id data="ER-MultivaluedAttribute"/> <Version data="1.0"/> - <Description data="Multivalued Attribute tqshape used in ER diagrams"/> + <Description data="Multivalued Attribute shape used in ER diagrams"/> <Copyright data="Copyright (C) 2005 Peter Simonsson. Distributed under the BSD license."/> <Author data="Peter Simonsson"/> <Email data="psn@linux.se"/> diff --git a/kivio/kiviopart/stencils/Miscellaneous/ER/relationship.sml b/kivio/kiviopart/stencils/Miscellaneous/ER/relationship.sml index dbcad720..bd6c93ea 100644 --- a/kivio/kiviopart/stencils/Miscellaneous/ER/relationship.sml +++ b/kivio/kiviopart/stencils/Miscellaneous/ER/relationship.sml @@ -4,7 +4,7 @@ <Title data="Relationship"/> <Id data="ER-Relationship"/> <Version data="1.0"/> - <Description data="Relationship tqshape used in ER diagrams"/> + <Description data="Relationship shape used in ER diagrams"/> <Copyright data="Copyright (C) 2005 Peter Simonsson. Distributed under the BSD license."/> <Author data="Peter Simonsson"/> <Email data="psn@linux.se"/> diff --git a/kivio/kiviopart/stencils/Miscellaneous/ER/weakentity.sml b/kivio/kiviopart/stencils/Miscellaneous/ER/weakentity.sml index 02547ca0..b81da1e9 100644 --- a/kivio/kiviopart/stencils/Miscellaneous/ER/weakentity.sml +++ b/kivio/kiviopart/stencils/Miscellaneous/ER/weakentity.sml @@ -4,7 +4,7 @@ <Title data="Weak Entity"/> <Id data="ER-WeakEntity"/> <Version data="1.0"/> - <Description data="Weak Entity tqshape used in ER diagrams"/> + <Description data="Weak Entity shape used in ER diagrams"/> <Copyright data="Copyright (C) 2005 Peter Simonsson. Distributed under the BSD license."/> <Author data="Peter Simonsson"/> <Email data="psn@linux.se"/> diff --git a/kivio/kiviopart/stencils/Miscellaneous/ER/weakrelationship.sml b/kivio/kiviopart/stencils/Miscellaneous/ER/weakrelationship.sml index 1e30e26d..ac102000 100644 --- a/kivio/kiviopart/stencils/Miscellaneous/ER/weakrelationship.sml +++ b/kivio/kiviopart/stencils/Miscellaneous/ER/weakrelationship.sml @@ -4,7 +4,7 @@ <Title data="Relationship"/> <Id data="ER-Relationship"/> <Version data="1.0"/> - <Description data="Relationship tqshape used in ER diagrams"/> + <Description data="Relationship shape used in ER diagrams"/> <Copyright data="Copyright (C) 2005 Peter Simonsson. Distributed under the BSD license."/> <Author data="Peter Simonsson"/> <Email data="psn@linux.se"/> diff --git a/kivio/kiviopart/stencils/Miscellaneous/People/Bad.sml b/kivio/kiviopart/stencils/Miscellaneous/People/Bad.sml index 27c487ea..eb1650e7 100755 --- a/kivio/kiviopart/stencils/Miscellaneous/People/Bad.sml +++ b/kivio/kiviopart/stencils/Miscellaneous/People/Bad.sml @@ -4,7 +4,7 @@ <Author data="Kristof Borrey"/> <Title data="Bad"/> <Id data="Bad"/> - <Description data="Bad tqshape"/> + <Description data="Bad shape"/> <Version data="0.1"/> <Web data="www.koffice.org"/> <Email data="borrey@kde.org"/> diff --git a/kivio/kiviopart/stencils/Miscellaneous/People/Good.sml b/kivio/kiviopart/stencils/Miscellaneous/People/Good.sml index 88ff54e8..8cb5b46d 100755 --- a/kivio/kiviopart/stencils/Miscellaneous/People/Good.sml +++ b/kivio/kiviopart/stencils/Miscellaneous/People/Good.sml @@ -4,7 +4,7 @@ <Author data="Kristof Borrey"/> <Title data="Good"/> <Id data="Good"/> - <Description data="Good tqshape"/> + <Description data="Good shape"/> <Version data="0.1"/> <Web data="www.koffice.org"/> <Email data="borrey@kde.org"/> diff --git a/kivio/kiviopart/stencils/Miscellaneous/People/Man.sml b/kivio/kiviopart/stencils/Miscellaneous/People/Man.sml index 0656c2a7..13c5b46c 100755 --- a/kivio/kiviopart/stencils/Miscellaneous/People/Man.sml +++ b/kivio/kiviopart/stencils/Miscellaneous/People/Man.sml @@ -4,7 +4,7 @@ <Author data="Kristof Borrey"/> <Title data="Man"/> <Id data="Man"/> - <Description data="Man tqshape"/> + <Description data="Man shape"/> <Version data="0.1"/> <Web data="www.koffice.org"/> <Email data="borrey@kde.org"/> diff --git a/kivio/kiviopart/stencils/Miscellaneous/People/Woman.sml b/kivio/kiviopart/stencils/Miscellaneous/People/Woman.sml index 9f903a1f..e1c4aabc 100755 --- a/kivio/kiviopart/stencils/Miscellaneous/People/Woman.sml +++ b/kivio/kiviopart/stencils/Miscellaneous/People/Woman.sml @@ -4,7 +4,7 @@ <Author data="Kristof Borrey"/> <Title data="Woman"/> <Id data="Woman"/> - <Description data="Woman tqshape"/> + <Description data="Woman shape"/> <Version data="0.1"/> <Web data="www.koffice.org"/> <Email data="borrey@kde.org"/> diff --git a/kivio/kiviopart/stencils/Miscellaneous/People/Woman_Shape.sml b/kivio/kiviopart/stencils/Miscellaneous/People/Woman_Shape.sml index 6bd7f849..36e87464 100755 --- a/kivio/kiviopart/stencils/Miscellaneous/People/Woman_Shape.sml +++ b/kivio/kiviopart/stencils/Miscellaneous/People/Woman_Shape.sml @@ -4,7 +4,7 @@ <Author data="Kristof Borrey"/> <Title data="Woman Shape"/> <Id data="Woman Shape"/> - <Description data="Woman tqshape"/> + <Description data="Woman shape"/> <Version data="0.1"/> <Web data="www.koffice.org"/> <Email data="borrey@kde.org"/> diff --git a/kivio/kiviopart/stencils/Miscellaneous/Transport/Truck.sml b/kivio/kiviopart/stencils/Miscellaneous/Transport/Truck.sml index d8e01658..f7f6d666 100644 --- a/kivio/kiviopart/stencils/Miscellaneous/Transport/Truck.sml +++ b/kivio/kiviopart/stencils/Miscellaneous/Transport/Truck.sml @@ -4,7 +4,7 @@ <Author data="Kristof Borrey"/> <Title data="Truck"/> <Id data="Truck"/> - <Description data="Truck tqshape"/> + <Description data="Truck shape"/> <Version data="0.1"/> <Web data="www.koffice.org"/> <Email data="borrey@kde.org"/> diff --git a/kivio/kiviopart/ui/aligndialog.ui b/kivio/kiviopart/ui/aligndialog.ui index 27f8c3b3..1b1b607d 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> @@ -243,7 +243,7 @@ <property name="pixmap"> <pixmap>image3</pixmap> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop|AlignLeft</set> </property> <property name="vAlign" stdset="0"> @@ -280,7 +280,7 @@ <property name="pixmap"> <pixmap>image5</pixmap> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignBottom|AlignLeft</set> </property> <property name="vAlign" stdset="0"> @@ -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_birdeye_panel.cpp b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp index 8969ea82..30cf7f1f 100644 --- a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp +++ b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp @@ -151,7 +151,7 @@ void KivioBirdEyePanel::updateView() KivioScreenPainter kpainter; kpainter.start(TQT_TQPAINTDEVICE(m_buffer)); - kpainter.painter()->fillRect(rect, KApplication::tqpalette().active().brush(TQColorGroup::Mid)); + kpainter.painter()->fillRect(rect, KApplication::palette().active().brush(TQColorGroup::Mid)); kpainter.painter()->fillRect(px0, py0, pw, ph, white); diff --git a/kivio/kiviopart/ui/kivio_layer_panel.cpp b/kivio/kiviopart/ui/kivio_layer_panel.cpp index fadba0e3..8070cca5 100644 --- a/kivio/kiviopart/ui/kivio_layer_panel.cpp +++ b/kivio/kiviopart/ui/kivio_layer_panel.cpp @@ -27,7 +27,7 @@ #include "layerlisttooltip.h" #include <tqheader.h> -#include <tqlayout.h> +#include <layout.h> #include <ktoolbar.h> #include <klocale.h> @@ -118,7 +118,7 @@ void KivioLayerPanel::addItem() // Set the layer name to something a bit different. This isn't // guaranteed to be unique, but it's better than "Untitled" - layer->setName(i18n("Layer %1").tqarg(id)); + layer->setName(i18n("Layer %1").arg(id)); page->addLayer(layer); page->setCurLayer(layer); 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/kivioaddstencilsetpanel.cpp b/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp index 11c2cc28..d6ef9318 100644 --- a/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp +++ b/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp @@ -24,7 +24,7 @@ #include <tqiconview.h> #include <tqgroupbox.h> #include <tqpushbutton.h> -#include <tqtextbrowser.h> +#include <textbrowser.h> #include <tqsplitter.h> #include <kstandarddirs.h> diff --git a/kivio/kiviopart/ui/kivioarrowheadformatdlg.cpp b/kivio/kiviopart/ui/kivioarrowheadformatdlg.cpp index 9237333e..d3a9a8d6 100644 --- a/kivio/kiviopart/ui/kivioarrowheadformatdlg.cpp +++ b/kivio/kiviopart/ui/kivioarrowheadformatdlg.cpp @@ -21,7 +21,7 @@ #include <tqlabel.h> #include <tqgroupbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqbitmap.h> #include <tqpixmap.h> #include <tqpainter.h> diff --git a/kivio/kiviopart/ui/kiviooptionsdialog.cpp b/kivio/kiviopart/ui/kiviooptionsdialog.cpp index 23900894..4bd6fd62 100644 --- a/kivio/kiviopart/ui/kiviooptionsdialog.cpp +++ b/kivio/kiviopart/ui/kiviooptionsdialog.cpp @@ -45,7 +45,7 @@ #include <tqcombobox.h> #include <tqcheckbox.h> #include <tqradiobutton.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtabwidget.h> // GuidesListViewItem::GuidesListViewItem(TQListView* parent, KivioGuideLineData *gd, KoUnit::Unit u) @@ -111,23 +111,23 @@ void KivioOptionsDialog::initPage() m_unitCombo->insertStringList(KoUnit::listOfUnitName()); m_unitCombo->setCurrentItem(unit); unitLbl->setBuddy(m_unitCombo); - TQLabel* layoutLbl = new TQLabel(i18n("Default tqlayout:"), page); + TQLabel* layoutLbl = new TQLabel(i18n("Default layout:"), 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()); @@ -260,9 +260,9 @@ void KivioOptionsDialog::defaultGrid() void KivioOptionsDialog::setLayoutText(const KoPageLayout& l) { KoUnit::Unit unit = static_cast<KoUnit::Unit>(m_unitCombo->currentItem()); - TQString txt = i18n("Format: %1, Width: %2 %4, Height: %3 %5").tqarg( - KoPageFormat::formatString(l.format)).tqarg(KoUnit::toUserValue(l.ptWidth, unit)) - .tqarg(KoUnit::toUserValue(l.ptHeight, unit)).tqarg(KoUnit::unitName(unit)).tqarg( + TQString txt = i18n("Format: %1, Width: %2 %4, Height: %3 %5").arg( + KoPageFormat::formatString(l.format)).arg(KoUnit::toUserValue(l.ptWidth, unit)) + .arg(KoUnit::toUserValue(l.ptHeight, unit)).arg(KoUnit::unitName(unit)).arg( KoUnit::unitName(unit)); m_layoutTxtLbl->setText(txt); } diff --git a/kivio/kiviopart/ui/kiviostencilformatdlg.cpp b/kivio/kiviopart/ui/kiviostencilformatdlg.cpp index 3361ad23..e682b7fd 100644 --- a/kivio/kiviopart/ui/kiviostencilformatdlg.cpp +++ b/kivio/kiviopart/ui/kiviostencilformatdlg.cpp @@ -20,7 +20,7 @@ #include "kiviostencilformatdlg.h" #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqbitmap.h> #include <tqpixmap.h> #include <tqpainter.h> diff --git a/kivio/kiviopart/ui/kiviotextformatdlg.cpp b/kivio/kiviopart/ui/kiviotextformatdlg.cpp index 94dd995d..051bb90d 100644 --- a/kivio/kiviopart/ui/kiviotextformatdlg.cpp +++ b/kivio/kiviopart/ui/kiviotextformatdlg.cpp @@ -20,7 +20,7 @@ #include "kiviotextformatdlg.h" #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqbuttongroup.h> #include <tqradiobutton.h> @@ -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/kiviopart/ui/objectlistpalette.cpp b/kivio/kiviopart/ui/objectlistpalette.cpp index 7483e98d..bd2d4392 100644 --- a/kivio/kiviopart/ui/objectlistpalette.cpp +++ b/kivio/kiviopart/ui/objectlistpalette.cpp @@ -18,7 +18,7 @@ */ #include "objectlistpalette.h" -#include <tqlayout.h> +#include <layout.h> #include <tqheader.h> #include <tqptrlist.h> @@ -85,7 +85,7 @@ ObjectListPalette::ObjectListPalette(KivioView* parent, const char* name) { m_blockUpdate = false; - TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 0, 2); + TQVBoxLayout* layout = new TQVBoxLayout(this, 0, 2); m_objectList = new KListView(this); m_objectList->setFullWidth(true); @@ -95,7 +95,7 @@ ObjectListPalette::ObjectListPalette(KivioView* parent, const char* name) m_objectList->addColumn(i18n("Name")); m_objectList->addColumn(i18n("Type")); - tqlayout->addWidget(m_objectList); + layout->addWidget(m_objectList); connect(m_objectList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(updateSelection())); } diff --git a/kivio/plugins/kivioconnectortool/tool_connector.cpp b/kivio/plugins/kivioconnectortool/tool_connector.cpp index ca3ff402..26b8feb8 100644 --- a/kivio/plugins/kivioconnectortool/tool_connector.cpp +++ b/kivio/plugins/kivioconnectortool/tool_connector.cpp @@ -122,7 +122,7 @@ void ConnectorTool::setActivated(bool a) m_pStencil = 0; m_pDragData = 0; view()->canvasWidget()->setShowConnectorTargets(true); - view()->canvasWidget()->tqrepaint(); + view()->canvasWidget()->repaint(); emit activated(this); } else { if(m_pStencil && (m_mode == stmDrawRubber) && (m_type == PolyLineConnector)) { @@ -150,7 +150,7 @@ void ConnectorTool::setActivated(bool a) m_permanent = false; view()->setStatusBarInfo(""); view()->canvasWidget()->setShowConnectorTargets(false); - view()->canvasWidget()->tqrepaint(); + view()->canvasWidget()->repaint(); } } @@ -278,7 +278,7 @@ bool ConnectorTool::startRubberBanding( TQMouseEvent *e ) m_pStencil->customDrag(m_pDragData); - canvas->tqrepaint(); + canvas->repaint(); canvas->setCursor(*m_pConnectorCursor2); return true; } @@ -322,7 +322,7 @@ void ConnectorTool::continueRubberBanding( TQMouseEvent *e ) m_pStencil->customDrag(m_pDragData); m_pStencil->updateGeometry(); - canvas->tqrepaint(); + canvas->repaint(); } void ConnectorTool::mouseRelease( TQMouseEvent *e ) diff --git a/kivio/plugins/kivioselecttool/tool_select.cpp b/kivio/plugins/kivioselecttool/tool_select.cpp index b6c24c57..6117cf61 100644 --- a/kivio/plugins/kivioselecttool/tool_select.cpp +++ b/kivio/plugins/kivioselecttool/tool_select.cpp @@ -247,7 +247,7 @@ bool SelectTool::startRubberBanding(const TQPoint &pos) canvas->activePage()->unselectAllStencils(); canvas->startRectDraw( pos, KivioCanvas::Rubber ); - canvas->tqrepaint(); + canvas->repaint(); return true; } @@ -299,7 +299,7 @@ bool SelectTool::startDragging(const TQPoint &pos, bool onlySelected) // Create a new painter object canvas->beginUnclippedSpawnerPainter(); - // Build the list of old tqgeometry + // Build the list of old geometry KivioSelectDragData *pData; m_lstOldGeometry.clear(); pStencil = canvas->activePage()->selectedStencils()->first(); @@ -365,7 +365,7 @@ bool SelectTool::startCustomDragging(const TQPoint &pos, bool selectedOnly ) m_customDragOrigPoint = pStencil->customIDPoint(m_customDragID); view()->canvasWidget()->setShowConnectorTargets(true); - view()->canvasWidget()->tqrepaint(); + view()->canvasWidget()->repaint(); // Create a new painter object canvas->beginUnclippedSpawnerPainter(); @@ -491,7 +491,7 @@ void SelectTool::continueRubberBanding(const TQPoint &pos) * Continues the dragging process of a stencil (moving) * * How does this work? Initially we create a list of all the original - * tqgeometry of all the selected stencils. We use that to calculate delta + * geometry of all the selected stencils. We use that to calculate delta * movements and snap them to the grid. */ void SelectTool::continueDragging(const TQPoint &pos, bool ignoreGridGuides) @@ -512,7 +512,7 @@ void SelectTool::continueDragging(const TQPoint &pos, bool ignoreGridGuides) canvas->drawSelectedStencilsXOR(); } else { canvas->activePage()->setPaintSelected(false); - canvas->tqrepaint(); + canvas->repaint(); m_firstTime = false; } @@ -628,7 +628,7 @@ void SelectTool::continueCustomDragging(const TQPoint &pos) canvas->drawStencilXOR(m_pCustomDraggingStencil); } else { m_pCustomDraggingStencil->setHidden(true); - canvas->tqrepaint(); + canvas->repaint(); m_firstTime = false; } } @@ -641,7 +641,7 @@ void SelectTool::continueCustomDragging(const TQPoint &pos) if(m_pCustomDraggingStencil->type() != kstConnector){ canvas->drawStencilXOR(m_pCustomDraggingStencil); } else { - view()->canvasWidget()->tqrepaint(); + view()->canvasWidget()->repaint(); } view()->updateToolBars(); @@ -674,7 +674,7 @@ void SelectTool::continueResizing(const TQPoint &pos, bool ignoreGridGuides) if( !pData ) { - kdDebug(43000) << "SelectTool::continueResizing() - Original tqgeometry not found" << endl; + kdDebug(43000) << "SelectTool::continueResizing() - Original geometry not found" << endl; return; } @@ -687,7 +687,7 @@ void SelectTool::continueResizing(const TQPoint &pos, bool ignoreGridGuides) canvas->drawStencilXOR( m_pResizingStencil ); } else { m_pResizingStencil->setHidden(true); - canvas->tqrepaint(); + canvas->repaint(); m_firstTime = false; } @@ -1050,7 +1050,7 @@ void SelectTool::endDragging(const TQPoint&) canvas->drawSelectedStencilsXOR(); canvas->endUnclippedSpawnerPainter(); - // Clear the list of old tqgeometry + // Clear the list of old geometry m_lstOldGeometry.clear(); } @@ -1077,7 +1077,7 @@ void SelectTool::endCustomDragging(const TQPoint&) canvas->endUnclippedSpawnerPainter(); canvas->setShowConnectorTargets(false); - canvas->tqrepaint(); + canvas->repaint(); } void SelectTool::endResizing(const TQPoint&) @@ -1200,7 +1200,7 @@ void SelectTool::keyPress(TQKeyEvent* e) // Create a new painter object canvas->beginUnclippedSpawnerPainter(); - // Build the list of old tqgeometry + // Build the list of old geometry KivioSelectDragData *pData; m_lstOldGeometry.clear(); KivioStencil* pStencil = canvas->activePage()->selectedStencils()->first(); diff --git a/kivio/plugins/kiviosmlconnector/sml_connector/sml_connector.cpp b/kivio/plugins/kiviosmlconnector/sml_connector/sml_connector.cpp index 3745820c..8617eb98 100644 --- a/kivio/plugins/kiviosmlconnector/sml_connector/sml_connector.cpp +++ b/kivio/plugins/kiviosmlconnector/sml_connector/sml_connector.cpp @@ -32,7 +32,7 @@ #include "kivio_stencil_spawner_set.h" #include "kivio_text_style.h" #include "kivio_shape.h" -#include "kivio_tqshape_data.h" +#include "kivio_shape_data.h" #include "kivio_point.h" #include "tkmath.h" @@ -96,9 +96,9 @@ KivioSMLConnector::KivioSMLConnector( const TQString &name ) // This is a stencil of type connector setType( kstConnector ); - // We only have one tqshape, an open path. - //m_tqshape = new KivioShape(); - //m_tqshape->tqshapeData() ->setShapeType( KivioShapeData::kstOpenPath ); + // We only have one shape, an open path. + //m_shape = new KivioShape(); + //m_shape->shapeData() ->setShapeType( KivioShapeData::kstOpenPath ); loadPath( name ); } @@ -196,7 +196,7 @@ KivioStencil *KivioSMLConnector::duplicate() void KivioSMLConnector::drawOpenPath( KivioShape *pShape, KivioIntraStencilData *pData ) { KivioPainter * painter; - KivioShapeData *pShapeData = pShape->tqshapeData(); + KivioShapeData *pShapeData = pShape->shapeData(); KivioPoint *pPoint, *pNewPoint; TQPtrList <KivioPoint> *pPointList = pShapeData->pointList(); @@ -262,7 +262,7 @@ void KivioSMLConnector::paint( KivioIntraStencilData *pData ) } - // Build tqshape up from m_pConnectorPoints + // Build shape up from m_pConnectorPoints TQPtrList <KivioPoint> *pNewPoints = new TQPtrList<KivioPoint>; @@ -314,7 +314,7 @@ bool KivioSMLConnector::saveCustom( TQDomElement &e, TQDomDocument &doc ) kdDebug(43000) << "Save custom " << endl; e.appendChild( saveArrowHeads( doc ) ); - //TQDomElement type = m_tqshape->saveXML(doc); + //TQDomElement type = m_shape->saveXML(doc); KivioConnectorPoint *p = m_PointList.first(); while ( p ) { @@ -341,7 +341,7 @@ bool KivioSMLConnector::loadCustom( const TQDomElement &e ) } else if ( name == "KivioShape" ) { - //m_tqshape->loadXML(node.toElement()); + //m_shape->loadXML(node.toElement()); TQDomNode pts = node.firstChild(); while ( !pts.isNull() ) { diff --git a/kivio/plugins/kiviosmlconnector/sml_connector/sml_connector.h b/kivio/plugins/kiviosmlconnector/sml_connector/sml_connector.h index a50ec750..b631f84b 100644 --- a/kivio/plugins/kiviosmlconnector/sml_connector/sml_connector.h +++ b/kivio/plugins/kiviosmlconnector/sml_connector/sml_connector.h @@ -43,7 +43,7 @@ class KivioSMLConnector : public Kivio1DStencil private: bool loadPath(const TQString &file); //void drawOpenPath( KivioShape *, KivioIntraStencilData * ); - KivioShape *m_tqshape; + KivioShape *m_shape; TQPtrList<KivioConnectorPoint> m_PointList; TQString m_name; diff --git a/kivio/plugins/kiviosmlconnector/tool_connector.cpp b/kivio/plugins/kiviosmlconnector/tool_connector.cpp index 4578f0a7..5cef094e 100644 --- a/kivio/plugins/kiviosmlconnector/tool_connector.cpp +++ b/kivio/plugins/kiviosmlconnector/tool_connector.cpp @@ -190,7 +190,7 @@ bool SMLConnector::startRubberBanding( TQMouseEvent *e ) m_pStencil->customDrag(m_pDragData); - canvas->tqrepaint(); + canvas->repaint(); canvas->setCursor(*m_pConnectorCursor2); return true; } @@ -223,7 +223,7 @@ void SMLConnector::continueRubberBanding( TQMouseEvent *e ) m_pStencil->customDrag(m_pDragData); m_pStencil->updateGeometry(); - canvas->tqrepaint(); + canvas->repaint(); } void SMLConnector::mouseRelease( TQMouseEvent *e ) 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(); diff --git a/kivio/plugins/kiviotexttool/tool_text.cpp b/kivio/plugins/kiviotexttool/tool_text.cpp index 7d449ae0..5b1ee4fc 100644 --- a/kivio/plugins/kiviotexttool/tool_text.cpp +++ b/kivio/plugins/kiviotexttool/tool_text.cpp @@ -185,7 +185,7 @@ void TextTool::mousePress( TQMouseEvent *e ) bool TextTool::startRubberBanding( TQMouseEvent *e ) { view()->canvasWidget()->startRectDraw( e->pos(), KivioCanvas::Rubber ); - view()->canvasWidget()->tqrepaint(); + view()->canvasWidget()->repaint(); m_startPoint = e->pos(); return true; @@ -222,7 +222,7 @@ void TextTool::mouseRelease( TQMouseEvent *e ) m_mode = stmNone; - view()->canvasWidget()->tqrepaint(); + view()->canvasWidget()->repaint(); } void TextTool::endRubberBanding(TQMouseEvent */*e*/) @@ -282,12 +282,12 @@ void TextTool::applyToolAction(TQPtrList<KivioStencil>* stencils) TQString text = editor.text(); TQFont font = editor.font(); TQColor textColor = editor.fontColor(); - int htqalignment = editor.horizontalAlignment(); - int vtqalignment = editor.verticalAlignment(); + int halignment = editor.horizontalAlignment(); + int valignment = editor.verticalAlignment(); bool changeFont = (stencil->textFont() != font); bool changeTextColor = (stencil->textColor() != textColor); - bool changeHAlignment = (stencil->hTextAlign() != htqalignment); - bool changeVAlignment = (stencil->vTextAlign() != vtqalignment); + bool changeHAlignment = (stencil->hTextAlign() != halignment); + bool changeVAlignment = (stencil->vTextAlign() != valignment); while( stencil ) @@ -317,18 +317,18 @@ void TextTool::applyToolAction(TQPtrList<KivioStencil>* stencils) changed = true; } - if(changeHAlignment && (stencil->hTextAlign() != htqalignment)) { + if(changeHAlignment && (stencil->hTextAlign() != halignment)) { KivioChangeStencilHAlignmentCommand* cmd = new KivioChangeStencilHAlignmentCommand( - i18n("Change StencilQt::Horizontal Alignment"), view()->activePage(), stencil, stencil->hTextAlign(), htqalignment); - stencil->setHTextAlign(htqalignment); + i18n("Change StencilQt::Horizontal Alignment"), view()->activePage(), stencil, stencil->hTextAlign(), halignment); + stencil->setHTextAlign(halignment); macroCmd->addCommand(cmd); changed = true; } - if(changeVAlignment && (stencil->vTextAlign() != vtqalignment)) { + if(changeVAlignment && (stencil->vTextAlign() != valignment)) { KivioChangeStencilVAlignmentCommand* cmd = new KivioChangeStencilVAlignmentCommand( - i18n("Change StencilQt::Vertical Alignment"), view()->activePage(), stencil, stencil->vTextAlign(), vtqalignment); - stencil->setVTextAlign(vtqalignment); + i18n("Change StencilQt::Vertical Alignment"), view()->activePage(), stencil, stencil->vTextAlign(), valignment); + stencil->setVTextAlign(valignment); macroCmd->addCommand(cmd); changed = true; } @@ -400,24 +400,24 @@ void TextTool::applyToolAction(KivioStencil* stencil, const KoPoint& pos) changed = true; } - int htqalignment = editor.horizontalAlignment(); + int halignment = editor.horizontalAlignment(); - if(stencil->hTextAlign(name) != htqalignment) { + if(stencil->hTextAlign(name) != halignment) { KivioChangeStencilHAlignmentCommand* cmd = new KivioChangeStencilHAlignmentCommand( i18n("Change StencilQt::Horizontal Alignment"), view()->activePage(), stencil, - stencil->hTextAlign(name), htqalignment, name); - stencil->setHTextAlign(name, htqalignment); + stencil->hTextAlign(name), halignment, name); + stencil->setHTextAlign(name, halignment); macroCmd->addCommand(cmd); changed = true; } - int vtqalignment = editor.verticalAlignment(); + int valignment = editor.verticalAlignment(); - if(stencil->vTextAlign(name) != vtqalignment) { + if(stencil->vTextAlign(name) != valignment) { KivioChangeStencilVAlignmentCommand* cmd = new KivioChangeStencilVAlignmentCommand( i18n("Change StencilQt::Vertical Alignment"), view()->activePage(), stencil, - stencil->vTextAlign(name), vtqalignment, name); - stencil->setVTextAlign(name, vtqalignment); + stencil->vTextAlign(name), valignment, name); + stencil->setVTextAlign(name, valignment); macroCmd->addCommand(cmd); changed = true; } |