Rename obsolete tq methods to standard names

pull/1/head
Timothy Pearson 14 years ago
parent f0de9e167e
commit 2d6954f69c

@ -62,7 +62,7 @@ Variable/Parameter names
Designer
Chalk has started to use designer. All dialogs and all widgets that have a tqlayout
Chalk has started to use designer. All dialogs and all widgets that have a layout
manager must be done in designer. We don't add code nor add signal/slot connections
in designer

@ -60,7 +60,7 @@ protected:
/**
* The order in which channels() returns is not the same as the internal representation,
* that of the pixel internally. This method converts external usage to internal usage.
* This method uses some basic assumtpions about the tqlayout of the pixel, so _extremely_
* This method uses some basic assumtpions about the layout of the pixel, so _extremely_
* exotic spaces might want to override this (see makeExternalToInternal source for
* those assumptions)
**/

@ -50,7 +50,7 @@ KisWetPaletteWidget::KisWetPaletteWidget(TQWidget *parent, const char *name) : s
{
m_subject = 0;
TQVBoxLayout * vl = new TQVBoxLayout(this, 0, -1, "main tqlayout");
TQVBoxLayout * vl = new TQVBoxLayout(this, 0, -1, "main layout");
TQGridLayout * l = new TQGridLayout(vl, 2, 8, 2, "color wells grid");

@ -85,7 +85,7 @@ The current outline (working towards 1.6):
- [TODO] properties, usage, converting, ...
- Commands
- General tqlayout
- General layout
- Menus
- Toolbars
- Palettes
@ -142,7 +142,7 @@ Outline for the 1.5 manual (final as of 2006-05-31):
- Available colorspaces
- Commands ([TODO] make up-to-date)
- General tqlayout
- General layout
- Menus
- Toolbars
- Palettes

@ -2,7 +2,7 @@
On Tuesday 21 June 2005 14:16, Casper Boemann wrote:
> Hi
>
> As you might have noticed I have changed the tqlayout of the preview, to lo=
> As you might have noticed I have changed the layout of the preview, to lo=
ok
> more like digikam.
>

@ -58,7 +58,7 @@
</spacer>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout17</cstring>
<cstring>layout17</cstring>
</property>
<grid>
<property name="name">

@ -38,7 +38,7 @@
</spacer>
<widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>tqlayout1</cstring>
<cstring>layout1</cstring>
</property>
<hbox>
<property name="name">

@ -38,7 +38,7 @@
</spacer>
<widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>tqlayout1</cstring>
<cstring>layout1</cstring>
</property>
<hbox>
<property name="name">

@ -32,7 +32,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<grid>
<property name="name">
@ -169,7 +169,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
<cstring>tqlayout7</cstring>
<cstring>layout7</cstring>
</property>
<grid>
<property name="name">

@ -24,7 +24,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@ -47,7 +47,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout8</cstring>
<cstring>layout8</cstring>
</property>
<grid>
<property name="name">

@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout5</cstring>
<cstring>layout5</cstring>
</property>
<vbox>
<property name="name">
@ -34,7 +34,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@ -80,7 +80,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<hbox>
<property name="name">

@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout1</cstring>
<cstring>layout1</cstring>
</property>
<hbox>
<property name="name">

@ -60,7 +60,7 @@
</widget>
<widget class="TQLayoutWidget" row="2" column="0">
<property name="name">
<cstring>tqlayout7</cstring>
<cstring>layout7</cstring>
</property>
<vbox>
<property name="name">
@ -88,7 +88,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout5</cstring>
<cstring>layout5</cstring>
</property>
<vbox>
<property name="name">
@ -107,7 +107,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout5</cstring>
<cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
@ -194,7 +194,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout6</cstring>
<cstring>layout6</cstring>
</property>
<vbox>
<property name="name">
@ -213,7 +213,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout2</cstring>
<cstring>layout2</cstring>
</property>
<hbox>
<property name="name">

@ -39,7 +39,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<vbox>
<property name="name">
@ -83,7 +83,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<vbox>
<property name="name">
@ -127,7 +127,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout5</cstring>
<cstring>layout5</cstring>
</property>
<vbox>
<property name="name">

@ -70,7 +70,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout2</cstring>
<cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@ -101,7 +101,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout1</cstring>
<cstring>layout1</cstring>
</property>
<hbox>
<property name="name">

@ -152,7 +152,7 @@ TQWidget* KisToolSelectBrush::createOptionWidget(TQWidget* parent)
Q_CHECK_PTR(m_optWidget);
m_optWidget->setCaption(i18n("Selection Brush"));
TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout());
TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout());
l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding));
return m_optWidget;

@ -189,7 +189,7 @@ TQWidget* KisToolSelectContiguous::createOptionWidget(TQWidget* parent)
Q_CHECK_PTR(m_optWidget);
m_optWidget->setCaption(i18n("Contiguous Area Selection"));
TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout());
TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout());
l->setSpacing( 6 );
connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int)));

@ -305,7 +305,7 @@ TQWidget* KisToolSelectElliptical::createOptionWidget(TQWidget* parent)
connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int)));
TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout());
TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout());
l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding));
return m_optWidget;

@ -139,7 +139,7 @@ TQWidget* KisToolSelectEraser::createOptionWidget(TQWidget* parent)
Q_CHECK_PTR(m_optWidget);
m_optWidget->setCaption(i18n("Selection Eraser"));
TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout());
TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout());
l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding));
return m_optWidget;

@ -275,7 +275,7 @@ TQWidget* KisToolSelectOutline::createOptionWidget(TQWidget* parent)
connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int)));
TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout());
TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout());
l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding));
return m_optWidget;

@ -294,7 +294,7 @@ TQWidget* KisToolSelectPolygonal::createOptionWidget(TQWidget* parent)
connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int)));
TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout());
TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout());
l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding));
return m_optWidget;

@ -306,7 +306,7 @@ TQWidget* KisToolSelectRectangular::createOptionWidget(TQWidget* parent)
connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int)));
TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout());
TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout());
l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding));
return m_optWidget;

@ -27,7 +27,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<grid>
<property name="name">
@ -138,7 +138,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout9</cstring>
<cstring>layout9</cstring>
</property>
<hbox>
<property name="name">

@ -576,7 +576,7 @@ TQWidget* KisToolCurve::createSelectionOptionWidget(TQWidget* parent)
connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int)));
TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout());
TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout());
l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding));
return m_optWidget;

@ -762,7 +762,7 @@ void KisToolMagnetic::slotSetDistance (int dist)
TQWidget* KisToolMagnetic::createOptionWidget(TQWidget* parent)
{
m_optWidget = super::createOptionWidget(parent);
TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout());
TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout());
TQGridLayout *box = new TQGridLayout(l, 2, 2, 3);
box->setColStretch(0, 1);
box->setColStretch(1, 1);

@ -24,7 +24,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout8</cstring>
<cstring>layout8</cstring>
</property>
<hbox>
<property name="name">
@ -59,7 +59,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout7</cstring>
<cstring>layout7</cstring>
</property>
<hbox>
<property name="name">

@ -24,7 +24,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout8</cstring>
<cstring>layout8</cstring>
</property>
<hbox>
<property name="name">
@ -59,7 +59,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout7</cstring>
<cstring>layout7</cstring>
</property>
<hbox>
<property name="name">

@ -27,7 +27,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>tqlayout11</cstring>
<cstring>layout11</cstring>
</property>
<hbox>
<property name="name">
@ -35,7 +35,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout7</cstring>
<cstring>layout7</cstring>
</property>
<vbox>
<property name="name">
@ -43,7 +43,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout1</cstring>
<cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
@ -72,7 +72,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout2</cstring>
<cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@ -103,7 +103,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout8</cstring>
<cstring>layout8</cstring>
</property>
<vbox>
<property name="name">
@ -111,7 +111,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@ -140,7 +140,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<hbox>
<property name="name">

@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout10</cstring>
<cstring>layout10</cstring>
</property>
<hbox>
<property name="name">
@ -29,7 +29,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout8</cstring>
<cstring>layout8</cstring>
</property>
<vbox>
<property name="name">
@ -37,7 +37,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout7</cstring>
<cstring>layout7</cstring>
</property>
<hbox>
<property name="name">
@ -144,7 +144,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout9</cstring>
<cstring>layout9</cstring>
</property>
<vbox>
<property name="name">

@ -67,7 +67,7 @@ KisDlgFiltersGallery::KisDlgFiltersGallery(KisView* view, TQWidget* parent,const
resize( minimumSizeHint());
m_widget->previewWidget->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::MinimumExpanding);
m_labelNoCW = new TQLabel(i18n("No configuration options are available for this filter."), m_widget->configWidgetHolder);
m_widget->configWidgetHolder->tqlayout()->add(m_labelNoCW);
m_widget->configWidgetHolder->layout()->add(m_labelNoCW);
m_labelNoCW->hide();
}
@ -81,7 +81,7 @@ void KisDlgFiltersGallery::selectionHasChanged ( TQIconViewItem * item )
m_currentFilter = kisitem->filter();
if(m_currentConfigWidget != 0)
{
m_widget->configWidgetHolder->tqlayout()->remove(m_currentConfigWidget);
m_widget->configWidgetHolder->layout()->remove(m_currentConfigWidget);
delete m_currentConfigWidget;
m_currentConfigWidget = 0;
} else {
@ -95,7 +95,7 @@ void KisDlgFiltersGallery::selectionHasChanged ( TQIconViewItem * item )
if(m_currentConfigWidget != 0) {
//m_currentConfigWidget->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
m_widget->configWidgetHolder->tqlayout()->add(m_currentConfigWidget);
m_widget->configWidgetHolder->layout()->add(m_currentConfigWidget);
m_currentConfigWidget->show();
connect(m_currentConfigWidget, TQT_SIGNAL(sigPleaseUpdatePreview()), this, TQT_SLOT(slotConfigChanged()));
}

@ -133,7 +133,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout2</cstring>
<cstring>layout2</cstring>
</property>
<hbox>
<property name="name">

@ -233,7 +233,7 @@
</widget>
<widget class="TQLayoutWidget" row="18" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>tqlayout5</cstring>
<cstring>layout5</cstring>
</property>
<hbox>
<property name="name">

@ -32,7 +32,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>tqlayout6</cstring>
<cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
@ -177,7 +177,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout1</cstring>
<cstring>layout1</cstring>
</property>
<hbox>
<property name="name">

@ -162,7 +162,7 @@ bool KSnapshot::save( const KURL& url )
void KSnapshot::slotCopy()
{
TQClipboard *cb = TQApplication::tqclipboard();
TQClipboard *cb = TQApplication::clipboard();
cb->setPixmap( snapshot );
}

@ -161,7 +161,7 @@ void RegionGrabber::drawRubber()
p.setPen( TQPen( color0, 1 ) );
p.setBrush( NoBrush );
tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, grabRect, colorGroup(),
style().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, grabRect, colorGroup(),
TQStyle::Style_Default, TQStyleOption( colorGroup().base() ) );
p.end();

@ -46,7 +46,7 @@ DlgShearImage::DlgShearImage( TQWidget * parent,
m_lock = false;
m_page = new WdgShearImage(this, "shear_image");
m_page->tqlayout()->setMargin(0);
m_page->layout()->setMargin(0);
Q_CHECK_PTR(m_page);
setMainWidget(m_page);

@ -29,7 +29,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<grid>
<property name="name">
@ -92,7 +92,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout2</cstring>
<cstring>layout2</cstring>
</property>
<grid>
<property name="name">

@ -228,7 +228,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout5</cstring>
<cstring>layout5</cstring>
</property>
<property name="geometry">
<rect>

@ -41,7 +41,7 @@ KisBrushChooser::KisBrushChooser(TQWidget *parent, const char *name)
m_lbName = new TQLabel(this);
TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 2, -1, "main tqlayout");
TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 2, -1, "main layout");
mainLayout->addWidget(m_lbName);
mainLayout->addWidget(chooserWidget(), 10);

@ -52,7 +52,7 @@ KisClipboard::KisClipboard()
clipboardDataChanged();
// Make sure we are notified when clipboard changes
connect( TQApplication::tqclipboard(), TQT_SIGNAL( dataChanged() ),
connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ),
this, TQT_SLOT( clipboardDataChanged() ) );
}
@ -132,14 +132,14 @@ void KisClipboard::setClip(KisPaintDeviceSP selection)
multiDrag->addDragObject( storeDrag );
TQClipboard *cb = TQApplication::tqclipboard();
TQClipboard *cb = TQApplication::clipboard();
cb->setData(multiDrag);
m_pushedClipboard = true;
}
KisPaintDeviceSP KisClipboard::clip()
{
TQClipboard *cb = TQApplication::tqclipboard();
TQClipboard *cb = TQApplication::clipboard();
TQCString mimeType("application/x-chalk-selection");
TQMimeSource *cbData = cb->data();
@ -211,7 +211,7 @@ void KisClipboard::clipboardDataChanged()
{
if (!m_pushedClipboard) {
m_hasClip = false;
TQClipboard *cb = TQApplication::tqclipboard();
TQClipboard *cb = TQApplication::clipboard();
TQImage qimg = cb->image();
TQMimeSource *cbData = cb->data();
TQCString mimeType("application/x-chalk-selection");
@ -235,7 +235,7 @@ bool KisClipboard::hasClip()
TQSize KisClipboard::clipSize()
{
TQClipboard *cb = TQApplication::tqclipboard();
TQClipboard *cb = TQApplication::clipboard();
TQCString mimeType("application/x-chalk-selection");
TQMimeSource *cbData = cb->data();

@ -83,25 +83,25 @@ void KisColorCup::slotClicked()
TQSize KisColorCup::sizeHint() const
{
return tqstyle().tqsizeFromContents(TQStyle::CT_PushButton, this, TQSize(24, 24)).
return style().tqsizeFromContents(TQStyle::CT_PushButton, this, TQSize(24, 24)).
expandedTo(TQApplication::globalStrut());
}
void KisColorCup::drawButtonLabel( TQPainter *painter )
{
int x, y, w, h;
TQRect r = tqstyle().subRect( TQStyle::SR_PushButtonContents, this );
TQRect r = style().subRect( TQStyle::SR_PushButtonContents, this );
r.rect(&x, &y, &w, &h);
int margin = 2; //tqstyle().pixelMetric( TQStyle::PM_ButtonMargin, this );
int margin = 2; //style().pixelMetric( TQStyle::PM_ButtonMargin, this );
x += margin;
y += margin;
w -= 2*margin;
h -= 2*margin;
if (isOn() || isDown()) {
x += tqstyle().pixelMetric( TQStyle::PM_ButtonShiftHorizontal, this );
y += tqstyle().pixelMetric( TQStyle::PM_ButtonShiftVertical, this );
x += style().pixelMetric( TQStyle::PM_ButtonShiftHorizontal, this );
y += style().pixelMetric( TQStyle::PM_ButtonShiftVertical, this );
}
qDrawShadePanel( painter, x, y, w, h, colorGroup(), true, 1, NULL);
@ -109,8 +109,8 @@ void KisColorCup::drawButtonLabel( TQPainter *painter )
painter->fillRect( x+1, y+1, w-2, h-2, m_color );
if ( hasFocus() ) {
TQRect focusRect = tqstyle().subRect( TQStyle::SR_PushButtonFocusRect, this );
tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, painter, focusRect, colorGroup() );
TQRect focusRect = style().subRect( TQStyle::SR_PushButtonFocusRect, this );
style().tqdrawPrimitive( TQStyle::PE_FocusRect, painter, focusRect, colorGroup() );
}
}

@ -218,7 +218,7 @@ void KisControlFrame::createBrushesChooser(KisView * view)
m_brushChooserPopup = new KisPopupFrame(m_brushWidget, "brush_chooser_popup");
TQHBoxLayout * l = new TQHBoxLayout(m_brushChooserPopup, 2, 2, "brushpopuptqlayout");
TQHBoxLayout * l = new TQHBoxLayout(m_brushChooserPopup, 2, 2, "brushpopuplayout");
TQTabWidget * m_brushesTab = new TQTabWidget(m_brushChooserPopup, "brushestab");
m_brushesTab->setTabShape(TQTabWidget::Triangular);
@ -270,7 +270,7 @@ void KisControlFrame::createPatternsChooser(KisView * view)
{
m_patternChooserPopup = new KisPopupFrame(m_patternWidget, "pattern_chooser_popup");
TQHBoxLayout * l2 = new TQHBoxLayout(m_patternChooserPopup, 2, 2, "patternpopuptqlayout");
TQHBoxLayout * l2 = new TQHBoxLayout(m_patternChooserPopup, 2, 2, "patternpopuplayout");
TQTabWidget * m_patternsTab = new TQTabWidget(m_patternChooserPopup, "patternstab");
m_patternsTab->setTabShape(TQTabWidget::Triangular);
@ -311,7 +311,7 @@ void KisControlFrame::createGradientsChooser(KisView * view)
{
m_gradientChooserPopup = new KisPopupFrame(m_gradientWidget, "gradient_chooser_popup");
TQHBoxLayout * l2 = new TQHBoxLayout(m_gradientChooserPopup, 2, 2, "gradientpopuptqlayout");
TQHBoxLayout * l2 = new TQHBoxLayout(m_gradientChooserPopup, 2, 2, "gradientpopuplayout");
TQTabWidget * m_gradientTab = new TQTabWidget(m_gradientChooserPopup, "gradientstab");
m_gradientTab->setTabShape(TQTabWidget::Triangular);

@ -85,16 +85,16 @@ KisDlgAdjLayerProps::KisDlgAdjLayerProps(KisAdjustmentLayerSP layer,
}
setCaption(caption);
TQWidget * page = new TQWidget(this, "page widget");
TQHBoxLayout * tqlayout = new TQHBoxLayout(page, 0, 6);
TQHBoxLayout * layout = new TQHBoxLayout(page, 0, 6);
setMainWidget(page);
m_preview = new KisPreviewWidget(page, "dlgadjustment.preview");
m_preview->slotSetDevice( dev );
connect( m_preview, TQT_SIGNAL(updated()), this, TQT_SLOT(refreshPreview()));
tqlayout->addWidget(m_preview, 1, 1);
layout->addWidget(m_preview, 1, 1);
TQVBoxLayout *v1 = new TQVBoxLayout( tqlayout );
TQVBoxLayout *v1 = new TQVBoxLayout( layout );
TQHBoxLayout *hl = new TQHBoxLayout( v1 );
TQLabel * lblName = new TQLabel(i18n("Layer name:"), page, "lblName");

@ -102,7 +102,7 @@ KisDlgAdjustmentLayer::KisDlgAdjustmentLayer(KisImage * img,
m_labelNoConfigWidget = new TQLabel(i18n("No configuration options are available for this filter"),
m_configWidgetHolder);
m_configWidgetHolder->tqlayout()->add(m_labelNoConfigWidget);
m_configWidgetHolder->layout()->add(m_labelNoConfigWidget);
m_labelNoConfigWidget->hide();
resize( TQSize(600, 480).expandedTo(minimumSizeHint()) );
@ -156,7 +156,7 @@ void KisDlgAdjustmentLayer::selectionHasChanged ( TQIconViewItem * item )
if ( m_currentConfigWidget != 0 )
{
m_configWidgetHolder->tqlayout()->remove(m_currentConfigWidget);
m_configWidgetHolder->layout()->remove(m_currentConfigWidget);
delete m_currentConfigWidget;
m_currentConfigWidget = 0;
@ -173,7 +173,7 @@ void KisDlgAdjustmentLayer::selectionHasChanged ( TQIconViewItem * item )
if (m_currentConfigWidget != 0)
{
m_configWidgetHolder->tqlayout()->add(m_currentConfigWidget);
m_configWidgetHolder->layout()->add(m_currentConfigWidget);
m_currentConfigWidget->show();
connect(m_currentConfigWidget, TQT_SIGNAL(sigPleaseUpdatePreview()), this, TQT_SLOT(slotConfigChanged()));
} else {

@ -43,7 +43,7 @@ KisDlgLayerProperties::KisDlgLayerProperties(const TQString& deviceName,
: super(parent, name, f, name, Ok | Cancel)
{
m_page = new WdgLayerProperties(this);
m_page->tqlayout()->setMargin(0);
m_page->layout()->setMargin(0);
opacity = int((opacity * 100.0) / 255 + 0.5);

@ -48,7 +48,7 @@ NewLayerDialog::NewLayerDialog(const KisID colorSpaceID,
: super(parent, name, true, "", Ok | Cancel)
{
m_page = new WdgLayerProperties(this);
m_page->tqlayout()->setMargin(0);
m_page->layout()->setMargin(0);
setCaption(i18n("New Layer"));

@ -53,7 +53,7 @@ void KisDoubleWidget::init(double min, double max)
connect(m_slider, TQT_SIGNAL(sliderPressed()), TQT_SIGNAL(sliderPressed()));
connect(m_slider, TQT_SIGNAL(sliderReleased()), TQT_SIGNAL(sliderReleased()));
m_layout = new TQHBoxLayout(this, 0, -1, "hbox tqlayout");
m_layout = new TQHBoxLayout(this, 0, -1, "hbox layout");
m_layout->addWidget(m_slider);
m_layout->addSpacing(5);

@ -49,7 +49,7 @@ KisGradientChooser::KisGradientChooser(KisView * view, TQWidget *parent, const c
KisCustomGradientDialog * autogradient = new KisCustomGradientDialog(view, this, "autogradient");
connect(m_customGradient, TQT_SIGNAL(clicked()), autogradient, TQT_SLOT(show()));
TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 2, -1, "main tqlayout");
TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 2, -1, "main layout");
mainLayout->addWidget(m_lbName);
mainLayout->addWidget(chooserWidget(), 10);

@ -98,7 +98,7 @@ void KisIntSpinbox::init(int val)
d->m_prevValue = val;
setValue(val);
setFocusProxy(d->m_numinput);
tqlayout();
layout();
connect(d->m_numinput, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(spinboxValueChanged(int)));
connect(d->m_slider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(sliderValueChanged(int)));
@ -128,7 +128,7 @@ void KisIntSpinbox::setRange(int lower, int upper, int /*step*/)
lower = kMin(upper, lower);
d->m_slider->setRange(lower, upper);
tqlayout();
layout();
}
void KisIntSpinbox::setMinValue(int min)

@ -67,14 +67,14 @@ KisPaletteWidget::KisPaletteWidget( TQWidget *parent, int minWidth, int cols)
m_currentPalette = 0;
TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
TQVBoxLayout *layout = new TQVBoxLayout( this );
combo = new TQComboBox( false, this );
combo->setFocusPolicy( TQ_ClickFocus );
tqlayout->addWidget(combo);
layout->addWidget(combo);
m_view = new KisPaletteView(this, 0, minWidth, cols);
tqlayout->addWidget( m_view );
layout->addWidget( m_view );
//setFixedSize(sizeHint());

@ -30,7 +30,7 @@ KisPatternChooser::KisPatternChooser(TQWidget *parent, const char *name) : super
{
m_lbName = new TQLabel(this);
TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 2, -1, "main tqlayout");
TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 2, -1, "main layout");
mainLayout->addWidget(m_lbName);
mainLayout->addWidget(chooserWidget(), 10);

@ -28,14 +28,14 @@
KisPreviewDialog::KisPreviewDialog( TQWidget * parent, const char * name, bool modal, const TQString &caption)
: super (parent, name, modal, caption, Ok | Cancel, Ok)
{
TQHBox* tqlayout = new TQHBox(this);
tqlayout->setSpacing( 6 );
TQHBox* layout = new TQHBox(this);
layout->setSpacing( 6 );
m_containerFrame = new TQFrame( tqlayout, "container" );
m_containerFrame = new TQFrame( layout, "container" );
m_preview = new KisPreviewWidget( tqlayout, "previewWidget" );
m_preview = new KisPreviewWidget( layout, "previewWidget" );
setMainWidget(tqlayout);
setMainWidget(layout);
}
KisPreviewDialog::~KisPreviewDialog()

@ -73,7 +73,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@ -122,7 +122,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout5</cstring>
<cstring>layout5</cstring>
</property>
<vbox>
<property name="name">
@ -130,7 +130,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<hbox>
<property name="name">

@ -236,7 +236,7 @@ void KisSelectionManager::setup(KActionCollection * collection)
// this, TQT_SLOT(save()),
// collection, "save_selection");
TQClipboard *cb = TQApplication::tqclipboard();
TQClipboard *cb = TQApplication::clipboard();
connect(cb, TQT_SIGNAL(dataChanged()), TQT_SLOT(clipboardDataChanged()));
}

@ -161,12 +161,12 @@ TQWidget* KisToolPaint::optionWidget()
return m_optionWidget;
}
void KisToolPaint::addOptionWidgetLayout(TQLayout *tqlayout)
void KisToolPaint::addOptionWidgetLayout(TQLayout *layout)
{
Q_ASSERT(m_optionWidget != 0);
Q_ASSERT(m_optionWidgetLayout != 0);
int rowCount = m_optionWidgetLayout->numRows();
m_optionWidgetLayout->addMultiCellLayout(tqlayout, rowCount, rowCount, 0, 1);
m_optionWidgetLayout->addMultiCellLayout(layout, rowCount, rowCount, 0, 1);
}
void KisToolPaint::addOptionWidgetOption(TQWidget *control, TQWidget *label)

@ -88,8 +88,8 @@ public slots:
protected:
void notifyModified() const;
// Add the tool-specific tqlayout to the default option widget's tqlayout.
void addOptionWidgetLayout(TQLayout *tqlayout);
// Add the tool-specific layout to the default option widget's layout.
void addOptionWidgetLayout(TQLayout *layout);
private:
void updateCompositeOpComboBox();

@ -694,7 +694,7 @@ void KisView::resizeEvent(TQResizeEvent *)
}
KisImageSP img = currentImg();
TQ_INT32 scrollBarExtent = tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent);
TQ_INT32 scrollBarExtent = style().pixelMetric(TQStyle::PM_ScrollBarExtent);
TQ_INT32 drawH;
TQ_INT32 drawW;
TQ_INT32 docW;

@ -1277,7 +1277,7 @@ void LayerItem::paintCell( TQPainter *painter, const TQColorGroup &cg, int colum
p.setFont( font() );
const TQColorGroup cg_ = isEnabled() ? listView()->tqpalette().active() : listView()->tqpalette().disabled();
const TQColorGroup cg_ = isEnabled() ? listView()->palette().active() : listView()->palette().disabled();
const TQColor bg = isSelected() ? cg_.highlight()
: isAlternate() ? listView()->alternateBackground()

@ -98,7 +98,7 @@ TQSize SqueezedComboBox::sizeHint() const
int maxW = count() ? 18 : 7 * fm.width(TQChar('x')) + 18;
int maxH = TQMAX( fm.lineSpacing(), 14 ) + 2;
return tqstyle().tqsizeFromContents(TQStyle::CT_ComboBox, this,
return style().tqsizeFromContents(TQStyle::CT_ComboBox, this,
TQSize(maxW, maxH)).
expandedTo(TQApplication::globalStrut());
}

@ -26,7 +26,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="1">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<vbox>
<property name="name">
@ -48,7 +48,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout21</cstring>
<cstring>layout21</cstring>
</property>
<grid>
<property name="name">
@ -169,7 +169,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout23</cstring>
<cstring>layout23</cstring>
</property>
<grid>
<property name="name">
@ -273,7 +273,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout6</cstring>
<cstring>layout6</cstring>
</property>
<vbox>
<property name="name">

@ -57,7 +57,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout11</cstring>
<cstring>layout11</cstring>
</property>
<property name="font">
<font>
@ -71,7 +71,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout10</cstring>
<cstring>layout10</cstring>
</property>
<property name="font">
<font>
@ -95,7 +95,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout8</cstring>
<cstring>layout8</cstring>
</property>
<property name="font">
<font>
@ -150,7 +150,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout9</cstring>
<cstring>layout9</cstring>
</property>
<property name="font">
<font>
@ -207,7 +207,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout5</cstring>
<cstring>layout5</cstring>
</property>
<property name="font">
<font>
@ -287,7 +287,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout11_2</cstring>
<cstring>layout11_2</cstring>
</property>
<property name="font">
<font>

@ -39,7 +39,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@ -53,7 +53,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout10</cstring>
<cstring>layout10</cstring>
</property>
<vbox>
<property name="name">
@ -195,7 +195,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<hbox>
<property name="name">

@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout8</cstring>
<cstring>layout8</cstring>
</property>
<hbox>
<property name="name">
@ -266,7 +266,7 @@ The different rendering intent methods will affect only what is shown on screen,
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout6</cstring>
<cstring>layout6</cstring>
</property>
<vbox>
<property name="name">

@ -18,7 +18,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<grid>
<property name="name">
@ -103,7 +103,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout6</cstring>
<cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
@ -169,7 +169,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout7</cstring>
<cstring>layout7</cstring>
</property>
<vbox>
<property name="name">

@ -18,7 +18,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@ -49,7 +49,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout6</cstring>
<cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
@ -115,7 +115,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout7</cstring>
<cstring>layout7</cstring>
</property>
<vbox>
<property name="name">

@ -49,7 +49,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<vbox>
<property name="name">

@ -18,7 +18,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<vbox>
<property name="name">
@ -26,7 +26,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout1</cstring>
<cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
@ -112,7 +112,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout2</cstring>
<cstring>layout2</cstring>
</property>
<hbox>
<property name="name">

@ -214,7 +214,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout8</cstring>
<cstring>layout8</cstring>
</property>
<hbox>
<property name="name">
@ -222,7 +222,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout6</cstring>
<cstring>layout6</cstring>
</property>
<grid>
<property name="name">
@ -320,7 +320,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
<cstring>tqlayout9</cstring>
<cstring>layout9</cstring>
</property>
<hbox>
<property name="name">

@ -24,7 +24,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@ -74,7 +74,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout6</cstring>
<cstring>layout6</cstring>
</property>
<hbox>
<property name="name">

@ -316,7 +316,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout1</cstring>
<cstring>layout1</cstring>
</property>
<hbox>
<property name="name">

@ -29,7 +29,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout2</cstring>
<cstring>layout2</cstring>
</property>
<hbox>
<property name="name">

@ -18,7 +18,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@ -72,7 +72,7 @@ Note that this number is only a guideline for Chalk, and is not guaranteed to be
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout5</cstring>
<cstring>layout5</cstring>
</property>
<hbox>
<property name="name">

@ -24,7 +24,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout1</cstring>
<cstring>layout1</cstring>
</property>
<hbox>
<property name="name">

@ -49,7 +49,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@ -72,7 +72,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout4_4</cstring>
<cstring>layout4_4</cstring>
</property>
<hbox>
<property name="name">
@ -95,7 +95,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout4_2</cstring>
<cstring>layout4_2</cstring>
</property>
<hbox>
<property name="name">
@ -118,7 +118,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout4_3</cstring>
<cstring>layout4_3</cstring>
</property>
<hbox>
<property name="name">
@ -141,7 +141,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout4_6</cstring>
<cstring>layout4_6</cstring>
</property>
<hbox>
<property name="name">
@ -164,7 +164,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout4_5</cstring>
<cstring>layout4_5</cstring>
</property>
<hbox>
<property name="name">

@ -32,7 +32,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@ -55,7 +55,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout5</cstring>
<cstring>layout5</cstring>
</property>
<hbox>
<property name="name">

@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<vbox>
<property name="name">
@ -29,7 +29,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout9</cstring>
<cstring>layout9</cstring>
</property>
<hbox>
<property name="name">
@ -65,7 +65,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout10</cstring>
<cstring>layout10</cstring>
</property>
<hbox>
<property name="name">

@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@ -40,7 +40,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout5</cstring>
<cstring>layout5</cstring>
</property>
<vbox>
<property name="name">
@ -80,7 +80,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<hbox>
<property name="name">

@ -40,7 +40,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout6</cstring>
<cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
@ -65,7 +65,7 @@
</spacer>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout2</cstring>
<cstring>layout2</cstring>
</property>
<grid>
<property name="name">
@ -160,7 +160,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@ -185,7 +185,7 @@
</spacer>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<grid>
<property name="name">

@ -24,7 +24,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout6</cstring>
<cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
@ -50,7 +50,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout5</cstring>
<cstring>layout5</cstring>
</property>
<vbox>
<property name="name">
@ -88,7 +88,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<hbox>
<property name="name">

@ -45,7 +45,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout2</cstring>
<cstring>layout2</cstring>
</property>
<vbox>
<property name="name">
@ -330,7 +330,7 @@
</spacer>
<widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="3">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@ -355,7 +355,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout10</cstring>
<cstring>layout10</cstring>
</property>
<hbox>
<property name="name">

@ -51,7 +51,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout10</cstring>
<cstring>layout10</cstring>
</property>
<hbox>
<property name="name">
@ -119,7 +119,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout7</cstring>
<cstring>layout7</cstring>
</property>
<hbox>
<property name="name">
@ -289,7 +289,7 @@ You can uncheck the box if you are not using transparancy and you want to make t
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout5</cstring>
<cstring>layout5</cstring>
</property>
<vbox>
<property name="name">
@ -329,7 +329,7 @@ You can uncheck the box if you are not using transparancy and you want to make t
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout4_2</cstring>
<cstring>layout4_2</cstring>
</property>
<hbox>
<property name="name">
@ -418,7 +418,7 @@ You can uncheck the box if you are not using transparancy and you want to make t
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout5_2</cstring>
<cstring>layout5_2</cstring>
</property>
<vbox>
<property name="name">
@ -456,7 +456,7 @@ You can uncheck the box if you are not using transparancy and you want to make t
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@ -621,7 +621,7 @@ You can uncheck the box if you are not using transparancy and you want to make t
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout5_2_2</cstring>
<cstring>layout5_2_2</cstring>
</property>
<vbox>
<property name="name">
@ -659,7 +659,7 @@ You can uncheck the box if you are not using transparancy and you want to make t
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout4_3</cstring>
<cstring>layout4_3</cstring>
</property>
<hbox>
<property name="name">

@ -156,7 +156,7 @@ KoFilter::ConversionStatus APPLIXGRAPHICImport::convert( const TQCString& from,
str += "<!DOCTYPE karbon>\n";
str += " <karbon mime=\"application/x-karbon\" version=\"2\" editor=\"APPLIXGRAPHICS import filter\">\n";
// str += " <head>\n";
// str += " <tqlayout width=\"210\" lmargin=\"0\" format=\"a4\" bmargin=\"0\" height=\"297\" rmargin=\"0\" tmargin=\"0\" orientation=\"portrait\"/>\n";
// str += " <layout width=\"210\" lmargin=\"0\" format=\"a4\" bmargin=\"0\" height=\"297\" rmargin=\"0\" tmargin=\"0\" orientation=\"portrait\"/>\n";
// str += " <grid dx=\"20\" dy=\"20\" align=\"0\">\n";
// str += " <helplines align=\"0\"/>\n";
// str += " </grid>\n";

@ -198,8 +198,8 @@ KontourImport::convert()
if( docElem.attribute( "version" ).toInt() == 2 )
{
lay = docElem;
height = lay.firstChild().namedItem( "tqlayout" ).toElement().attribute( "height" ).toDouble();
width = lay.firstChild().namedItem( "tqlayout" ).toElement().attribute( "width" ).toDouble();
height = lay.firstChild().namedItem( "layout" ).toElement().attribute( "height" ).toDouble();
width = lay.firstChild().namedItem( "layout" ).toElement().attribute( "width" ).toDouble();
}
else
{

@ -167,7 +167,7 @@ bool XFIGImport::filterImport( const TQString &file, KoDocument *doc,
char buf[255];
int value;
KoPageLayout tqlayout;
KoPageLayout layout;
ifstream fin( file.local8Bit() );
if (! fin)
@ -177,7 +177,7 @@ bool XFIGImport::filterImport( const TQString &file, KoDocument *doc,
GDocument *gdoc = kidoc->gdoc();
//GPage *activePage = gdoc->activePage();
tqlayout = gdoc->activePage()->pageLayout ();
layout = gdoc->activePage()->pageLayout ();
fin.getline (buf, 255);
if (::strncmp (buf, "#FIG 3", 6)) {
@ -203,9 +203,9 @@ bool XFIGImport::filterImport( const TQString &file, KoDocument *doc,
// orientation
fin.getline (buf, 255);
if (::strcmp (buf, "Landscape") == 0)
tqlayout.orientation = PG_LANDSCAPE;
layout.orientation = PG_LANDSCAPE;
else if (::strcmp (buf, "Portrait") == 0)
tqlayout.orientation = PG_PORTRAIT;
layout.orientation = PG_PORTRAIT;
else
kdDebug() << "ERROR: invalid orientation" << endl;
@ -215,9 +215,9 @@ bool XFIGImport::filterImport( const TQString &file, KoDocument *doc,
// units
fin.getline (buf, 255);
if (::strcmp (buf, "Metric") == 0)
tqlayout.unit = PG_MM;
layout.unit = PG_MM;
else if (::strcmp (buf, "Inches") == 0)
tqlayout.unit = PG_INCH;
layout.unit = PG_INCH;
else
kdDebug() << "ERROR: invalid units" << endl;

@ -190,13 +190,13 @@ void PNGExportDia::setupGUI()
width->setText( i18n( "Width" ) );
heightEdit = new KIntNumInput( page, "heightEdit" );
TQGridLayout* tqlayout1 = new TQGridLayout;
tqlayout1->addWidget( height, 1, 0 );
tqlayout1->addWidget( widthEdit, 0, 1 );
tqlayout1->addWidget( width, 0, 0 );
tqlayout1->addWidget( heightEdit, 1, 1 );
TQGridLayout* layout1 = new TQGridLayout;
layout1->addWidget( height, 1, 0 );
layout1->addWidget( widthEdit, 0, 1 );
layout1->addWidget( width, 0, 0 );
layout1->addWidget( heightEdit, 1, 1 );
mainLayout->addLayout( tqlayout1 );
mainLayout->addLayout( layout1 );
TQLabel* percentHeight = new TQLabel( page, "PercentHeight" );
percentHeight->setText( i18n( "Height (%)" ) );
@ -205,15 +205,15 @@ void PNGExportDia::setupGUI()
percWidthEdit = new KDoubleNumInput( page, "percWidthEdit" );
percHeightEdit = new KDoubleNumInput( page, "percHeightEdit" );
TQGridLayout* tqlayout2 = new TQGridLayout;
tqlayout2->addWidget( percWidthEdit, 0, 1 );
tqlayout2->addWidget( percHeightEdit, 1, 1 );
tqlayout2->addWidget( percentHeight, 1, 0 );
tqlayout2->addWidget( percentWidth, 0, 0 );
TQGridLayout* layout2 = new TQGridLayout;
layout2->addWidget( percWidthEdit, 0, 1 );
layout2->addWidget( percHeightEdit, 1, 1 );
layout2->addWidget( percentHeight, 1, 0 );
layout2->addWidget( percentWidth, 0, 0 );
mainLayout->addLayout( tqlayout2 );
mainLayout->addLayout( layout2 );
/* Display the main tqlayout */
/* Display the main layout */
mainLayout->addStretch( 5 );
mainLayout->activate();
}

@ -283,7 +283,7 @@ class MgpImporter:
if (self.fontItalic!=0):
elem.setAttribute("italic", "1")
text=self.document.createTextNode(tqunicode(line, self.charset, 'ignore'))
text=self.document.createTextNode(unicode(line, self.charset, 'ignore'))
elem.appendChild(text)
pElem.appendChild(elem)
self.textElem.appendChild(pElem)

@ -758,7 +758,7 @@ void OoImpressExport::appendNote( TQDomDocument & doc, TQDomElement & source, TQ
TQDomElement noteTextBox = doc.createElement( "draw:text-box" );
//TODO : add draw:text-box size :
//<draw:text-box draw:style-name="gr2" draw:text-style-name="P2" draw:layer="tqlayout" svg:width="13.336cm" svg:height="56.288cm" svg:x="-0.54cm" svg:y="-14.846cm">
//<draw:text-box draw:style-name="gr2" draw:text-style-name="P2" draw:layer="layout" svg:width="13.336cm" svg:height="56.288cm" svg:x="-0.54cm" svg:y="-14.846cm">
TQStringList text = TQStringList::split( "\n", noteText );
for ( TQStringList::Iterator it = text.begin(); it != text.end(); ++it ) {

@ -178,10 +178,10 @@ TQByteArray PowerPointImport::createStyles()
// office:automatic-styles
stylesWriter->startElement( "office:automatic-styles" );
stylesWriter->startElement( "style:page-tqlayout" );
stylesWriter->startElement( "style:page-layout" );
stylesWriter->addAttribute( "style:name","pm1" );
stylesWriter->addAttribute( "style:page-usage","all" );
stylesWriter->startElement( "style:page-tqlayout-properties" );
stylesWriter->startElement( "style:page-layout-properties" );
stylesWriter->addAttribute( "fo:margin-bottom","0pt" );
stylesWriter->addAttribute( "fo:margin-left","0pt" );
stylesWriter->addAttribute( "fo:margin-right","0pt" );
@ -189,8 +189,8 @@ TQByteArray PowerPointImport::createStyles()
stylesWriter->addAttribute( "fo:page-height", pageHeight );
stylesWriter->addAttribute( "fo:page-width", pageWidth );
stylesWriter->addAttribute( "style:print-orientation","landscape" );
stylesWriter->endElement(); // style:page-tqlayout-properties
stylesWriter->endElement(); // style:page-tqlayout
stylesWriter->endElement(); // style:page-layout-properties
stylesWriter->endElement(); // style:page-layout
stylesWriter->startElement( "style:style" );
stylesWriter->addAttribute( "style:name","dp1" );
@ -237,7 +237,7 @@ TQByteArray PowerPointImport::createStyles()
stylesWriter->startElement( "office:master-styles" );
stylesWriter->startElement( "style:master-page" );
stylesWriter->addAttribute( "style:name", "Standard" );
stylesWriter->addAttribute( "style:page-tqlayout-name", "pm1" );
stylesWriter->addAttribute( "style:page-layout-name", "pm1" );
stylesWriter->addAttribute( "draw:style-name", "dp1" );
stylesWriter->endElement();
stylesWriter->endElement();
@ -363,7 +363,7 @@ void PowerPointImport::processEllipse (DrawObject* drawObject, KoXmlWriter* xmlW
xmlWriter->addAttribute( "svg:height", heightStr );
xmlWriter->addAttribute( "svg:x", xStr );
xmlWriter->addAttribute( "svg:y", yStr );
xmlWriter->addAttribute( "draw:layer", "tqlayout" );
xmlWriter->addAttribute( "draw:layer", "layout" );
xmlWriter->endElement(); // draw:ellipse
}
@ -401,7 +401,7 @@ void PowerPointImport::processRectangle (DrawObject* drawObject, KoXmlWriter* xm
xmlWriter->addAttribute( "svg:x", xStr );
xmlWriter->addAttribute( "svg:y", yStr );
}
xmlWriter->addAttribute( "draw:layer", "tqlayout" );
xmlWriter->addAttribute( "draw:layer", "layout" );
xmlWriter->endElement(); // draw:rect
}
@ -463,7 +463,7 @@ void PowerPointImport::processRoundRectangle (DrawObject* drawObject, KoXmlWrite
// xmlWriter->addAttribute( "svg:x", xStr );
// xmlWriter->addAttribute( "svg:y", yStr );
xmlWriter->addAttribute( "draw:layer", "tqlayout" );
xmlWriter->addAttribute( "draw:layer", "layout" );
xmlWriter->startElement( "draw:enhanced-geometry" );
xmlWriter->addAttribute( "draw:type", "round-rectangle");
xmlWriter->startElement( "draw:equation" );
@ -525,7 +525,7 @@ void PowerPointImport::processDiamond (DrawObject* drawObject, KoXmlWriter* xmlW
xmlWriter->startElement( "draw:enhanced-geometry" );
xmlWriter->addAttribute( "draw:type", "diamond");
xmlWriter->endElement();
xmlWriter->addAttribute( "draw:layer", "tqlayout" );
xmlWriter->addAttribute( "draw:layer", "layout" );
xmlWriter->endElement();
}
@ -546,7 +546,7 @@ void PowerPointImport::processTriangle (DrawObject* drawObject, KoXmlWriter* xml
xmlWriter->addAttribute( "svg:height", heightStr );
xmlWriter->addAttribute( "svg:x", xStr );
xmlWriter->addAttribute( "svg:y", yStr );
xmlWriter->addAttribute( "draw:layer", "tqlayout" );
xmlWriter->addAttribute( "draw:layer", "layout" );
xmlWriter->startElement( "draw:glue-point" );
xmlWriter->addAttribute( "svg:x", 5 );
xmlWriter->addAttribute( "svg:y", 0 );
@ -657,7 +657,7 @@ void PowerPointImport::processTrapezoid (DrawObject* drawObject, KoXmlWriter* xm
xmlWriter->addAttribute( "svg:height", heightStr );
xmlWriter->addAttribute( "svg:x", xStr );
xmlWriter->addAttribute( "svg:y", yStr );
xmlWriter->addAttribute( "draw:layer", "tqlayout" );
xmlWriter->addAttribute( "draw:layer", "layout" );
xmlWriter->startElement( "draw:glue-point" );
xmlWriter->addAttribute( "svg:x", 5 );
@ -738,7 +738,7 @@ void PowerPointImport::processParallelogram (DrawObject* drawObject, KoXmlWriter
xmlWriter->addAttribute( "svg:height", heightStr );
xmlWriter->addAttribute( "svg:x", xStr );
xmlWriter->addAttribute( "svg:y", yStr );
xmlWriter->addAttribute( "draw:layer", "tqlayout" );
xmlWriter->addAttribute( "draw:layer", "layout" );
xmlWriter->startElement( "draw:glue-point" );
xmlWriter->addAttribute( "svg:x", 6.25 );
xmlWriter->addAttribute( "svg:y", 0 );
@ -854,7 +854,7 @@ void PowerPointImport::processHexagon (DrawObject* drawObject, KoXmlWriter* xmlW
xmlWriter->addAttribute( "svg:height", heightStr );
xmlWriter->addAttribute( "svg:x", xStr );
xmlWriter->addAttribute( "svg:y", yStr );
xmlWriter->addAttribute( "draw:layer", "tqlayout" );
xmlWriter->addAttribute( "draw:layer", "layout" );
xmlWriter->startElement( "draw:glue-point" );
xmlWriter->addAttribute( "svg:x", 5 );
xmlWriter->addAttribute( "svg:y", 0 );
@ -918,7 +918,7 @@ void PowerPointImport::processOctagon (DrawObject* drawObject, KoXmlWriter* xmlW
xmlWriter->addAttribute( "svg:height", heightStr );
xmlWriter->addAttribute( "svg:x", xStr );
xmlWriter->addAttribute( "svg:y", yStr );
xmlWriter->addAttribute( "draw:layer", "tqlayout" );
xmlWriter->addAttribute( "draw:layer", "layout" );
xmlWriter->startElement( "draw:glue-point" );
xmlWriter->addAttribute( "svg:x", 5 );
xmlWriter->addAttribute( "svg:y", 0 );
@ -998,7 +998,7 @@ void PowerPointImport::processArrow (DrawObject* drawObject, KoXmlWriter* xmlWri
xmlWriter->addAttribute( "svg:height", heightStr );
xmlWriter->addAttribute( "svg:x", xStr );
xmlWriter->addAttribute( "svg:y", yStr );
xmlWriter->addAttribute( "draw:layer", "tqlayout" );
xmlWriter->addAttribute( "draw:layer", "layout" );
xmlWriter->startElement( "draw:enhanced-geometry" );
if (drawObject->shape() == DrawObject::RightArrow)
@ -1090,7 +1090,7 @@ void PowerPointImport::processLine (DrawObject* drawObject, KoXmlWriter* xmlWrit
xmlWriter->addAttribute( "svg:y2", y2Str );
xmlWriter->addAttribute( "svg:x1", x1Str );
xmlWriter->addAttribute( "svg:x2", x2Str );
xmlWriter->addAttribute( "draw:layer", "tqlayout" );
xmlWriter->addAttribute( "draw:layer", "layout" );
xmlWriter->endElement();
}
@ -1111,7 +1111,7 @@ void PowerPointImport::processSmiley (DrawObject* drawObject, KoXmlWriter* xmlWr
xmlWriter->addAttribute( "svg:height", heightStr );
xmlWriter->addAttribute( "svg:x", xStr );
xmlWriter->addAttribute( "svg:y", yStr );
xmlWriter->addAttribute( "draw:layer", "tqlayout" );
xmlWriter->addAttribute( "draw:layer", "layout" );
xmlWriter->startElement( "draw:glue-point" );
xmlWriter->addAttribute( "svg:x", 5 );
xmlWriter->addAttribute( "svg:y", 0 );
@ -1176,7 +1176,7 @@ void PowerPointImport::processHeart (DrawObject* drawObject, KoXmlWriter* xmlWri
xmlWriter->addAttribute( "svg:height", heightStr );
xmlWriter->addAttribute( "svg:x", xStr );
xmlWriter->addAttribute( "svg:y", yStr );
xmlWriter->addAttribute( "draw:layer", "tqlayout" );
xmlWriter->addAttribute( "draw:layer", "layout" );
xmlWriter->startElement( "draw:glue-point" );
xmlWriter->addAttribute( "svg:x", 5 );
xmlWriter->addAttribute( "svg:y", 1 );
@ -1216,7 +1216,7 @@ void PowerPointImport::processFreeLine (DrawObject* drawObject, KoXmlWriter* xml
xmlWriter->addAttribute( "svg:height", heightStr );
xmlWriter->addAttribute( "svg:x", xStr );
xmlWriter->addAttribute( "svg:y", yStr );
xmlWriter->addAttribute( "draw:layer", "tqlayout" );
xmlWriter->addAttribute( "draw:layer", "layout" );
xmlWriter->endElement(); // path
}
@ -1324,7 +1324,7 @@ void PowerPointImport::processTextObjectForBody( TextObject* textObject, KoXmlWr
xmlWriter->startElement( "draw:frame" );
xmlWriter->addAttribute( "presentation:style-name", "pr1" );
xmlWriter->addAttribute( "draw:layer", "tqlayout" );
xmlWriter->addAttribute( "draw:layer", "layout" );
xmlWriter->addAttribute( "svg:width", widthStr );
xmlWriter->addAttribute( "svg:height", heightStr );
xmlWriter->addAttribute( "svg:x", xStr );
@ -1389,7 +1389,7 @@ void PowerPointImport::processSlideForBody( unsigned slideNo, Slide* slide, KoXm
xmlWriter->addAttribute( "draw:master-page-name", "Default" );
xmlWriter->addAttribute( "draw:name", nameStr );
xmlWriter->addAttribute( "draw:style-name", styleNameStr );
xmlWriter->addAttribute( "presentation:presentation-page-tqlayout-name", "AL1T0");
xmlWriter->addAttribute( "presentation:presentation-page-layout-name", "AL1T0");
GroupObject* root = slide->rootObject();
if( root )

@ -94,7 +94,7 @@ class DirEntry
{
public:
bool valid; // false if invalid (should be skipped)
std::string name; // the name, not in tqunicode anymore
std::string name; // the name, not in unicode anymore
bool dir; // true if directory
unsigned long size; // size (not valid if directory)
unsigned long start; // starting block

@ -216,13 +216,13 @@ UString UString::null;
static char *statBuffer = 0L;
UChar::UChar(const UCharReference &c)
: uc( c.tqunicode() )
: uc( c.unicode() )
{
}
UChar UChar::toLower() const
{
// ### properly support tqunicode tolower
// ### properly support unicode tolower
if (uc >= 256 || islower(uc))
return *this;
@ -644,7 +644,7 @@ bool Libppt::operator<(const UString& s1, const UString& s2)
l++;
}
if (l < lmin)
return (c1->tqunicode() < c2->tqunicode());
return (c1->unicode() < c2->unicode());
return (l1 < l2);
}

@ -71,7 +71,7 @@ namespace Libppt {
/**
* @return the 16 bit Unicode value of the character
*/
unsigned short tqunicode() const { return uc; }
unsigned short unicode() const { return uc; }
public:
/**
* @return The character converted to lower case.
@ -128,7 +128,7 @@ namespace Libppt {
/**
* @return Unicode value.
*/
unsigned short tqunicode() const { return ref().tqunicode(); }
unsigned short unicode() const { return ref().unicode(); }
/**
* @return Lower byte.
*/

@ -66,7 +66,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<hbox>
<property name="name">

@ -47,7 +47,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<hbox>
<property name="name">

@ -185,7 +185,7 @@ static Value errorAsValue( int errorCode )
class EString::Private
{
public:
bool tqunicode;
bool unicode;
bool richText;
UString str;
unsigned size;
@ -194,7 +194,7 @@ public:
EString::EString()
{
d = new EString::Private();
d->tqunicode = false;
d->unicode = false;
d->richText = false;
d->str = UString::null;
d->size = 0;
@ -208,7 +208,7 @@ EString::EString( const EString& es )
EString& EString::operator=( const EString& es )
{
d->tqunicode = es.d->tqunicode;
d->unicode = es.d->unicode;
d->richText = es.d->richText;
d->size = es.d->size;
d->str = es.d->str;
@ -220,14 +220,14 @@ EString::~EString()
delete d;
}
bool EString::tqunicode() const
bool EString::unicode() const
{
return d->tqunicode;
return d->unicode;
}
void EString::setUnicode( bool u )
{
d->tqunicode = u;
d->unicode = u;
}
bool EString::richText() const
@ -271,7 +271,7 @@ EString EString::fromUnicodeString( const void* p, bool longString, unsigned /*
unsigned char flag = data[ offset ];
offset++; // for flag (1 byte)
bool tqunicode = flag & 0x01;
bool unicode = flag & 0x01;
bool richText = flag & 0x08;
unsigned formatRuns = 0;
@ -283,10 +283,10 @@ EString EString::fromUnicodeString( const void* p, bool longString, unsigned /*
// find out total bytes used in this string
unsigned size = offset + len; // string data
if( tqunicode ) size += len; // because tqunicode takes 2-bytes char
if( unicode ) size += len; // because unicode takes 2-bytes char
if( richText ) size += (formatRuns*4);
if( !tqunicode )
if( !unicode )
{
char* buffer = new char[ len+1 ];
memcpy( buffer, data + offset, len );
@ -303,7 +303,7 @@ EString EString::fromUnicodeString( const void* p, bool longString, unsigned /*
}
EString result;
result.setUnicode( tqunicode );
result.setUnicode( unicode );
result.setRichText( richText );
result.setSize( size );
result.setStr( str );
@ -351,14 +351,14 @@ EString EString::fromSheetName( const void* p, unsigned datasize )
unsigned len = data[0];
unsigned flag = data[1];
bool tqunicode = flag & 1;
bool unicode = flag & 1;
if( len > datasize-2 ) len = datasize-2;
if( len == 0 ) return EString();
unsigned offset = 2;
if( !tqunicode )
if( !unicode )
{
char* buffer = new char[ len+1 ];
memcpy( buffer, data + offset, len );
@ -376,7 +376,7 @@ EString EString::fromSheetName( const void* p, unsigned datasize )
}
EString result;
result.setUnicode( tqunicode );
result.setUnicode( unicode );
result.setRichText( richText );
result.setSize( datasize );
result.setStr( str );
@ -2012,7 +2012,7 @@ void BoundSheetRecord::setData( unsigned size, const unsigned char* data )
d->visibility = data[4];
d->type = data[5];
/* FIXME: it turned out that sheet name is not normal tqunicode string
/* FIXME: it turned out that sheet name is not normal unicode string
where the first two bytes specifies string length, but instead
only the first specifies it.
the next byte could be correctly interpreted as flag.

@ -36,7 +36,7 @@ enum { UnknownExcel = 0, Excel95, Excel97, Excel2000 };
class Record;
// rich-text, tqunicode, far-east support Excel string
// rich-text, unicode, far-east support Excel string
class EString
{
@ -50,7 +50,7 @@ public:
~EString();
bool tqunicode() const;
bool unicode() const;
void setUnicode( bool u );

@ -95,7 +95,7 @@ class DirEntry
{
public:
bool valid; // false if invalid (should be skipped)
std::string name; // the name, not in tqunicode anymore
std::string name; // the name, not in unicode anymore
bool dir; // true if directory
unsigned long size; // size (not valid if directory)
unsigned long start; // starting block

@ -39,7 +39,7 @@ UString UString::null;
static char *statBuffer = 0L;
UChar::UChar(const UCharReference &c)
: uc( c.tqunicode() )
: uc( c.unicode() )
{
}
@ -579,7 +579,7 @@ bool Swinder::operator<(const UString& s1, const UString& s2)
l++;
}
if (l < lmin)
return (c1->tqunicode() < c2->tqunicode());
return (c1->unicode() < c2->unicode());
return (l1 < l2);
}

@ -68,7 +68,7 @@ namespace Swinder {
/**
* @return the 16 bit Unicode value of the character
*/
unsigned short tqunicode() const { return uc; }
unsigned short unicode() const { return uc; }
public:
/**
* A static instance of UChar(0).
@ -120,7 +120,7 @@ namespace Swinder {
/**
* @return Unicode value.
*/
unsigned short tqunicode() const { return ref().uc; }
unsigned short unicode() const { return ref().uc; }
/**
* @return Lower byte.
*/

@ -540,7 +540,7 @@ TQDomElement GNUMERICExport::GetLinkStyle(TQDomDocument gnumeric_doc)
TQDomElement GNUMERICExport::GetCellStyle(TQDomDocument gnumeric_doc,Cell * cell, int currentcolumn, int currentrow)
{
TQColorGroup defaultColorGroup = TQApplication::tqpalette().active();
TQColorGroup defaultColorGroup = TQApplication::palette().active();
TQDomElement cell_style;

@ -211,7 +211,7 @@ Bold
<br>Cell Size:Qt::Horizontal &amp;Qt::Vertical
<br>Hidden columns/rows&nbsp;
<br>Selected Tab
<br>Paper tqlayout
<br>Paper layout
<br>area name
<br>Cell comment
<br>Text Rotation

@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout1</cstring>
<cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
@ -86,7 +86,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout7</cstring>
<cstring>layout7</cstring>
</property>
<hbox>
<property name="name">
@ -222,7 +222,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<hbox>
<property name="name">

@ -35,7 +35,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout5</cstring>
<cstring>layout5</cstring>
</property>
<vbox>
<property name="name">
@ -110,7 +110,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout8</cstring>
<cstring>layout8</cstring>
</property>
<vbox>
<property name="name">
@ -180,7 +180,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<hbox>
<property name="name">

@ -84,8 +84,8 @@ class Config
bool convertPictures() const { return _convertPictures; }
TQString getPicturesDir() const { return _picturesDir; }
bool mustUseUnicode() const { return (_encoding == "tqunicode"); }
bool mustUseLatin1() const { return (_encoding != "tqunicode"); }
bool mustUseUnicode() const { return (_encoding == "unicode"); }
bool mustUseLatin1() const { return (_encoding != "unicode"); }
TQString getEncoding() const { return _encoding; }
TQStringList getLanguagesList() const { return _languagesList; }
TQString getDefaultLanguage() const { return _defaultLanguage; }

@ -99,7 +99,7 @@ KSpreadLatexExportDiaImpl::KSpreadLatexExportDiaImpl(KoStore* in, TQWidget* pare
classComboBox->insertItem("report");
classComboBox->insertItem("slides");
encodingComboBox->insertItem("tqunicode");
encodingComboBox->insertItem("unicode");
encodingComboBox->insertItem("ansinew");
encodingComboBox->insertItem("applemac");
encodingComboBox->insertItem("ascii");

@ -168,7 +168,7 @@ bool OpenCalcImport::readRowFormat( TQDomElement & rowNode, TQDomElement * rowSt
double height = -1.0;
bool insertPageBreak = false;
Format tqlayout( table, table->doc()->styleManager()->defaultStyle() );
Format layout( table, table->doc()->styleManager()->defaultStyle() );
while( !node.isNull() )
{
@ -190,7 +190,7 @@ bool OpenCalcImport::readRowFormat( TQDomElement & rowNode, TQDomElement * rowSt
}
}
loadStyleProperties( &tqlayout, property );
loadStyleProperties( &layout, property );
}
node = node.nextSibling();
@ -219,7 +219,7 @@ bool OpenCalcImport::readRowFormat( TQDomElement & rowNode, TQDomElement * rowSt
for ( int i = 0; i < number; ++i )
{
RowFormat * rowL = table->nonDefaultRowFormat( row );
rowL->copy( tqlayout );
rowL->copy( layout );
if ( height != -1 )
{
@ -480,10 +480,10 @@ bool OpenCalcImport::readCells( TQDomElement & rowNode, Sheet * table, int row,
psName = e.attributeNS( ooNS::style, "parent-style-name", TQString() );
kdDebug(30518) << "Default style: " << psName << endl;
Format * tqlayout = m_defaultStyles[psName];
Format * layout = m_defaultStyles[psName];
if ( tqlayout )
cell->format()->copy( *tqlayout );
if ( layout )
cell->format()->copy( *layout );
TQDomElement * st = 0;
if ( e.hasAttributeNS( ooNS::table, "style-name" ) )
@ -548,10 +548,10 @@ bool OpenCalcImport::readCells( TQDomElement & rowNode, Sheet * table, int row,
TQString psName( "Default" );
kdDebug(30518) << "Default style: " << psName << endl;
Format * tqlayout = m_defaultStyles[psName];
Format * layout = m_defaultStyles[psName];
if ( tqlayout )
cell->format()->copy( *tqlayout );
if ( layout )
cell->format()->copy( *layout );
}
if ( e.hasAttributeNS( ooNS::table, "formula" ) )
{
@ -959,16 +959,16 @@ bool OpenCalcImport::readRowsAndCells( TQDomElement & content, Sheet * table )
return false;
RowFormat * srcLayout = table->nonDefaultRowFormat( backupRow );
RowFormat * tqlayout = 0;
RowFormat * layout = 0;
if ( collapsed )
srcLayout->setHide( true );
for ( i = 1; i < number; ++i )
{
tqlayout = table->nonDefaultRowFormat( backupRow + i );
layout = table->nonDefaultRowFormat( backupRow + i );
tqlayout->copy( *srcLayout );
layout->copy( *srcLayout );
/*
* TODO: Test: do we need to copy the cells, too?
@ -1047,14 +1047,14 @@ bool OpenCalcImport::readColLayouts( TQDomElement & content, Sheet * table )
if ( st && !st->isNull() )
{
Format * tqlayout = new Format( 0, m_doc->styleManager()->defaultStyle() );
Format * layout = new Format( 0, m_doc->styleManager()->defaultStyle() );
readInStyle( tqlayout, *st );
readInStyle( layout, *st );
m_defaultStyles.insert( name, tqlayout );
m_defaultStyles.insert( name, layout );
kdDebug(30518) << "Insert default cell style: " << name << endl;
defaultStyle = tqlayout;
defaultStyle = layout;
}
}
@ -1281,7 +1281,7 @@ void OpenCalcImport::loadOasisMasterLayoutPage( Sheet * table,KoStyleStack &styl
TQString orientation = "Portrait";
TQString format;
// Laurent : Why we stored tqlayout information as Millimeter ?!!!!!
// Laurent : Why we stored layout information as Millimeter ?!!!!!
// kspread used point for all other attribute
// I don't understand :(
if ( styleStack.hasAttributeNS( ooNS::fo, "page-width" ) )
@ -1962,32 +1962,32 @@ TQString * OpenCalcImport::loadFormat( TQDomElement * element,
return format;
}
void OpenCalcImport::loadFontStyle( Format * tqlayout, TQDomElement const * font ) const
void OpenCalcImport::loadFontStyle( Format * layout, TQDomElement const * font ) const
{
if ( !font || !tqlayout )
if ( !font || !layout )
return;
kdDebug(30518) << "Copy font style from the tqlayout " << font->tagName() << ", " << font->nodeName() << endl;
kdDebug(30518) << "Copy font style from the layout " << font->tagName() << ", " << font->nodeName() << endl;
if ( font->hasAttributeNS( ooNS::fo, "font-family" ) )
tqlayout->setTextFontFamily( font->attributeNS( ooNS::fo, "font-family", TQString() ) );
layout->setTextFontFamily( font->attributeNS( ooNS::fo, "font-family", TQString() ) );
if ( font->hasAttributeNS( ooNS::fo, "color" ) )
tqlayout->setTextColor( TQColor( font->attributeNS( ooNS::fo, "color", TQString() ) ) );
layout->setTextColor( TQColor( font->attributeNS( ooNS::fo, "color", TQString() ) ) );
if ( font->hasAttributeNS( ooNS::fo, "font-size" ) )
tqlayout->setTextFontSize( int( KoUnit::parseValue( font->attributeNS( ooNS::fo, "font-size", TQString() ), 10 ) ) );
layout->setTextFontSize( int( KoUnit::parseValue( font->attributeNS( ooNS::fo, "font-size", TQString() ), 10 ) ) );
else
tqlayout->setTextFontSize( 10 );
layout->setTextFontSize( 10 );
if ( font->hasAttributeNS( ooNS::fo, "font-style" ) )
{
kdDebug(30518) << "italic" << endl;
tqlayout->setTextFontItalic( true ); // only thing we support
layout->setTextFontItalic( true ); // only thing we support
}
if ( font->hasAttributeNS( ooNS::fo, "font-weight" ) )
tqlayout->setTextFontBold( true ); // only thing we support
layout->setTextFontBold( true ); // only thing we support
if ( font->hasAttributeNS( ooNS::fo, "text-underline" ) || font->hasAttributeNS( ooNS::style, "text-underline" ) )
tqlayout->setTextFontUnderline( true ); // only thing we support
layout->setTextFontUnderline( true ); // only thing we support
if ( font->hasAttributeNS( ooNS::style, "text-crossing-out" ) )
tqlayout->setTextFontStrike( true ); // only thing we support
layout->setTextFontStrike( true ); // only thing we support
if ( font->hasAttributeNS( ooNS::style, "font-pitch" ) )
{
// TODO: possible values: fixed, variable
@ -1996,7 +1996,7 @@ void OpenCalcImport::loadFontStyle( Format * tqlayout, TQDomElement const * font
// text-underline-color
}
void OpenCalcImport::loadBorder( Format * tqlayout, TQString const & borderDef, bPos pos ) const
void OpenCalcImport::loadBorder( Format * layout, TQString const & borderDef, bPos pos ) const
{
if ( borderDef == "none" )
return;
@ -2038,24 +2038,24 @@ void OpenCalcImport::loadBorder( Format * tqlayout, TQString const & borderDef,
pen.setColor( TQColor( borderDef.right( p - p2 ) ) );
if ( pos == Left )
tqlayout->setLeftBorderPen( pen );
layout->setLeftBorderPen( pen );
else if ( pos == Top )
tqlayout->setTopBorderPen( pen );
layout->setTopBorderPen( pen );
else if ( pos == Right )
tqlayout->setRightBorderPen( pen );
layout->setRightBorderPen( pen );
else if ( pos == Bottom )
tqlayout->setBottomBorderPen( pen );
layout->setBottomBorderPen( pen );
else if ( pos == Border )
{
tqlayout->setLeftBorderPen( pen );
tqlayout->setTopBorderPen( pen );
tqlayout->setRightBorderPen( pen );
tqlayout->setBottomBorderPen( pen );
layout->setLeftBorderPen( pen );
layout->setTopBorderPen( pen );
layout->setRightBorderPen( pen );
layout->setBottomBorderPen( pen );
}
// TODO Diagonals not supported by oocalc
}
void OpenCalcImport::loadStyleProperties( Format * tqlayout, TQDomElement const & property ) const
void OpenCalcImport::loadStyleProperties( Format * layout, TQDomElement const & property ) const
{
kdDebug(30518) << "*** Loading style properties *****" << endl;
@ -2064,16 +2064,16 @@ void OpenCalcImport::loadStyleProperties( Format * tqlayout, TQDomElement const
bool ok = false;
int p = property.attributeNS( ooNS::style, "decimal-places", TQString() ).toInt( &ok );
if (ok )
tqlayout->setPrecision( p );
layout->setPrecision( p );
}
if ( property.hasAttributeNS( ooNS::style, "font-name" ) )
{
TQDomElement * font = m_styles[ property.attributeNS( ooNS::style, "font-name", TQString() ) ];
loadFontStyle( tqlayout, font ); // generell font style
loadFontStyle( layout, font ); // generell font style
}
loadFontStyle( tqlayout, &property ); // specific font style
loadFontStyle( layout, &property ); // specific font style
// TODO:
// diagonal: fall + goup
@ -2090,133 +2090,133 @@ void OpenCalcImport::loadStyleProperties( Format * tqlayout, TQDomElement const
bool ok = false;
int a = property.attributeNS( ooNS::style, "rotation-angle", TQString() ).toInt( &ok );
if ( ok )
tqlayout->setAngle( -a + 1 );
layout->setAngle( -a + 1 );
}
if ( property.hasAttributeNS( ooNS::fo, "direction" ) )
{
tqlayout->setVerticalText( true );
layout->setVerticalText( true );
}
if ( property.hasAttributeNS( ooNS::fo, "text-align" ) )
{
TQString s = property.attributeNS( ooNS::fo, "text-align", TQString() );
if ( s == "center" )
tqlayout->setAlign( Format::Center );
layout->setAlign( Format::Center );
else if ( s == "end" )
tqlayout->setAlign( Format::Right );
layout->setAlign( Format::Right );
else if ( s == "start" )
tqlayout->setAlign( Format::Left );
layout->setAlign( Format::Left );
else if ( s == "justify" ) // TODO in KSpread!
tqlayout->setAlign( Format::Center );
layout->setAlign( Format::Center );
}
if ( property.hasAttributeNS( ooNS::fo, "margin-left" ) )
{
kdDebug(30518)<<"margin-left :"<<KoUnit::parseValue( property.attributeNS( ooNS::fo, "margin-left", TQString() ),0.0 )<<endl;
tqlayout->setIndent( KoUnit::parseValue( property.attributeNS( ooNS::fo, "margin-left", TQString() ),0.0 ) );
layout->setIndent( KoUnit::parseValue( property.attributeNS( ooNS::fo, "margin-left", TQString() ),0.0 ) );
}
if ( property.hasAttributeNS( ooNS::fo, "background-color" ) )
tqlayout->setBgColor( TQColor( property.attributeNS( ooNS::fo, "background-color", TQString() ) ) );
layout->setBgColor( TQColor( property.attributeNS( ooNS::fo, "background-color", TQString() ) ) );
if ( property.hasAttributeNS( ooNS::style, "print-content" ) )
{
if ( property.attributeNS( ooNS::style, "print-content", TQString() ) == "false" )
tqlayout->setDontPrintText( false );
layout->setDontPrintText( false );
}
if ( property.hasAttributeNS( ooNS::style, "cell-protect" ) )
{
TQString prot( property.attributeNS( ooNS::style, "cell-protect", TQString() ) );
if ( prot == "none" )
{
tqlayout->setNotProtected( true );
tqlayout->setHideFormula( false );
tqlayout->setHideAll( false );
layout->setNotProtected( true );
layout->setHideFormula( false );
layout->setHideAll( false );
}
else if ( prot == "formula-hidden" )
{
tqlayout->setNotProtected( true );
tqlayout->setHideFormula( true );
tqlayout->setHideAll( false );
layout->setNotProtected( true );
layout->setHideFormula( true );
layout->setHideAll( false );
}
else if ( prot == "protected formula-hidden" )
{
tqlayout->setNotProtected( false );
tqlayout->setHideFormula( true );
tqlayout->setHideAll( false );
layout->setNotProtected( false );
layout->setHideFormula( true );
layout->setHideAll( false );
}
else if ( prot == "hidden-and-protected" )
{
tqlayout->setNotProtected( false );
tqlayout->setHideFormula( false );
tqlayout->setHideAll( true );
layout->setNotProtected( false );
layout->setHideFormula( false );
layout->setHideAll( true );
}
else if ( prot == "protected" )
{
tqlayout->setNotProtected( false );
tqlayout->setHideFormula( false );
tqlayout->setHideAll( false );
layout->setNotProtected( false );
layout->setHideFormula( false );
layout->setHideAll( false );
}
kdDebug(30518) << "Cell " << prot << endl;
}
if ( property.hasAttributeNS( ooNS::fo, "padding-left" ) )
tqlayout->setIndent( KoUnit::parseValue(property.attributeNS( ooNS::fo, "padding-left", TQString() ) ) );
layout->setIndent( KoUnit::parseValue(property.attributeNS( ooNS::fo, "padding-left", TQString() ) ) );
if ( property.hasAttributeNS( ooNS::fo, "vertical-align" ) )
{
TQString s = property.attributeNS( ooNS::fo, "vertical-align", TQString() );
if ( s == "middle" )
tqlayout->setAlignY( Format::Middle );
layout->setAlignY( Format::Middle );
else if ( s == "bottom" )
tqlayout->setAlignY( Format::Bottom );
layout->setAlignY( Format::Bottom );
else
tqlayout->setAlignY( Format::Top );
layout->setAlignY( Format::Top );
}
else
tqlayout->setAlignY( Format::Bottom );
layout->setAlignY( Format::Bottom );
if ( property.hasAttributeNS( ooNS::fo, "wrap-option" ) )
{
tqlayout->setMultiRow( true );
layout->setMultiRow( true );
/* we do not support anything else yet
TQString s = property.attributeNS( ooNS::fo, "wrap-option", TQString() );
if ( s == "wrap" )
tqlayout->setMultiRow( true );
layout->setMultiRow( true );
*/
}
if ( property.hasAttributeNS( ooNS::fo, "border-bottom" ) )
{
loadBorder( tqlayout, property.attributeNS( ooNS::fo, "border-bottom", TQString() ), Bottom );
loadBorder( layout, property.attributeNS( ooNS::fo, "border-bottom", TQString() ), Bottom );
// TODO: style:border-line-width-bottom if double!
}
if ( property.hasAttributeNS( ooNS::fo, "border-right" ) )
{
loadBorder( tqlayout, property.attributeNS( ooNS::fo, "border-right", TQString() ), Right );
loadBorder( layout, property.attributeNS( ooNS::fo, "border-right", TQString() ), Right );
// TODO: style:border-line-width-right
}
if ( property.hasAttributeNS( ooNS::fo, "border-top" ) )
{
loadBorder( tqlayout, property.attributeNS( ooNS::fo, "border-top", TQString() ), Top );
loadBorder( layout, property.attributeNS( ooNS::fo, "border-top", TQString() ), Top );
// TODO: style:border-line-width-top
}
if ( property.hasAttributeNS( ooNS::fo, "border-left" ) )
{
loadBorder( tqlayout, property.attributeNS( ooNS::fo, "border-left", TQString() ), Left );
loadBorder( layout, property.attributeNS( ooNS::fo, "border-left", TQString() ), Left );
// TODO: style:border-line-width-left
}
if ( property.hasAttributeNS( ooNS::fo, "border" ) )
{
loadBorder( tqlayout, property.attributeNS( ooNS::fo, "border", TQString() ), Border );
loadBorder( layout, property.attributeNS( ooNS::fo, "border", TQString() ), Border );
// TODO: style:border-line-width-left
}
}
void OpenCalcImport::readInStyle( Format * tqlayout, TQDomElement const & style )
void OpenCalcImport::readInStyle( Format * layout, TQDomElement const & style )
{
kdDebug(30518) << "** Reading Style: " << style.tagName() << "; " << style.attributeNS( ooNS::style, "name", TQString()) << endl;
if ( style.localName() == "style" && style.namespaceURI()==ooNS::style)
@ -2225,20 +2225,20 @@ void OpenCalcImport::readInStyle( Format * tqlayout, TQDomElement const & style
{
Format * cp
= m_defaultStyles.find( style.attributeNS( ooNS::style, "parent-style-name", TQString() ) );
kdDebug(30518) << "Copying tqlayout from " << style.attributeNS( ooNS::style, "parent-style-name", TQString() ) << endl;
kdDebug(30518) << "Copying layout from " << style.attributeNS( ooNS::style, "parent-style-name", TQString() ) << endl;
if ( cp != 0 )
tqlayout->copy( *cp );
layout->copy( *cp );
}
else if ( style.hasAttributeNS( ooNS::style, "family") )
{
TQString name = style.attribute( "style-family" ) + "default";
Format * cp = m_defaultStyles.find( name );
kdDebug(30518) << "Copying tqlayout from " << name << ", " << !cp << endl;
kdDebug(30518) << "Copying layout from " << name << ", " << !cp << endl;
if ( cp != 0 )
tqlayout->copy( *cp );
layout->copy( *cp );
}
if ( style.hasAttributeNS( ooNS::style, "data-style-name" ) )
@ -2255,8 +2255,8 @@ void OpenCalcImport::readInStyle( Format * tqlayout, TQDomElement const & style
if ( format )
{
tqlayout->setFormatString( *format );
tqlayout->setFormatType( formatType );
layout->setFormatString( *format );
layout->setFormatType( formatType );
}
// <number:currency-symbol number:language="de" number:country="DE">€</number:currency-symbol>
@ -2267,9 +2267,9 @@ void OpenCalcImport::readInStyle( Format * tqlayout, TQDomElement const & style
forEachElement( property, style )
{
if ( property.localName() == "properties" && property.namespaceURI() == ooNS::style )
loadStyleProperties( tqlayout, property );
loadStyleProperties( layout, property );
kdDebug(30518) << tqlayout->textFontFamily( 0, 0 ) << endl;
kdDebug(30518) << layout->textFontFamily( 0, 0 ) << endl;
}
}
@ -2358,13 +2358,13 @@ bool OpenCalcImport::createStyleMap( TQDomDocument const & styles )
if ( !e.isNull() )
{
Format * tqlayout = new Format( 0, m_doc->styleManager()->defaultStyle() );
Format * layout = new Format( 0, m_doc->styleManager()->defaultStyle() );
readInStyle( tqlayout, e );
readInStyle( layout, e );
kdDebug(30518) << "Default style " << e.attributeNS( ooNS::style, "family", TQString() ) << "default" << " loaded " << endl;
m_defaultStyles.insert( e.attributeNS( ooNS::style, "family", TQString() ) + "default", tqlayout );
// TQFont font = tqlayout->font();
m_defaultStyles.insert( e.attributeNS( ooNS::style, "family", TQString() ) + "default", layout );
// TQFont font = layout->font();
// kdDebug(30518) << "Font: " << font.family() << ", " << font.toString() << endl;
}
@ -2384,12 +2384,12 @@ bool OpenCalcImport::createStyleMap( TQDomDocument const & styles )
continue;
}
Format * tqlayout = new Format( 0, m_doc->styleManager()->defaultStyle() );
readInStyle( tqlayout, defs );
Format * layout = new Format( 0, m_doc->styleManager()->defaultStyle() );
readInStyle( layout, defs );
kdDebug(30518) << "Default style " << defs.attributeNS( ooNS::style, "name", TQString() ) << " loaded " << endl;
m_defaultStyles.insert( defs.attributeNS( ooNS::style, "name", TQString() ), tqlayout );
// kdDebug(30518) << "Font: " << tqlayout->font().family() << ", " << tqlayout->font().toString() << endl;
m_defaultStyles.insert( defs.attributeNS( ooNS::style, "name", TQString() ), layout );
// kdDebug(30518) << "Font: " << layout->font().family() << ", " << layout->font().toString() << endl;
defs = defs.nextSibling().toElement();
}

@ -90,10 +90,10 @@ class OpenCalcImport : public KoFilter
bool readRowsAndCells( TQDomElement & content, KSpread::Sheet * table );
bool readCells( TQDomElement & rowNode, KSpread::Sheet * table, int row, int & columns );
void convertFormula( TQString & text, TQString const & f ) const;
void loadFontStyle( KSpread::Format * tqlayout, TQDomElement const * font ) const;
void readInStyle( KSpread::Format * tqlayout, TQDomElement const & style );
void loadStyleProperties( KSpread::Format * tqlayout, TQDomElement const & property ) const;
void loadBorder( KSpread::Format * tqlayout, TQString const & borderDef, bPos pos ) const;
void loadFontStyle( KSpread::Format * layout, TQDomElement const * font ) const;
void readInStyle( KSpread::Format * layout, TQDomElement const & style );
void loadStyleProperties( KSpread::Format * layout, TQDomElement const & property ) const;
void loadBorder( KSpread::Format * layout, TQString const & borderDef, bPos pos ) const;
void loadTableMasterStyle( KSpread::Sheet * table, TQString const & stylename );
TQString * loadFormat( TQDomElement * element,
KSpread::FormatType & formatType,

@ -51,7 +51,7 @@ KOffice filters status:&nbsp;&nbsp; OpenOffice.org Calc</h1></center>
Borders, background colors<br>
column width, row width<br>
column layouts, row layouts<br>
page tqlayout (size, border)<br>
page layout (size, border)<br>
OpenCalc style import, default style<br>
format string translating (not supported by KSpread yet, but this filter produces these strings => needs enhancements in KSpread)<br>
header, footer (including macros)<br>
@ -169,7 +169,7 @@ KOffice filters status:&nbsp;&nbsp; OpenOffice.org Calc</h1></center>
<td>
Jan 12, 2003 - Initial Revision<br>
Jan 18, 2003 - page tqlayout, header, footer<br>
Jan 18, 2003 - page layout, header, footer<br>
Jan 19, 2003 - Added support for fonts, text color, background color, formula
conversion<br>
Jan 19, 2003 - text alignment, indents, comments, NoPrint, Merged Cells<br>

@ -208,7 +208,7 @@ void AddLayout(const TQString& strStyleName, TQDomElement& layoutElement,
followingElement.setAttribute("name","Normal");
layoutElement.appendChild(followingElement);
}
// Else: we are a tqlayout, so we leave the work to KWord (from the style)
// Else: we are a layout, so we leave the work to KWord (from the style)
}
else
{

@ -84,7 +84,7 @@ public:
virtual bool doCloseFile(void); // Close file in normal conditions
virtual bool doOpenDocument(void);
virtual bool doCloseDocument(void);
virtual bool doFullParagraph(const TQString& paraText, const LayoutData& tqlayout,
virtual bool doFullParagraph(const TQString& paraText, const LayoutData& layout,
const ValueListFormatData& paraFormatDataList);
virtual bool doOpenTextFrameSet(void); // AbiWord's <section>
virtual bool doCloseTextFrameSet(void); // AbiWord's </section>
@ -95,7 +95,7 @@ public:
virtual bool doCloseHead(void); // Write <papersize>
virtual bool doOpenStyles(void); // AbiWord's <styles>
virtual bool doCloseStyles(void); // AbiWord's </styles>
virtual bool doFullDefineStyle(LayoutData& tqlayout); // AbiWord's <s></s>
virtual bool doFullDefineStyle(LayoutData& layout); // AbiWord's <s></s>
virtual bool doOpenSpellCheckIgnoreList (void); // AbiWord's <ignorewords>
virtual bool doCloseSpellCheckIgnoreList (void); // AbiWord's </ignorewords>
virtual bool doFullSpellCheckIgnoreWord (const TQString& ignoreword); // AbiWord's <iw>
@ -116,7 +116,7 @@ private:
TQString textFormatToAbiProps(const TextFormatting& formatOrigin,
const TextFormatting& formatData, const bool force) const;
TQString layoutToCss(const LayoutData& layoutOrigin,
const LayoutData& tqlayout, const bool force) const;
const LayoutData& layout, const bool force) const;
TQString escapeAbiWordText(const TQString& strText) const;
bool makeTable(const FrameAnchor& anchor);
bool makePicture(const FrameAnchor& anchor);
@ -649,7 +649,7 @@ void AbiWordWorker::processVariable ( const TQString&,
TQString fstr;
TQValueList<ParaData>::ConstIterator it;
for (it=paraList->begin();it!=paraList->end();it++)
fstr += ProcessParagraphData( (*it).text, (*it).tqlayout,(*it).formattingList);
fstr += ProcessParagraphData( (*it).text, (*it).layout,(*it).formattingList);
str += "{\\super ";
str += automatic ? "\\chftn " : value;
str += "{\\footnote ";
@ -719,50 +719,50 @@ void AbiWordWorker::processParagraphData ( const TQString &paraText,
}
TQString AbiWordWorker::layoutToCss(const LayoutData& layoutOrigin,
const LayoutData& tqlayout, const bool force) const
const LayoutData& layout, const bool force) const
{
TQString props;
if (force || (layoutOrigin.alignment!=tqlayout.alignment))
if (force || (layoutOrigin.alignment!=layout.alignment))
{
// Check if the current alignment is a valid one for AbiWord.
if ((tqlayout.alignment == "left") || (tqlayout.alignment == "right")
|| (tqlayout.alignment == "center") || (tqlayout.alignment == "justify"))
if ((layout.alignment == "left") || (layout.alignment == "right")
|| (layout.alignment == "center") || (layout.alignment == "justify"))
{
props += "text-align:";
props += tqlayout.alignment;
props += layout.alignment;
props += "; ";
}
else if (tqlayout.alignment == "auto")
else if (layout.alignment == "auto")
{
// We assume a left alignment as AbiWord is not really bi-di (and this filter even less.)
props += "text-align:left; ";
}
else
{
kdWarning(30506) << "Unknown alignment: " << tqlayout.alignment << endl;
kdWarning(30506) << "Unknown alignment: " << layout.alignment << endl;
}
}
// TODO/FIXME: what if all tabulators must be erased?
#if 0
// DEPRECATED!
if (!tqlayout.tabulator.isEmpty()
&& (force || (layoutOrigin.tabulator!=tqlayout.tabulator)))
if (!layout.tabulator.isEmpty()
&& (force || (layoutOrigin.tabulator!=layout.tabulator)))
{
props += "tabstops:";
props += tqlayout.tabulator;
props += layout.tabulator;
props += "; ";
}
#endif
if (!tqlayout.tabulatorList.isEmpty()
&& (force || (layoutOrigin.tabulatorList!=tqlayout.tabulatorList) ))
if (!layout.tabulatorList.isEmpty()
&& (force || (layoutOrigin.tabulatorList!=layout.tabulatorList) ))
{
props += "tabstops:";
bool first=true;
TabulatorList::ConstIterator it;
TabulatorList::ConstIterator end(tqlayout.tabulatorList.end());
for (it=tqlayout.tabulatorList.begin();it!=end;++it)
TabulatorList::ConstIterator end(layout.tabulatorList.end());
for (it=layout.tabulatorList.begin();it!=end;++it)
{
if (first)
{
@ -789,48 +789,48 @@ TQString AbiWordWorker::layoutToCss(const LayoutData& layoutOrigin,
props += "; ";
}
if ((tqlayout.indentLeft>=0.0)
&& (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft)))
if ((layout.indentLeft>=0.0)
&& (force || (layoutOrigin.indentLeft!=layout.indentLeft)))
{
props += TQString("margin-left:%1pt; ").arg(tqlayout.indentLeft);
props += TQString("margin-left:%1pt; ").arg(layout.indentLeft);
}
if ((tqlayout.indentRight>=0.0)
&& (force || (layoutOrigin.indentRight!=tqlayout.indentRight)))
if ((layout.indentRight>=0.0)
&& (force || (layoutOrigin.indentRight!=layout.indentRight)))
{
props += TQString("margin-right:%1pt; ").arg(tqlayout.indentRight);
props += TQString("margin-right:%1pt; ").arg(layout.indentRight);
}
if (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft))
if (force || (layoutOrigin.indentLeft!=layout.indentLeft))
{
props += "text-indent: ";
props += TQString::number(tqlayout.indentFirst);
props += TQString::number(layout.indentFirst);
props += "pt; ";
}
if ((tqlayout.marginBottom>=0.0)
&& ( force || ( layoutOrigin.marginBottom != tqlayout.marginBottom ) ) )
if ((layout.marginBottom>=0.0)
&& ( force || ( layoutOrigin.marginBottom != layout.marginBottom ) ) )
{
props += TQString("margin-bottom:%1pt; ").arg(tqlayout.marginBottom);
props += TQString("margin-bottom:%1pt; ").arg(layout.marginBottom);
}
if ((tqlayout.marginTop>=0.0)
&& ( force || ( layoutOrigin.marginTop != tqlayout.marginTop ) ) )
if ((layout.marginTop>=0.0)
&& ( force || ( layoutOrigin.marginTop != layout.marginTop ) ) )
{
props += TQString("margin-top:%1pt; ").arg(tqlayout.marginTop);
props += TQString("margin-top:%1pt; ").arg(layout.marginTop);
}
if (force
|| ( layoutOrigin.lineSpacingType != tqlayout.lineSpacingType )
|| ( layoutOrigin.lineSpacing != tqlayout.lineSpacing ) )
|| ( layoutOrigin.lineSpacingType != layout.lineSpacingType )
|| ( layoutOrigin.lineSpacing != layout.lineSpacing ) )
{
switch ( tqlayout.lineSpacingType )
switch ( layout.lineSpacingType )
{
case LayoutData::LS_CUSTOM:
{
// We have a custom line spacing (in points). However AbiWord cannot do it, so transform in "at-least"
props += "line-height=:";
props += TQString::number( tqlayout.lineSpacing ); // ### TODO: rounding?
props += TQString::number( layout.lineSpacing ); // ### TODO: rounding?
props += "pt+; ";
break;
}
@ -852,7 +852,7 @@ TQString AbiWordWorker::layoutToCss(const LayoutData& layoutOrigin,
case LayoutData::LS_MULTIPLE:
{
props += "line-height:";
props += TQString::number( tqlayout.lineSpacing ); // ### TODO: rounding?
props += TQString::number( layout.lineSpacing ); // ### TODO: rounding?
props += "; ";
break;
}
@ -860,7 +860,7 @@ TQString AbiWordWorker::layoutToCss(const LayoutData& layoutOrigin,
{
// We have a fixed line height (in points)
props += "line-height:";
props += TQString::number( tqlayout.lineSpacing ); // ### TODO: rounding?
props += TQString::number( layout.lineSpacing ); // ### TODO: rounding?
props += "pt; ";
break;
}
@ -868,32 +868,32 @@ TQString AbiWordWorker::layoutToCss(const LayoutData& layoutOrigin,
{
// We have an "at-least" line height (in points)
props += "line-height=:";
props += TQString::number( tqlayout.lineSpacing ); // ### TODO: rounding?
props += TQString::number( layout.lineSpacing ); // ### TODO: rounding?
props += "pt+; "; // The + makes the difference
break;
}
default:
{
kdWarning(30506) << "Unsupported lineSpacingType: " << tqlayout.lineSpacingType << " (Ignoring!)" << endl;
kdWarning(30506) << "Unsupported lineSpacingType: " << layout.lineSpacingType << " (Ignoring!)" << endl;
break;
}
}
}
// Add all AbiWord properties collected in the <FORMAT> element
props += textFormatToAbiProps(layoutOrigin.formatData.text,tqlayout.formatData.text,force);
props += textFormatToAbiProps(layoutOrigin.formatData.text,layout.formatData.text,force);
return props;
}
bool AbiWordWorker::doFullParagraph(const TQString& paraText, const LayoutData& tqlayout,
bool AbiWordWorker::doFullParagraph(const TQString& paraText, const LayoutData& layout,
const ValueListFormatData& paraFormatDataList)
{
TQString style=tqlayout.styleName;
TQString style=layout.styleName;
const LayoutData& styleLayout=m_styleMap[style];
TQString props=layoutToCss(styleLayout,tqlayout,false);
TQString props=layoutToCss(styleLayout,layout,false);
*m_streamOut << "<p";
if (!style.isEmpty())
@ -916,16 +916,16 @@ bool AbiWordWorker::doFullParagraph(const TQString& paraText, const LayoutData&
*m_streamOut << ">"; //Warning: No trailing white space or else it's in the text!!!
// Before processing the text, test if we have a page break
if (tqlayout.pageBreakBefore)
if (layout.pageBreakBefore)
{
// We have a page break before the paragraph
*m_streamOut << "<pbr/>";
}
processParagraphData(paraText, tqlayout.formatData.text, paraFormatDataList);
processParagraphData(paraText, layout.formatData.text, paraFormatDataList);
// Before closing the paragraph, test if we have a page break
if (tqlayout.pageBreakAfter)
if (layout.pageBreakAfter)
{
// We have a page break after the paragraph
*m_streamOut << "<pbr/>";
@ -935,26 +935,26 @@ bool AbiWordWorker::doFullParagraph(const TQString& paraText, const LayoutData&
return true;
}
bool AbiWordWorker::doFullDefineStyle(LayoutData& tqlayout)
bool AbiWordWorker::doFullDefineStyle(LayoutData& layout)
{
//Register style in the style map
m_styleMap[tqlayout.styleName]=tqlayout;
m_styleMap[layout.styleName]=layout;
*m_streamOut << "<s";
// TODO: cook the style name to the standard style names in AbiWord
*m_streamOut << " name=\"" << EscapeXmlText(tqlayout.styleName,true,true) << "\"";
*m_streamOut << " followedby=\"" << EscapeXmlText(tqlayout.styleFollowing,true,true) << "\"";
*m_streamOut << " name=\"" << EscapeXmlText(layout.styleName,true,true) << "\"";
*m_streamOut << " followedby=\"" << EscapeXmlText(layout.styleFollowing,true,true) << "\"";
if ( (tqlayout.counter.numbering == CounterData::NUM_CHAPTER)
&& (tqlayout.counter.depth<10) )
if ( (layout.counter.numbering == CounterData::NUM_CHAPTER)
&& (layout.counter.depth<10) )
{
*m_streamOut << " level=\"";
*m_streamOut << TQString::number(tqlayout.counter.depth+1,10);
*m_streamOut << TQString::number(layout.counter.depth+1,10);
*m_streamOut << "\"";
}
TQString abiprops=layoutToCss(tqlayout,tqlayout,true);
TQString abiprops=layoutToCss(layout,layout,true);
const int result=abiprops.findRev(";");
if (result>=0)

@ -363,7 +363,7 @@ bool StartElementP(StackItem* stackItem, StackItem* stackCurrent,
stackItem->stackElementFormatsPlural=formatsPluralElementOut; // <FORMATS>
stackItem->pos=0; // No text characters yet
// Now we populate the tqlayout
// Now we populate the layout
TQDomElement layoutElement=mainDocument.createElement("LAYOUT");
paragraphElementOut.appendChild(layoutElement);
@ -817,7 +817,7 @@ static bool StartElementPBR(StackItem* /*stackItem*/, StackItem* stackCurrent,
TQDomElement formatsPluralElementOut=mainDocument.createElement("FORMATS");
paragraphElementOut.appendChild(formatsPluralElementOut);
// We must now copy/clone the tqlayout of elementText.
// We must now copy/clone the layout of elementText.
TQDomNodeList nodeList=stackCurrent->stackElementParagraph.elementsByTagName("LAYOUT");
@ -1159,7 +1159,7 @@ bool StructureParser::StartElementTable(StackItem* stackItem, StackItem* stackCu
stackItem->strTemp2=TQString::number(tableNumber); // needed as I18N does not allow adding phrases
stackItem->pos=1; // Just #
// Now we populate the tqlayout
// Now we populate the layout
TQDomElement layoutElement=mainDocument.createElement("LAYOUT");
paragraphElementOut.appendChild(layoutElement);

@ -185,7 +185,7 @@ Normally this appears in beginning of paragraph.
5 Page Layout
-------------
Page tqlayout is defined in section [lay]. Here is the format,
Page layout is defined in section [lay]. Here is the format,
along with an example:
[lay]

@ -50,7 +50,7 @@ class AmiProWorker : public KWEFBaseWorker
virtual bool doCloseFile(void);
virtual bool doOpenDocument(void);
virtual bool doCloseDocument(void);
virtual bool doFullParagraph(const TQString& paraText, const LayoutData& tqlayout,
virtual bool doFullParagraph(const TQString& paraText, const LayoutData& layout,
const ValueListFormatData& paraFormatDataList);
private:
TQString filename;
@ -116,7 +116,7 @@ static TQString AmiProEscape( const TQString& text )
for( unsigned i=0; i<text.length(); i++ )
{
TQChar ch = text[i];
switch( ch.tqunicode() )
switch( ch.unicode() )
{
case '<': result += "<<"; break;
case '>': result += "<;>"; break;
@ -131,7 +131,7 @@ static TQString AmiProEscape( const TQString& text )
}
bool AmiProWorker::doFullParagraph(const TQString& paraText,
const LayoutData& /*tqlayout*/, const ValueListFormatData& paraFormatDataList)
const LayoutData& /*layout*/, const ValueListFormatData& paraFormatDataList)
{
TQString amiproText = "";
TQString text = paraText;

@ -124,43 +124,43 @@ static TQString AmiProFormatListAsXML( AmiProFormatList& formatList )
return result;
}
// helper function to convert AmiPro paragraph tqlayout to KWord's LAYOUT
static TQString AmiProLayoutAsXML( const AmiProLayout& tqlayout )
// helper function to convert AmiPro paragraph layout to KWord's LAYOUT
static TQString AmiProLayoutAsXML( const AmiProLayout& layout )
{
TQString result;
TQString referredStyle = tqlayout.name;
TQString referredStyle = layout.name;
if( referredStyle.isEmpty() ) referredStyle = "Standard";
TQString fontname = tqlayout.fontFamily;
TQString fontname = layout.fontFamily;
if( fontname.isEmpty() ) fontname = KoGlobal::defaultFont().family();
TQString fontsize = TQString::number( tqlayout.fontSize );
TQString fontcolor = "red=\"" + TQString::number( tqlayout.fontColor.red() ) +
"\" green=\"" + TQString::number( tqlayout.fontColor.green() ) +
"\" blue=\"" + TQString::number( tqlayout.fontColor.blue() ) + "\"";
TQString boldness = tqlayout.bold ? "75" : "50";
TQString italic = tqlayout.italic ? "1" : "0";
TQString strikeout = tqlayout.strikethrough ? "1" : "0";
TQString vertalign = tqlayout.superscript ? "2" : tqlayout.subscript ? "1" : "0";
TQString underline = tqlayout.double_underline ? "double" :
tqlayout.underline|tqlayout.word_underline ? "1" : "0";
TQString fontsize = TQString::number( layout.fontSize );
TQString fontcolor = "red=\"" + TQString::number( layout.fontColor.red() ) +
"\" green=\"" + TQString::number( layout.fontColor.green() ) +
"\" blue=\"" + TQString::number( layout.fontColor.blue() ) + "\"";
TQString boldness = layout.bold ? "75" : "50";
TQString italic = layout.italic ? "1" : "0";
TQString strikeout = layout.strikethrough ? "1" : "0";
TQString vertalign = layout.superscript ? "2" : layout.subscript ? "1" : "0";
TQString underline = layout.double_underline ? "double" :
layout.underline|layout.word_underline ? "1" : "0";
TQString align;
align = tqlayout.align==TQt::AlignLeft ? "left" :
tqlayout.align==TQt::AlignRight ? "right" :
tqlayout.align==TQt::AlignCenter ? "center" :
tqlayout.align==TQt::AlignJustify ? "justify" :
align = layout.align==TQt::AlignLeft ? "left" :
layout.align==TQt::AlignRight ? "right" :
layout.align==TQt::AlignCenter ? "center" :
layout.align==TQt::AlignJustify ? "justify" :
"left";
TQString offsets;
offsets = "before=\"" + TQString::number(tqlayout.spaceBefore) +
"\" after=\"" + TQString::number(tqlayout.spaceAfter) + "\"";
offsets = "before=\"" + TQString::number(layout.spaceBefore) +
"\" after=\"" + TQString::number(layout.spaceAfter) + "\"";
TQString linespacing;
linespacing = tqlayout.linespace==AmiPro::LS_Single ? TQString::fromLatin1( "0" ) :
tqlayout.linespace==AmiPro::LS_OneAndHalf ? TQString::fromLatin1( "oneandhalf" ) :
tqlayout.linespace==AmiPro::LS_Double ? TQString::fromLatin1( "double" ) :
TQString::number( tqlayout.linespace );
linespacing = layout.linespace==AmiPro::LS_Single ? TQString::fromLatin1( "0" ) :
layout.linespace==AmiPro::LS_OneAndHalf ? TQString::fromLatin1( "oneandhalf" ) :
layout.linespace==AmiPro::LS_Double ? TQString::fromLatin1( "double" ) :
TQString::number( layout.linespace );
result.append( "<LAYOUT>\n" );
result.append( " <NAME value=\"" + XMLEscape( referredStyle ) + "\" />\n" );
@ -308,12 +308,12 @@ bool AmiProConverter::doDefineStyle( const AmiProStyle& style )
}
bool AmiProConverter::doParagraph( const TQString& text, AmiProFormatList formatList,
AmiProLayout& tqlayout )
AmiProLayout& layout )
{
root.append( "<PARAGRAPH>\n" );
root.append( "<TEXT>" + XMLEscape( text ) + "</TEXT>\n" );
root.append( AmiProFormatListAsXML( formatList ) );
root.append( AmiProLayoutAsXML( tqlayout ) );
root.append( AmiProLayoutAsXML( layout ) );
root.append( "</PARAGRAPH>\n" );
return true;

@ -83,7 +83,7 @@ static TQString AmiProUnescape( const TQString& str )
else
{
result.truncate( result.length() - 1 ); // remove the '<'
result.append( TQChar(str[i+2].tqunicode() + 0x40 ) );
result.append( TQChar(str[i+2].unicode() + 0x40 ) );
i += 3;
}
}
@ -92,7 +92,7 @@ static TQString AmiProUnescape( const TQString& str )
if( str[i+1] == '\\' )
{
result.truncate( result.length() - 1 ); // remove the '<'
result.append( TQChar(str[i+2].tqunicode() | 0x80 ) );
result.append( TQChar(str[i+2].unicode() | 0x80 ) );
i += 3;
}
@ -628,7 +628,7 @@ void AmiProFormat::applyStyle( const AmiProStyle& style )
strikethrough = style.strikethrough;
}
// paragraph tqlayout
// paragraph layout
AmiProLayout::AmiProLayout()
{
name = "";

@ -104,7 +104,7 @@ class AmiProListener
virtual bool doCloseDocument();
virtual bool doDefineStyle( const AmiProStyle& style );
virtual bool doParagraph( const TQString& text, AmiProFormatList formatList,
AmiProLayout& tqlayout );
AmiProLayout& layout );
};
class AmiProParser
@ -144,7 +144,7 @@ class AmiProParser
bool processOpenDocument();
bool processCloseDocument();
bool processParagraph( const TQString& text, AmiProFormatList formatList,
AmiProLayout& tqlayout );
AmiProLayout& layout );
};

@ -29,7 +29,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<hbox>
<property name="name">

@ -29,7 +29,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<hbox>
<property name="name">

@ -86,7 +86,7 @@ public:
virtual bool doFullParagraphList(const TQValueList<ParaData>& paraList);
virtual bool doFullParagraph(const ParaData& para);
virtual bool doFullParagraph(const TQString& paraText,
const LayoutData& tqlayout,
const LayoutData& layout,
const ValueListFormatData& paraFormatDataList);
public:
@ -204,10 +204,10 @@ bool ASCIIWorker::doFullParagraphList(const TQValueList<ParaData>& paraList)
bool ASCIIWorker::doFullParagraph(const ParaData& para)
{
return doFullParagraph(para.text, para.tqlayout, para.formattingList);
return doFullParagraph(para.text, para.layout, para.formattingList);
}
bool ASCIIWorker::doFullParagraph(const TQString& paraText, const LayoutData& tqlayout,
bool ASCIIWorker::doFullParagraph(const TQString& paraText, const LayoutData& layout,
const ValueListFormatData& paraFormatDataList)
{
kdDebug(30502) << "Entering ASCIIWorker::doFullParagraph" << endl;
@ -216,15 +216,15 @@ bool ASCIIWorker::doFullParagraph(const TQString& paraText, const LayoutData& tq
// As KWord has only one depth of lists, we can process lists very simply.
// --
// Not anymore - Clarence
if ( tqlayout.counter.numbering == CounterData::NUM_LIST )
if ( layout.counter.numbering == CounterData::NUM_LIST )
{
// Are we still in a list of the right type?
if (!m_inList || (tqlayout.counter.style!=m_typeList))
if (!m_inList || (layout.counter.style!=m_typeList))
{
// We are not yet part of a list
m_inList=true;
m_counterList=1; // Start numbering
m_typeList=tqlayout.counter.style;
m_typeList=layout.counter.style;
}
switch (m_typeList)
@ -307,26 +307,26 @@ bool ASCIIWorker::doFullParagraph(const TQString& paraText, const LayoutData& tq
else
{
m_inList=false; // Close an eventual list
if ( tqlayout.counter.numbering == CounterData::NUM_CHAPTER )
if ( layout.counter.numbering == CounterData::NUM_CHAPTER )
{
if (!tqlayout.counter.depth)
if (!layout.counter.depth)
{ // HEAD 1
*m_streamOut << "###################################" << m_eol;
*m_streamOut << "# ";
ProcessParagraphData ( paraText, paraFormatDataList);
*m_streamOut << "###################################" << m_eol;
}
else if (tqlayout.counter.depth==1)
else if (layout.counter.depth==1)
{ // HEAD 2
*m_streamOut << "#### ";
ProcessParagraphData ( paraText, paraFormatDataList);
}
else if (tqlayout.counter.depth==2)
else if (layout.counter.depth==2)
{ // HEAD 3
*m_streamOut << "## ";
ProcessParagraphData ( paraText, paraFormatDataList);
}
else if (tqlayout.counter.depth==3)
else if (layout.counter.depth==3)
{ // HEAD 4
*m_streamOut << "# ";
ProcessParagraphData ( paraText, paraFormatDataList);
@ -342,8 +342,8 @@ bool ASCIIWorker::doFullParagraph(const TQString& paraText, const LayoutData& tq
}
}
#else
if (!tqlayout.counter.text.isEmpty())
*m_streamOut << tqlayout.counter.text << " ";
if (!layout.counter.text.isEmpty())
*m_streamOut << layout.counter.text << " ";
if (!ProcessParagraphData(paraText, paraFormatDataList)) return false;
#endif
@ -357,7 +357,7 @@ bool ASCIIWorker::ProcessTable(const Table& table)
{
kdDebug(30502) << "processTable CALLED!" << endl;
// just dump the table out (no tqlayout for now)
// just dump the table out (no layout for now)
for (TQValueList<TableCell>::ConstIterator it = table.cellList.begin();
it != table.cellList.end();
it++)

@ -296,12 +296,12 @@ void DocBookWorker::ProcessParagraphData ( const ParaData &para,
fixedFont = true;
}
if ( (*formattingIt).text.italic && !para.tqlayout.formatData.text.italic )
if ( (*formattingIt).text.italic && !para.layout.formatData.text.italic )
{
outputText += "<EMPHASIS>";
}
if ( (*formattingIt).text.weight > para.tqlayout.formatData.text.weight )
if ( (*formattingIt).text.weight > para.layout.formatData.text.weight )
{
outputText += "<EMPHASIS ROLE=bold>";
}
@ -318,12 +318,12 @@ void DocBookWorker::ProcessParagraphData ( const ParaData &para,
outputText += "</LITERAL>";
}
if ( (*formattingIt).text.weight > para.tqlayout.formatData.text.weight )
if ( (*formattingIt).text.weight > para.layout.formatData.text.weight )
{
outputText += "</EMPHASIS>";
}
if ( (*formattingIt).text.italic && !para.tqlayout.formatData.text.italic )
if ( (*formattingIt).text.italic && !para.layout.formatData.text.italic )
{
outputText += "</EMPHASIS>";
}
@ -516,10 +516,10 @@ bool DocBookWorker::doFullDocument ( const TQValueList<ParaData> &paraList )
TQValueList<ParaData>::ConstIterator end(paraList.end ());
for ( paraIt = paraList.begin (); paraIt != end ; ++paraIt )
{
switch ( (*paraIt).tqlayout.counter.numbering )
switch ( (*paraIt).layout.counter.numbering )
{
case CounterData::NUM_LIST:
switch ( (*paraIt).tqlayout.counter.style )
switch ( (*paraIt).layout.counter.style )
{
case CounterData::STYLE_CUSTOMBULLET:
case CounterData::STYLE_CIRCLEBULLET:
@ -581,7 +581,7 @@ bool DocBookWorker::doFullDocument ( const TQValueList<ParaData> &paraList )
break;
default:
kdError (30507) << "Unknown counter style " << (*paraIt).tqlayout.counter.style << "!" << endl;
kdError (30507) << "Unknown counter style " << (*paraIt).layout.counter.style << "!" << endl;
CloseLists ();
OpenArticleUnlessHead1 ();
ProcessParagraphData (*paraIt, "PARA" );
@ -590,7 +590,7 @@ bool DocBookWorker::doFullDocument ( const TQValueList<ParaData> &paraList )
break;
case CounterData::NUM_CHAPTER:
switch ( (*paraIt).tqlayout.counter.depth )
switch ( (*paraIt).layout.counter.depth )
{
case 0:
CloseHead1AndArticle ();
@ -629,7 +629,7 @@ bool DocBookWorker::doFullDocument ( const TQValueList<ParaData> &paraList )
break;
default:
kdError (30507) << "Unexpected chapter depth " << (*paraIt).tqlayout.counter.depth << "!" << endl;
kdError (30507) << "Unexpected chapter depth " << (*paraIt).layout.counter.depth << "!" << endl;
CloseLists ();
OpenArticleUnlessHead1 ();
ProcessParagraphData (*paraIt, "PARA" );

@ -96,7 +96,7 @@ class DirEntry
{
public:
bool valid; // false if invalid (should be skipped)
std::string name; // the name, not in tqunicode anymore
std::string name; // the name, not in unicode anymore
bool dir; // true if directory
unsigned long size; // size (not valid if directory)
unsigned long start; // starting block

@ -308,37 +308,37 @@ void HtmlBasicWorker::closeFormatData(const FormatData& formatOrigin,
}
void HtmlBasicWorker::openParagraph(const TQString& strTag,
const LayoutData& tqlayout, TQChar::Direction direction)
const LayoutData& layout, TQChar::Direction direction)
{
*m_streamOut << '<' << strTag;
if ( (tqlayout.alignment=="left") || (tqlayout.alignment== "right")
|| (tqlayout.alignment=="center") || (tqlayout.alignment=="justify"))
if ( (layout.alignment=="left") || (layout.alignment== "right")
|| (layout.alignment=="center") || (layout.alignment=="justify"))
{
*m_streamOut << " align=\"" << tqlayout.alignment << "\"";
*m_streamOut << " align=\"" << layout.alignment << "\"";
if ( (direction == TQChar::DirRLE) || (direction == TQChar::DirRLO) )
*m_streamOut << " dir=\"rtl\"";
}
else if ( tqlayout.alignment=="auto")
else if ( layout.alignment=="auto")
{
// Do nothing, the user-agent should be more intelligent than us.
}
else
{
kdWarning(30503) << "Unknown alignment: " << tqlayout.alignment << endl;
kdWarning(30503) << "Unknown alignment: " << layout.alignment << endl;
}
*m_streamOut << ">";
// Allow bold only if tag is not a heading!
openFormatData(tqlayout.formatData,tqlayout.formatData,true,(strTag[0]!='h'));
openFormatData(layout.formatData,layout.formatData,true,(strTag[0]!='h'));
}
void HtmlBasicWorker::closeParagraph(const TQString& strTag,
const LayoutData& tqlayout)
const LayoutData& layout)
{
// Allow bold only if tag is not a heading!
closeFormatData(tqlayout.formatData,tqlayout.formatData,true,(strTag[0]!='h'));
closeFormatData(layout.formatData,layout.formatData,true,(strTag[0]!='h'));
*m_streamOut << "</" << strTag << ">\n";
}

@ -33,9 +33,9 @@ public:
protected:
virtual TQString getStartOfListOpeningTag(const CounterData::Style typeList, bool& ordered);
virtual void openParagraph(const TQString& strTag,
const LayoutData& tqlayout,TQChar::Direction direction=TQChar::DirL);
const LayoutData& layout,TQChar::Direction direction=TQChar::DirL);
virtual void closeParagraph(const TQString& strTag,
const LayoutData& tqlayout);
const LayoutData& layout);
virtual void openSpan(const FormatData& formatOrigin, const FormatData& format);
virtual void closeSpan(const FormatData& formatOrigin, const FormatData& format);
virtual bool doOpenBody(void); ///< HTML's \<body\>

@ -52,7 +52,7 @@ TQString HtmlCssWorker::escapeCssIdentifier(const TQString& strText) const
for (uint i=0; i<strText.length(); i++)
{
const TQChar qch(strText.at(i));
const ushort ch=qch.tqunicode();
const ushort ch=qch.unicode();
if (((ch>='a') && (ch<='z'))
|| ((ch>='A') && (ch<='Z'))
@ -309,68 +309,68 @@ TQString HtmlCssWorker::getStartOfListOpeningTag(const CounterData::Style typeLi
}
TQString HtmlCssWorker::layoutToCss(const LayoutData& layoutOrigin,
const LayoutData& tqlayout, const bool force) const
const LayoutData& layout, const bool force) const
{
TQString strLayout;
if (force || (layoutOrigin.alignment!=tqlayout.alignment))
if (force || (layoutOrigin.alignment!=layout.alignment))
{
if ( (tqlayout.alignment=="left") || (tqlayout.alignment== "right")
|| (tqlayout.alignment=="center") || (tqlayout.alignment=="justify"))
if ( (layout.alignment=="left") || (layout.alignment== "right")
|| (layout.alignment=="center") || (layout.alignment=="justify"))
{
strLayout += TQString("text-align:%1; ").arg(tqlayout.alignment);
strLayout += TQString("text-align:%1; ").arg(layout.alignment);
}
else if ( tqlayout.alignment=="auto")
else if ( layout.alignment=="auto")
{
// Do nothing, the user-agent should be more intelligent than us.
}
else
{
kdWarning(30503) << "Unknown alignment: " << tqlayout.alignment << endl;
kdWarning(30503) << "Unknown alignment: " << layout.alignment << endl;
}
}
if ((tqlayout.indentLeft>=0.0)
&& (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft)))
if ((layout.indentLeft>=0.0)
&& (force || (layoutOrigin.indentLeft!=layout.indentLeft)))
{
strLayout += TQString("margin-left:%1pt; ").arg(tqlayout.indentLeft);
strLayout += TQString("margin-left:%1pt; ").arg(layout.indentLeft);
}
if ((tqlayout.indentRight>=0.0)
&& (force || (layoutOrigin.indentRight!=tqlayout.indentRight)))
if ((layout.indentRight>=0.0)
&& (force || (layoutOrigin.indentRight!=layout.indentRight)))
{
strLayout += TQString("margin-right:%1pt; ").arg(tqlayout.indentRight);
strLayout += TQString("margin-right:%1pt; ").arg(layout.indentRight);
}
if (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft))
if (force || (layoutOrigin.indentLeft!=layout.indentLeft))
{
strLayout += TQString("text-indent:%1pt; ").arg(tqlayout.indentFirst);
strLayout += TQString("text-indent:%1pt; ").arg(layout.indentFirst);
}
if ((tqlayout.marginBottom>=0.0)
&& ( force || ( layoutOrigin.marginBottom != tqlayout.marginBottom ) ) )
if ((layout.marginBottom>=0.0)
&& ( force || ( layoutOrigin.marginBottom != layout.marginBottom ) ) )
{
strLayout += TQString("margin-bottom:%1pt; ").arg(tqlayout.marginBottom);
strLayout += TQString("margin-bottom:%1pt; ").arg(layout.marginBottom);
}
if ((tqlayout.marginTop>=0.0)
&& ( force || ( layoutOrigin.marginTop != tqlayout.marginTop ) ) )
if ((layout.marginTop>=0.0)
&& ( force || ( layoutOrigin.marginTop != layout.marginTop ) ) )
{
strLayout += TQString("margin-top:%1pt; ").arg(tqlayout.marginTop);
strLayout += TQString("margin-top:%1pt; ").arg(layout.marginTop);
}
if (force
|| ( layoutOrigin.lineSpacingType != tqlayout.lineSpacingType )
|| ( layoutOrigin.lineSpacing != tqlayout.lineSpacing ) )
|| ( layoutOrigin.lineSpacingType != layout.lineSpacingType )
|| ( layoutOrigin.lineSpacing != layout.lineSpacing ) )
{
switch ( tqlayout.lineSpacingType )
switch ( layout.lineSpacingType )
{
case LayoutData::LS_CUSTOM:
{
// ### TODO: CSS 2 does not known "at-least".
#if 0
// We have a custom line spacing (in points)
const TQString height ( TQString::number(tqlayout.lineSpacing) ); // ### TODO: rounding?
const TQString height ( TQString::number(layout.lineSpacing) ); // ### TODO: rounding?
strLayout += "style:line-spacing:";
strLayout += height;
strLayout += "pt; ";
@ -394,7 +394,7 @@ TQString HtmlCssWorker::layoutToCss(const LayoutData& layoutOrigin,
}
case LayoutData::LS_MULTIPLE:
{
const TQString mult ( TQString::number( tqRound( tqlayout.lineSpacing * 100 ) ) );
const TQString mult ( TQString::number( tqRound( layout.lineSpacing * 100 ) ) );
strLayout += "line-height:";
strLayout += mult;
strLayout += "%; ";
@ -403,7 +403,7 @@ TQString HtmlCssWorker::layoutToCss(const LayoutData& layoutOrigin,
case LayoutData::LS_FIXED:
{
// We have a fixed line height (in points)
const TQString height ( TQString::number(tqlayout.lineSpacing) ); // ### TODO: rounding?
const TQString height ( TQString::number(layout.lineSpacing) ); // ### TODO: rounding?
strLayout += "line-height:";
strLayout += height;
strLayout += "pt; ";
@ -414,7 +414,7 @@ TQString HtmlCssWorker::layoutToCss(const LayoutData& layoutOrigin,
// ### TODO: CSS 2 does not known "at-least".
// ### TODO: however draft CCS3 (module 'line') has 'line-stacking-strategy' to tweak this behaviour
// We have a at-least line height (in points)
const TQString height ( TQString::number(tqlayout.lineSpacing) ); // ### TODO: rounding?
const TQString height ( TQString::number(layout.lineSpacing) ); // ### TODO: rounding?
strLayout += "line-height:";
strLayout += height;
strLayout += "pt; ";
@ -422,7 +422,7 @@ TQString HtmlCssWorker::layoutToCss(const LayoutData& layoutOrigin,
}
default:
{
kdWarning(30503) << "Unsupported lineSpacingType: " << tqlayout.lineSpacingType << " (Ignoring!)" << endl;
kdWarning(30503) << "Unsupported lineSpacingType: " << layout.lineSpacingType << " (Ignoring!)" << endl;
break;
}
}
@ -430,12 +430,12 @@ TQString HtmlCssWorker::layoutToCss(const LayoutData& layoutOrigin,
// TODO: Konqueror/KHTML does not support "text-shadow"
if (!force
&& ( layoutOrigin.shadowDirection == tqlayout.shadowDirection )
&& ( layoutOrigin.shadowDistance == tqlayout.shadowDistance ) )
&& ( layoutOrigin.shadowDirection == layout.shadowDirection )
&& ( layoutOrigin.shadowDistance == layout.shadowDistance ) )
{
// Do nothing!
}
else if ((!tqlayout.shadowDirection) || (!tqlayout.shadowDistance))
else if ((!layout.shadowDirection) || (!layout.shadowDistance))
{
strLayout += "text-shadow:";
strLayout+="none; ";
@ -443,8 +443,8 @@ TQString HtmlCssWorker::layoutToCss(const LayoutData& layoutOrigin,
else
{
double xDistance,yDistance;
const double distance=tqlayout.shadowDistance;
switch (tqlayout.shadowDirection)
const double distance=layout.shadowDistance;
switch (layout.shadowDirection)
{
case 1: // SD_LEFT_UP
{
@ -509,7 +509,7 @@ TQString HtmlCssWorker::layoutToCss(const LayoutData& layoutOrigin,
else
{
strLayout += "text-shadow:";
strLayout+=TQString("%1 %2pt %3pt; ").arg(tqlayout.shadowColor.name())
strLayout+=TQString("%1 %2pt %3pt; ").arg(layout.shadowColor.name())
.arg(xDistance,0,'f',0).arg(yDistance,0,'f',0);
// We do not want any scientific notation or any decimal
}
@ -519,60 +519,60 @@ TQString HtmlCssWorker::layoutToCss(const LayoutData& layoutOrigin,
// This must remain last, as the last property does not have a semi-colon
strLayout+=textFormatToCss(layoutOrigin.formatData.text,
tqlayout.formatData.text,force);
layout.formatData.text,force);
return strLayout;
}
void HtmlCssWorker::openParagraph(const TQString& strTag,
const LayoutData& tqlayout, TQChar::Direction direction)
const LayoutData& layout, TQChar::Direction direction)
{
const LayoutData& styleLayout=m_styleMap[tqlayout.styleName];
const LayoutData& styleLayout=m_styleMap[layout.styleName];
*m_streamOut << '<' << strTag;
// Opening elements
*m_streamOut << " class=\"" << escapeCssIdentifier(tqlayout.styleName);
*m_streamOut << " class=\"" << escapeCssIdentifier(layout.styleName);
*m_streamOut << "\"";
TQString strStyle=layoutToCss(styleLayout,tqlayout,false);
TQString strStyle=layoutToCss(styleLayout,layout,false);
if (!strStyle.isEmpty())
{
*m_streamOut << " style=\"" << strStyle;
if (direction == TQChar::DirRLE) {
*m_streamOut << "direction: rtl; tqunicode-bidi: embed; ";
*m_streamOut << "direction: rtl; unicode-bidi: embed; ";
} else if (direction == TQChar::DirRLO) {
*m_streamOut << "direction: rtl; tqunicode-bidi: override; ";
*m_streamOut << "direction: rtl; unicode-bidi: override; ";
}
*m_streamOut<< "\"";
}
*m_streamOut << ">";
if ( 1==tqlayout.formatData.text.verticalAlignment )
if ( 1==layout.formatData.text.verticalAlignment )
{
*m_streamOut << "<sub>"; //Subscript
}
else if ( 2==tqlayout.formatData.text.verticalAlignment )
else if ( 2==layout.formatData.text.verticalAlignment )
{
*m_streamOut << "<sup>"; //Superscript
}
if ( tqlayout.alignment == "center" ) *m_streamOut << "<center>";
if ( layout.alignment == "center" ) *m_streamOut << "<center>";
}
void HtmlCssWorker::closeParagraph(const TQString& strTag,
const LayoutData& tqlayout)
const LayoutData& layout)
{
if ( 2==tqlayout.formatData.text.verticalAlignment )
if ( 2==layout.formatData.text.verticalAlignment )
{
*m_streamOut << "</sup>"; //Superscript
}
else if ( 1==tqlayout.formatData.text.verticalAlignment )
else if ( 1==layout.formatData.text.verticalAlignment )
{
*m_streamOut << "</sub>"; //Subscript
}
if ( tqlayout.alignment == "center" ) *m_streamOut << "</center>";
if ( layout.alignment == "center" ) *m_streamOut << "</center>";
*m_streamOut << "</" << strTag << ">\n";
}
@ -680,16 +680,16 @@ bool HtmlCssWorker::doOpenStyles(void)
return true;
}
bool HtmlCssWorker::doFullDefineStyle(LayoutData& tqlayout)
bool HtmlCssWorker::doFullDefineStyle(LayoutData& layout)
{
//Register style in the style map
m_styleMap[tqlayout.styleName]=tqlayout;
m_styleMap[layout.styleName]=layout;
// We do not limit (anymore) any style to <h1> ... <h6>, because
// the style could be forced on <p> by the tqlayout.
// the style could be forced on <p> by the layout.
*m_streamOut << "." << escapeCssIdentifier(tqlayout.styleName);
*m_streamOut << "\n{\n " << layoutToCss(tqlayout,tqlayout,true) << "\n}\n";
*m_streamOut << "." << escapeCssIdentifier(layout.styleName);
*m_streamOut << "\n{\n " << layoutToCss(layout,layout,true) << "\n}\n";
return true;
}

@ -41,20 +41,20 @@ public:
public:
virtual bool doOpenStyles(void); ///< HTML's \<style\>
virtual bool doCloseStyles(void); ///< HTML's \</style\>
virtual bool doFullDefineStyle(LayoutData& tqlayout);
virtual bool doFullDefineStyle(LayoutData& layout);
virtual bool doFullPaperFormat(const int format,
const double width, const double height, const int orientation);
virtual bool doFullPaperBorders (const double top, const double left,
const double bottom, const double right); ///< Like KWord's \<PAPERBORDERS\>
protected:
virtual TQString getStartOfListOpeningTag(const CounterData::Style typeList, bool& ordered);
virtual void openParagraph(const TQString& strTag, const LayoutData& tqlayout,
virtual void openParagraph(const TQString& strTag, const LayoutData& layout,
TQChar::Direction direction=TQChar::DirL);
virtual void closeParagraph(const TQString& strTag, const LayoutData& tqlayout);
virtual void closeParagraph(const TQString& strTag, const LayoutData& layout);
virtual void openSpan(const FormatData& formatOrigin, const FormatData& format);
virtual void closeSpan(const FormatData& formatOrigin, const FormatData& format);
private:
TQString layoutToCss(const LayoutData& layoutOrigin,const LayoutData& tqlayout,
TQString layoutToCss(const LayoutData& layoutOrigin,const LayoutData& layout,
const bool force) const;
TQString escapeCssIdentifier(const TQString& strText) const;
TQString textFormatToCss(const TextFormatting& formatOrigin,

@ -29,7 +29,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@ -196,7 +196,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout6</cstring>
<cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
@ -221,7 +221,7 @@
</spacer>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout5</cstring>
<cstring>layout5</cstring>
</property>
<vbox>
<property name="name">

@ -140,16 +140,16 @@ void HtmlDocStructWorker::closeFormatData(const FormatData& formatOrigin,
}
void HtmlDocStructWorker::openParagraph(const TQString& strTag,
const LayoutData& tqlayout,TQChar::Direction /*direction*/)
const LayoutData& layout,TQChar::Direction /*direction*/)
{
*m_streamOut << '<' << strTag << ">";
openFormatData(tqlayout.formatData,tqlayout.formatData,true,(strTag[0]!='h'));
openFormatData(layout.formatData,layout.formatData,true,(strTag[0]!='h'));
}
void HtmlDocStructWorker::closeParagraph(const TQString& strTag,
const LayoutData& tqlayout)
const LayoutData& layout)
{
closeFormatData(tqlayout.formatData,tqlayout.formatData,true,(strTag[0]!='h'));
closeFormatData(layout.formatData,layout.formatData,true,(strTag[0]!='h'));
*m_streamOut << "</" << strTag << ">\n";
}

@ -33,9 +33,9 @@ public:
protected:
virtual TQString getStartOfListOpeningTag(const CounterData::Style typeList, bool& ordered);
virtual void openParagraph(const TQString& strTag,
const LayoutData& tqlayout,TQChar::Direction direction=TQChar::DirL);
const LayoutData& layout,TQChar::Direction direction=TQChar::DirL);
virtual void closeParagraph(const TQString& strTag,
const LayoutData& tqlayout);
const LayoutData& layout);
virtual void openSpan(const FormatData& formatOrigin, const FormatData& format);
virtual void closeSpan(const FormatData& formatOrigin, const FormatData& format);
private:

@ -275,13 +275,13 @@ void HtmlWorker::formatTextParagraph(const TQString& strText,
}
void HtmlWorker::ProcessParagraphData (const TQString& strTag, const TQString &paraText,
const LayoutData& tqlayout, const ValueListFormatData &paraFormatDataList)
const LayoutData& layout, const ValueListFormatData &paraFormatDataList)
{
if (paraText.isEmpty() && paraFormatDataList.first().id != 6)
{
openParagraph(strTag,tqlayout);
openParagraph(strTag,layout);
*m_streamOut << "&nbsp;" ; // A paragraph can never be empty in HTML
closeParagraph(strTag,tqlayout);
closeParagraph(strTag,layout);
}
else
{
@ -302,17 +302,17 @@ void HtmlWorker::ProcessParagraphData (const TQString& strTag, const TQString &p
// For normal text, we need an opened paragraph
if (paragraphNotOpened)
{
openParagraph(strTag,tqlayout,partialText.ref(0).direction());
openParagraph(strTag,layout,partialText.ref(0).direction());
paragraphNotOpened=false;
}
formatTextParagraph(partialText,tqlayout.formatData,*paraFormatDataIt);
formatTextParagraph(partialText,layout.formatData,*paraFormatDataIt);
}
else if (4==(*paraFormatDataIt).id)
{
// For variables, we need an opened paragraph
if (paragraphNotOpened)
{
openParagraph(strTag,tqlayout);
openParagraph(strTag,layout);
paragraphNotOpened=false;
}
if (9==(*paraFormatDataIt).variable.m_type)
@ -341,7 +341,7 @@ void HtmlWorker::ProcessParagraphData (const TQString& strTag, const TQString &p
if (!paragraphNotOpened)
{
// The paragraph was opened, so close it.
closeParagraph(strTag,tqlayout);
closeParagraph(strTag,layout);
}
makeTable((*paraFormatDataIt).frameAnchor);
// The paragraph will need to be opened again
@ -355,7 +355,7 @@ void HtmlWorker::ProcessParagraphData (const TQString& strTag, const TQString &p
// <img> and <object> need to be in a paragraph
if (paragraphNotOpened)
{
openParagraph( strTag, tqlayout,partialText.ref(0). direction() );
openParagraph( strTag, layout,partialText.ref(0). direction() );
paragraphNotOpened=false;
}
makeImage((*paraFormatDataIt).frameAnchor);
@ -370,30 +370,30 @@ void HtmlWorker::ProcessParagraphData (const TQString& strTag, const TQString &p
if (!paragraphNotOpened)
{
// The paragraph was opened, so close it.
closeParagraph(strTag,tqlayout);
closeParagraph(strTag,layout);
}
}
}
bool HtmlWorker::doFullParagraph(const TQString& paraText,
const LayoutData& tqlayout, const ValueListFormatData& paraFormatDataList)
const LayoutData& layout, const ValueListFormatData& paraFormatDataList)
{
kdDebug(30503) << "Entering HtmlWorker::doFullParagraph" << endl << paraText << endl;
TQString strParaText=paraText;
TQString strTag; // Tag that will be written.
if ( tqlayout.counter.numbering == CounterData::NUM_LIST )
if ( layout.counter.numbering == CounterData::NUM_LIST )
{
const uint layoutDepth=tqlayout.counter.depth+1; // Word's depth starts at 0!
const uint layoutDepth=layout.counter.depth+1; // Word's depth starts at 0!
const uint listDepth=m_listStack.size();
// We are in a list, but has it the right depth?
if (layoutDepth>listDepth)
{
ListInfo newList;
newList.m_typeList=tqlayout.counter.style;
newList.m_typeList=layout.counter.style;
for (uint i=listDepth; i<layoutDepth; i++)
{
*m_streamOut << getStartOfListOpeningTag(tqlayout.counter.style,newList.m_orderedList);
*m_streamOut << getStartOfListOpeningTag(layout.counter.style,newList.m_orderedList);
m_listStack.push(newList);
}
}
@ -414,7 +414,7 @@ bool HtmlWorker::doFullParagraph(const TQString& paraText,
}
// We have a list but does it have the right type?
if ( tqlayout.counter.style!=m_listStack.top().m_typeList)
if ( layout.counter.style!=m_listStack.top().m_typeList)
{
// No, then close the previous list
ListInfo oldList=m_listStack.pop();
@ -427,8 +427,8 @@ bool HtmlWorker::doFullParagraph(const TQString& paraText,
*m_streamOut << "</ul>\n";
}
ListInfo newList;
*m_streamOut << getStartOfListOpeningTag(tqlayout.counter.style,newList.m_orderedList);
newList.m_typeList=tqlayout.counter.style;
*m_streamOut << getStartOfListOpeningTag(layout.counter.style,newList.m_orderedList);
newList.m_typeList=layout.counter.style;
m_listStack.push(newList);
}
@ -453,10 +453,10 @@ bool HtmlWorker::doFullParagraph(const TQString& paraText,
}
}
}
if ( (tqlayout.counter.numbering == CounterData::NUM_CHAPTER)
&& (tqlayout.counter.depth<6) )
if ( (layout.counter.numbering == CounterData::NUM_CHAPTER)
&& (layout.counter.depth<6) )
{
strTag=TQString("h%1").arg(tqlayout.counter.depth + 1); // H1 ... H6
strTag=TQString("h%1").arg(layout.counter.depth + 1); // H1 ... H6
}
else
{
@ -464,7 +464,7 @@ bool HtmlWorker::doFullParagraph(const TQString& paraText,
}
}
ProcessParagraphData(strTag, strParaText, tqlayout, paraFormatDataList);
ProcessParagraphData(strTag, strParaText, layout, paraFormatDataList);
kdDebug(30503) << "Quiting HtmlWorker::doFullParagraph" << endl;
return true;

@ -42,7 +42,7 @@ public:
virtual bool doCloseFile(void); // Close file in normal conditions
virtual bool doOpenDocument(void);
virtual bool doCloseDocument(void);
virtual bool doFullParagraph(const TQString& paraText, const LayoutData& tqlayout,
virtual bool doFullParagraph(const TQString& paraText, const LayoutData& layout,
const ValueListFormatData& paraFormatDataList);
virtual bool doFullDocumentInfo(const KWEFDocumentInfo& docInfo);
virtual bool doOpenTextFrameSet(void);
@ -58,9 +58,9 @@ protected:
* be detected from the actual string data
*/
virtual void openParagraph(const TQString& strTag,
const LayoutData& tqlayout, TQChar::Direction direction=TQChar::DirL)=0;
const LayoutData& layout, TQChar::Direction direction=TQChar::DirL)=0;
virtual void closeParagraph(const TQString& strTag,
const LayoutData& tqlayout)=0;
const LayoutData& layout)=0;
virtual void openSpan(const FormatData& formatOrigin, const FormatData& format)=0;
virtual void closeSpan(const FormatData& formatOrigin, const FormatData& format)=0;
virtual void writeDocType(void);
@ -84,7 +84,7 @@ protected:
TQString getAdditionalFileName(const TQString& additionalName);
private:
void ProcessParagraphData ( const TQString& strTag, const TQString &paraText,
const LayoutData& tqlayout, const ValueListFormatData &paraFormatDataList);
const LayoutData& layout, const ValueListFormatData &paraFormatDataList);
void formatTextParagraph(const TQString& strText,
const FormatData& formatOrigin, const FormatData& format);
bool makeTable(const FrameAnchor& anchor);

@ -80,7 +80,7 @@ HTMLReader_state *KHTMLReader::state()
s->frameset=_writer->mainFrameset();
s->paragraph = _writer->addParagraph(s->frameset);
s->format=_writer->currentFormat(s->paragraph,true);
s->tqlayout=_writer->currentLayout(s->paragraph);
s->layout=_writer->currentLayout(s->paragraph);
s->in_pre_mode = false;
_state.push(s);
}
@ -93,7 +93,7 @@ HTMLReader_state *KHTMLReader::pushNewState()
s->frameset=state()->frameset;
s->paragraph=state()->paragraph;
s->format=state()->format;
s->tqlayout=state()->tqlayout;
s->layout=state()->layout;
s->in_pre_mode=state()->in_pre_mode;
_writer->cleanUpParagraph(s->paragraph);
_state.push(s);
@ -118,9 +118,9 @@ void KHTMLReader::popState()
if (s->frameset == state()->frameset)
{
state()->paragraph=s->paragraph;
if ((state()->tqlayout != s->tqlayout))
if ((state()->layout != s->layout))
{
if (_writer->getText(state()->paragraph).length()!=0) startNewLayout(false,state()->tqlayout);
if (_writer->getText(state()->paragraph).length()!=0) startNewLayout(false,state()->layout);
}
state()->format=_writer->startFormat(state()->paragraph, state()->format);
}
@ -129,15 +129,15 @@ void KHTMLReader::popState()
void KHTMLReader::startNewLayout(bool startNewFormat)
{
TQDomElement tqlayout;
startNewLayout(startNewFormat,tqlayout);
TQDomElement layout;
startNewLayout(startNewFormat,layout);
}
void KHTMLReader::startNewLayout(bool startNewFormat, TQDomElement tqlayout)
void KHTMLReader::startNewLayout(bool startNewFormat, TQDomElement layout)
{
kdDebug() << "entering startNewLayout" << endl;
startNewParagraph(startNewFormat,true);
state()->tqlayout=_writer->setLayout(state()->paragraph,tqlayout);
state()->layout=_writer->setLayout(state()->paragraph,layout);
}
void KHTMLReader::completed()
@ -183,7 +183,7 @@ void KHTMLReader::parseNode(DOM::Node node)
// is this really needed ? it can't do harm anyway.
state()->format=_writer->currentFormat(state()->paragraph,true);
state()->tqlayout=_writer->currentLayout(state()->paragraph);
state()->layout=_writer->currentLayout(state()->paragraph);
pushNewState();
DOM::Element e=node;
@ -227,13 +227,13 @@ void KHTMLReader::parse_head(DOM::Element e)
} \
}
// the state->tqlayout=_writer->setLayout is meant to tell popState something changed in the tqlayout, and a new
// tqlayout should probably be started after closing.
// the state->layout=_writer->setLayout is meant to tell popState something changed in the layout, and a new
// layout should probably be started after closing.
#define _PL(x,a,b,c) { \
if (e.tagName().lower() == #x) \
{ \
state()->tqlayout=_writer->setLayout(state()->paragraph,state()->tqlayout);\
state()->layout=_writer->setLayout(state()->paragraph,state()->layout);\
if (!(_writer->getText(state()->paragraph).isEmpty())) \
startNewParagraph(false,false); \
_writer->layoutAttribute(state()->paragraph, #a,#b,#c); \
@ -283,20 +283,20 @@ bool KHTMLReader::parseTag(DOM::Element e)
return true;
}
void KHTMLReader::startNewParagraph(bool startnewformat, bool startnewtqlayout)
void KHTMLReader::startNewParagraph(bool startnewformat, bool startnewlayout)
{
kdDebug() << "Entering startNewParagraph" << endl;
TQDomElement qf=state()->format;
TQDomElement ql=state()->tqlayout;
TQDomElement ql=state()->layout;
_writer->cleanUpParagraph(state()->paragraph);
if ((startnewtqlayout==true) || ql.isNull())
if ((startnewlayout==true) || ql.isNull())
{state()->paragraph=_writer->addParagraph(state()->frameset);}
else
{state()->paragraph=
_writer->addParagraph(state()->frameset,state()->tqlayout);}
_writer->addParagraph(state()->frameset,state()->layout);}
@ -403,7 +403,7 @@ bool KHTMLReader::parse_hr(DOM::Element /*e*/)
bool KHTMLReader::parse_br(DOM::Element /*e*/)
{
startNewParagraph(false,false); //keep the current format and tqlayout
startNewParagraph(false,false); //keep the current format and layout
return false; // a BR tag has no childs.
}
@ -508,7 +508,7 @@ void KHTMLReader::parseStyle(DOM::Element e)
// process e.g. <style="text-align: center">this is in the center</style>
if ( s1.getPropertyValue("text-align").string() != TQString() && s1.getPropertyValue("text-align").string() != TQString("left") )
{
state()->tqlayout=_writer->setLayout(state()->paragraph,state()->tqlayout);
state()->layout=_writer->setLayout(state()->paragraph,state()->layout);
_writer->layoutAttribute(state()->paragraph, "FLOW","align",s1.getPropertyValue("text-align").string());
}
// done

@ -39,7 +39,7 @@ struct HTMLReader_state {
TQDomElement format;
TQDomElement frameset;
TQDomElement paragraph;
TQDomElement tqlayout;
TQDomElement layout;
bool in_pre_mode; // keep formatting as is.
};
@ -77,8 +77,8 @@ private:
KWDWriter *_writer;
void startNewLayout(bool startNewFormat=false);
void startNewLayout(bool startNewFormat, TQDomElement tqlayout);
void startNewParagraph(bool startnewformat=true, bool startnewtqlayout=true);
void startNewLayout(bool startNewFormat, TQDomElement layout);
void startNewParagraph(bool startnewformat=true, bool startnewlayout=true);
bool _it_worked;
// -----------------------------------------------------
int _list_depth;

@ -328,12 +328,12 @@ TQDomElement KWDWriter::createLink(TQDomElement paragraph, TQString linkName, TQ
}
TQDomElement KWDWriter::setLayout(TQDomElement paragraph, TQDomElement tqlayout) {
TQDomElement KWDWriter::setLayout(TQDomElement paragraph, TQDomElement layout) {
TQDomElement theLayout;
if (tqlayout.isNull())
if (layout.isNull())
theLayout=_doc->createElement("LAYOUT");
else
theLayout=tqlayout.cloneNode().toElement();
theLayout=layout.cloneNode().toElement();
TQDomElement oldLayout=currentLayout(paragraph);
paragraph.removeChild(oldLayout);
paragraph.appendChild(theLayout);
@ -357,12 +357,12 @@ TQDomElement KWDWriter::addParagraph(TQDomElement parent, TQDomElement layoutToC
TQDomElement paragraph=_doc->createElement("PARAGRAPH");
TQDomElement formats=_doc->createElement("FORMATS");
TQDomElement tqlayout;
TQDomElement layout;
if (layoutToClone.isNull()) {
tqlayout=_doc->createElement("LAYOUT");
layout=_doc->createElement("LAYOUT");
}
else {
tqlayout=layoutToClone.cloneNode().toElement();
layout=layoutToClone.cloneNode().toElement();
}
TQDomElement text=_doc->createElement("TEXT");
TQDomText t=_doc->createTextNode(TQString(""));
@ -370,7 +370,7 @@ TQDomElement KWDWriter::addParagraph(TQDomElement parent, TQDomElement layoutToC
paragraph.appendChild(formats);
paragraph.appendChild(text);
parent.appendChild(paragraph);
paragraph.appendChild(tqlayout);
paragraph.appendChild(layout);
layoutAttribute(paragraph,"NAME","value","Standard");
return paragraph;
}

@ -93,7 +93,7 @@ public:
/**
* create a horizontal ruler tqlayout
* create a horizontal ruler layout
**/
void createHR(TQDomElement paragraph, int width=1);
@ -115,7 +115,7 @@ public:
* adds a paragraph
**/
TQDomElement addParagraph(TQDomElement parent);
TQDomElement addParagraph(TQDomElement parent, TQDomElement tqlayout);
TQDomElement addParagraph(TQDomElement parent, TQDomElement layout);
/**
* adds/changes an attribute to/of the current format
@ -123,13 +123,13 @@ public:
TQDomElement formatAttribute(TQDomElement paragraph, TQString name, TQString attrName, TQString attr);
/**
* get a tqlayout attribute
* get a layout attribute
**/
TQString getLayoutAttribute(TQDomElement paragraph, TQString name, TQString attrName);
/**
* adds/changes an attribute to/of the current tqlayout
* adds/changes an attribute to/of the current layout
**/
TQDomElement layoutAttribute(TQDomElement paragraph, TQString name, TQString attrName, TQString attr);
@ -164,9 +164,9 @@ public:
TQDomElement createLink(TQDomElement paragraph, TQString linkName, TQString hrefName);
/**
* copy the given tqlayout, and set it as tqlayout of the given paragraph
* copy the given layout, and set it as layout of the given paragraph
**/
TQDomElement setLayout(TQDomElement paragraph, TQDomElement tqlayout);
TQDomElement setLayout(TQDomElement paragraph, TQDomElement layout);
/**
* returns the text of this paragraph.

@ -13,7 +13,7 @@ KWord13Layout::~KWord13Layout( void )
void KWord13Layout::xmldump( TQTextStream& iostream )
{
iostream << " <tqlayout name=\"" << EscapeXmlDump( m_name )
iostream << " <layout name=\"" << EscapeXmlDump( m_name )
<< "\" outline=\"" << ( m_outline ? TQString("true") : TQString("false") ) << "\">\n";
for ( TQMap<TQString,TQString>::ConstIterator it = m_layoutProperties.begin();
@ -25,7 +25,7 @@ void KWord13Layout::xmldump( TQTextStream& iostream )
m_format.xmldump( iostream );
iostream << " </tqlayout>\n";
iostream << " </layout>\n";
}
TQString KWord13Layout::key( void ) const

@ -178,11 +178,11 @@ double KWord13OasisGenerator::positiveNumberOrNull( const TQString& str ) const
}
// Inspired by KoParagStyle::saveStyle
void KWord13OasisGenerator::declareLayout( KWord13Layout& tqlayout )
void KWord13OasisGenerator::declareLayout( KWord13Layout& layout )
{
KoGenStyle gs( KoGenStyle::STYLE_AUTO, "paragraph", tqlayout.m_name );
KoGenStyle gs( KoGenStyle::STYLE_AUTO, "paragraph", layout.m_name );
// ### TODO: any display name? gs.addAttribute( "style:display-name", tqlayout.m_name );
// ### TODO: any display name? gs.addAttribute( "style:display-name", layout.m_name );
#if 0
// TODO: check that this is correct
if ( m_paragLayout.counter && m_paragLayout.counter->depth() ) {
@ -192,21 +192,21 @@ void KWord13OasisGenerator::declareLayout( KWord13Layout& tqlayout )
gs.addAttribute( "style:default-level", (int)m_paragLayout.counter->depth() + 1 );
}
#endif
fillGenStyleWithLayout( tqlayout, gs, false );
fillGenStyleWithFormatOne( tqlayout.m_format , gs, false );
fillGenStyleWithLayout( layout, gs, false );
fillGenStyleWithFormatOne( layout.m_format , gs, false );
tqlayout.m_autoStyleName = m_oasisGenStyles.lookup( gs, "P", true );
layout.m_autoStyleName = m_oasisGenStyles.lookup( gs, "P", true );
kdDebug(30520) << "Layout: Parent " << tqlayout.m_name << " => " << tqlayout.m_autoStyleName << endl;
kdDebug(30520) << "Layout: Parent " << layout.m_name << " => " << layout.m_autoStyleName << endl;
}
// Inspired by KoParagStyle::saveStyle
void KWord13OasisGenerator::declareStyle( KWord13Layout& tqlayout )
void KWord13OasisGenerator::declareStyle( KWord13Layout& layout )
{
KoGenStyle gs( KoGenStyle::STYLE_USER, "paragraph", TQString() );
gs.addAttribute( "style:display-name", tqlayout.m_name );
gs.addAttribute( "style:display-name", layout.m_name );
#if 0
// TODO: check that this is correct
if ( m_paragLayout.counter && m_paragLayout.counter->depth() ) {
@ -216,12 +216,12 @@ void KWord13OasisGenerator::declareStyle( KWord13Layout& tqlayout )
gs.addAttribute( "style:default-level", (int)m_paragLayout.counter->depth() + 1 );
}
#endif
fillGenStyleWithLayout( tqlayout, gs, true );
fillGenStyleWithFormatOne( tqlayout.m_format , gs, true );
fillGenStyleWithLayout( layout, gs, true );
fillGenStyleWithFormatOne( layout.m_format , gs, true );
tqlayout.m_autoStyleName = m_oasisGenStyles.lookup( gs, tqlayout.m_name, false );
layout.m_autoStyleName = m_oasisGenStyles.lookup( gs, layout.m_name, false );
kdDebug(30520) << "Style: " << tqlayout.m_name << " => " << tqlayout.m_autoStyleName << endl;
kdDebug(30520) << "Style: " << layout.m_name << " => " << layout.m_autoStyleName << endl;
}
@ -341,13 +341,13 @@ void KWord13OasisGenerator::fillGenStyleWithFormatOne( const KWord13FormatOneDat
}
// Inspired from KoParagLayout::saveOasis but we have not the same data to start with.
void KWord13OasisGenerator::fillGenStyleWithLayout( const KWord13Layout& tqlayout, KoGenStyle& gs, const bool style ) const
void KWord13OasisGenerator::fillGenStyleWithLayout( const KWord13Layout& layout, KoGenStyle& gs, const bool style ) const
{
// ### TODO syntaxVersion < 3
TQString str; // Help string to store each KWord 1.3 tqlayout property
TQString str; // Help string to store each KWord 1.3 layout property
str = tqlayout.getProperty( "FLOW:align" );
str = layout.getProperty( "FLOW:align" );
if ( str.isEmpty() && ! style)
{
// Nothing to do!
@ -361,7 +361,7 @@ void KWord13OasisGenerator::fillGenStyleWithLayout( const KWord13Layout& tqlayou
gs.addProperty( "fo:text-align", "start" ); // i.e. direction-dependent
}
str = tqlayout.getProperty( "FLOW:dir" );
str = layout.getProperty( "FLOW:dir" );
if ( str == "R" ) // ### TODO: check the right value
{
gs.addProperty( "style:writing-mode", "rl-tb" ); // right-to-left, top-to-bottom
@ -372,11 +372,11 @@ void KWord13OasisGenerator::fillGenStyleWithLayout( const KWord13Layout& tqlayou
}
// ### TODO: do not define if it does not exist and ! style
gs.addPropertyPt( "fo:margin-left", numberOrNull( tqlayout.getProperty( "INDENTS:left" ) ) );
gs.addPropertyPt( "fo:margin-right", numberOrNull( tqlayout.getProperty( "INDENTS:right" ) ) );
gs.addPropertyPt( "fo:text-indent", numberOrNull( tqlayout.getProperty( "INDENTS:first" ) ) );
gs.addPropertyPt( "fo:margin-top", numberOrNull( tqlayout.getProperty( "OFFSETS:before" ) ) );
gs.addPropertyPt( "fo:margin-bottom", numberOrNull( tqlayout.getProperty( "OFFSETS:after" ) ) );
gs.addPropertyPt( "fo:margin-left", numberOrNull( layout.getProperty( "INDENTS:left" ) ) );
gs.addPropertyPt( "fo:margin-right", numberOrNull( layout.getProperty( "INDENTS:right" ) ) );
gs.addPropertyPt( "fo:text-indent", numberOrNull( layout.getProperty( "INDENTS:first" ) ) );
gs.addPropertyPt( "fo:margin-top", numberOrNull( layout.getProperty( "OFFSETS:before" ) ) );
gs.addPropertyPt( "fo:margin-bottom", numberOrNull( layout.getProperty( "OFFSETS:after" ) ) );
#if 0
switch ( lineSpacingType ) {
@ -614,7 +614,7 @@ void KWord13OasisGenerator::writeStylesXml( void )
Q_ASSERT( styles.count() == 1 );
it = styles.begin();
for ( ; it != styles.end() ; ++it ) {
(*it).style->writeStyle( stylesWriter, m_oasisGenStyles, "style:page-tqlayout", (*it).name, "style:page-tqlayout-properties", false /*don't close*/ );
(*it).style->writeStyle( stylesWriter, m_oasisGenStyles, "style:page-layout", (*it).name, "style:page-layout-properties", false /*don't close*/ );
//if ( m_pageLayout.columns > 1 ) TODO add columns element. This is a bit of a hack,
// which only works as long as we have only one page master
stylesWriter->endElement();
@ -629,7 +629,7 @@ void KWord13OasisGenerator::writeStylesXml( void )
stylesWriter->startElement( "office:master-styles" );
stylesWriter->startElement( "style:master-page" );
stylesWriter->addAttribute( "style:name", "Standard" );
stylesWriter->addAttribute( "style:page-tqlayout-name", pageLayoutName );
stylesWriter->addAttribute( "style:page-layout-name", pageLayoutName );
stylesWriter->endElement();
stylesWriter->endElement(); // office:master-styles

@ -49,17 +49,17 @@ protected: // Generating phase
void writePreviewFile(void);
void writePictures( void );
protected: // Preparing phase
/// Preparing page tqlayout
/// Preparing page layout
void preparePageLayout( void );
void prepareTextFrameset( KWordTextFrameset* frameset );
/// Also sets the name of the automatical style
void declareLayout( KWord13Layout& tqlayout );
void declareLayout( KWord13Layout& layout );
/// Also sets the name of the automatical style
void declareStyle( KWord13Layout& tqlayout );
void declareStyle( KWord13Layout& layout );
double numberOrNull( const TQString& str ) const;
double positiveNumberOrNull( const TQString& str ) const;
void fillGenStyleWithFormatOne( const KWord13FormatOneData& one, KoGenStyle& gs, const bool style ) const;
void fillGenStyleWithLayout( const KWord13Layout& tqlayout, KoGenStyle& gs, const bool style ) const;
void fillGenStyleWithLayout( const KWord13Layout& layout, KoGenStyle& gs, const bool style ) const;
protected:
KWord13Document* m_kwordDocument;
KoStore* m_store;

@ -133,7 +133,7 @@ bool KWord13Parser::startElementLayoutProperty( const TQString& name, const TQXm
}
else
{
kdError(30520) << "No current tqlayout for storing property: " << name << endl;
kdError(30520) << "No current layout for storing property: " << name << endl;
return false;
}
}
@ -166,7 +166,7 @@ bool KWord13Parser::startElementFormat( const TQString&, const TQXmlAttributes&
else if ( stackItem->elementType == KWord13TypeLayout )
{
stackItem->elementType = KWord13TypeLayoutFormatOne;
return true; // Everything is done directly on the tqlayout
return true; // Everything is done directly on the layout
}
else if ( stackItem->elementType != KWord13TypeFormatsPlural )
{
@ -247,7 +247,7 @@ bool KWord13Parser::startElementLayout( const TQString&, const TQXmlAttributes&
if ( m_currentLayout )
{
// Delete an eventually already existing paragraph (should not happen)
kdWarning(30520) << "Current tqlayout already defined!" << endl;
kdWarning(30520) << "Current layout already defined!" << endl;
delete m_currentLayout;
}
@ -795,7 +795,7 @@ bool KWord13Parser :: characters ( const TQString & ch )
const uint length = ch.length();
for ( uint i = 0; i < length; ++i )
{
const ushort uni = ch.at(i).tqunicode();
const ushort uni = ch.at(i).unicode();
if ( uni >= 32 )
continue; // Normal character
else if ( uni == 9 || uni == 10 || uni == 13)

@ -129,7 +129,7 @@ protected:
KWord13StackItemStack parserStack;
KWord13Document* m_kwordDocument;
KWord13Paragraph* m_currentParagraph; ///< Current paragraph
KWord13Layout* m_currentLayout; ///< Current tqlayout (or style)
KWord13Layout* m_currentLayout; ///< Current layout (or style)
KWord13Format* m_currentFormat; ///< Current format
};

@ -8,7 +8,7 @@ TQString EscapeXmlDump( const TQString& strIn )
for (uint i=0; i<strIn.length(); i++)
{
ch=strIn[i];
switch (ch.tqunicode())
switch (ch.unicode())
{
case 38: // &
{

@ -84,8 +84,8 @@ class Config
bool convertPictures() const { return _convertPictures; }
TQString getPicturesDir() const { return _picturesDir; }
bool mustUseUnicode() const { return (_encoding == "tqunicode"); }
bool mustUseLatin1() const { return (_encoding != "tqunicode"); }
bool mustUseUnicode() const { return (_encoding == "unicode"); }
bool mustUseLatin1() const { return (_encoding != "unicode"); }
TQString getEncoding() const { return _encoding; }
TQStringList getLanguagesList() const { return _languagesList; }
TQString getDefaultLanguage() const { return _defaultLanguage; }

@ -101,7 +101,7 @@ KWordLatexExportDia::KWordLatexExportDia(KoStore* in, TQWidget* parent,
classComboBox->insertItem("report");
classComboBox->insertItem("slides");
encodingComboBox->insertItem("tqunicode");
encodingComboBox->insertItem("unicode");
encodingComboBox->insertItem("ansinew");
encodingComboBox->insertItem("applemac");
encodingComboBox->insertItem("ascii");

@ -93,7 +93,7 @@ class Layout: public TextFormat
* Nothing to do.
*/
virtual ~Layout() {
kdDebug(30522) << "Destruction of a tqlayout." << endl;
kdDebug(30522) << "Destruction of a layout." << endl;
}
/**

@ -210,7 +210,7 @@ void Para::analyseInfo(const TQDomNode balise)
/*******************************************/
/* AnalyseLayoutPara */
/*******************************************/
/* Analyse the tqlayout of a para. */
/* Analyse the layout of a para. */
/* For each format, keep the type (picture,*/
/* text, variable, footnote) and put the */
/* zone in a list. */

@ -217,7 +217,7 @@ void TextFrame::generate(TQTextStream &out)
lastPara->closeList(out, currentPara);
_lastTypeEnum = TL_NONE;
}
/* tqlayout management (left, center, justify, right) */
/* layout management (left, center, justify, right) */
if((!lastPara->isChapter() && _lastEnv != getNextEnv(_parags, _parags.at()) &&
lastPara->notEmpty()) ||
_lastEnv != getNextEnv(_parags, _parags.at()))

@ -1,4 +1,4 @@
/* MEMO: to see the tqunicode table
/* MEMO: to see the unicode table
* xset +fp /usr/X11R6/lib/X11/fonts/ucs/
* xfd -fn '-misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso10646-1'
*/
@ -85,7 +85,7 @@ bool TextZone::useFormat() const
/*******************************************/
/* escapeLatin1 */
/*******************************************/
/* Convert special caracters (tqunicode) in */
/* Convert special caracters (unicode) in */
/* latex usable caracters. */
/*******************************************/
TQString TextZone::escapeLatin1(TQString text)
@ -114,7 +114,7 @@ TQString TextZone::escapeLatin1(TQString text)
};
TQString escapedText;
int tqunicode; /* the character to be escaped */
int unicode; /* the character to be escaped */
escapedText = text; /* copy input text */
@ -185,8 +185,8 @@ TQString TextZone::escapeLatin1(TQString text)
for(int index = 0; index < 64; index++)
{
tqunicode = CSTART + index;
convert(escapedText, tqunicode, escapes[index]);
unicode = CSTART + index;
convert(escapedText, unicode, escapes[index]);
}
convert(escapedText, 0X2020, "\\textdied{}"); /* textcomp */
@ -259,12 +259,12 @@ TQString TextZone::escapeLatin1(TQString text)
/* Convert all the instance of one */
/* character in latex usable caracter. */
/*******************************************/
void TextZone::convert(TQString& text, int tqunicode, const char* escape)
void TextZone::convert(TQString& text, int unicode, const char* escape)
{
TQString expression;
TQString value;
expression = TQString("\\x") + value.setNum(tqunicode, 16);
expression = TQString("\\x") + value.setNum(unicode, 16);
if( !TQString(escape).isEmpty() )
{

@ -81,7 +81,7 @@ class TextZone: public TextFormat
/* ==== Helpfull functions ==== */
/**
* convert a tqunicode text in latin1 enconding ala latex.
* convert a unicode text in latin1 enconding ala latex.
*/
TQString escapeLatin1(TQString);

@ -1,4 +1,4 @@
/* MEMO: to see the tqunicode table
/* MEMO: to see the unicode table
* xset +fp /usr/X11R6/lib/X11/fonts/ucs/
* xfd -fn '-misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso10646-1'
*/

@ -92,8 +92,8 @@ void LATEXImportDia::createDialog()
TQBoxLayout *langLayout = new TQVBoxLayout(langBox);
tqunicodeRBtn = new TQRadioButton(i18n("Unicode"), langBox);
langLayout->addWidget(tqunicodeRBtn);
unicodeRBtn = new TQRadioButton(i18n("Unicode"), langBox);
langLayout->addWidget(unicodeRBtn);
latin1RBtn = new TQRadioButton(i18n("latin1"), langBox);
langLayout->addWidget(latin1RBtn);
@ -124,7 +124,7 @@ void LATEXImportDia::createDialog()
docBox->setButton(0); /* NEW DOC IS THE DEFAULT. */
docLayout->activate();
/* Display the main tqlayout */
/* Display the main layout */
mainLayout->addStretch(5);
mainLayout->activate();
}
@ -138,7 +138,7 @@ void LATEXImportDia::state()
else if(embededRBtn == docBox->selected())
config.setType(TYPE_EMBEDED);
if(tqunicodeRBtn == langBox->selected())
if(unicodeRBtn == langBox->selected())
config.setEncoding(ENC_UNICODE);
else if(latin1RBtn == langBox->selected())
config.setEncoding(ENC_LATIN1);

@ -72,7 +72,7 @@ class LATEXImportDia : public KDialogBase, public DCOPObject
private:
TQVButtonGroup* styleBox, *langBox, *docBox;
TQRadioButton* latexStyleRBtn, *kwordStyleRBtn; /* Document style */
TQRadioButton* tqunicodeRBtn, *latin1RBtn; /* Language */
TQRadioButton* unicodeRBtn, *latin1RBtn; /* Language */
TQRadioButton* newDocRBtn, *embededRBtn; /* Latex file */
k_dcop:

@ -131,14 +131,14 @@
<B>VERSION 1:</B>
<table BORDER="0" WIDTH="100%">
<tr><td>text with accent</td> <td>DONE</td></tr>
<tr><td>text with special characters</td> <td>A LOT OF SPECIAL CHARS SUPPORTED for latin1 (all for tqunicode)!</td></tr>
<tr><td>tqlayout</td> <td>DONE</td></tr>
<tr><td>text with special characters</td> <td>A LOT OF SPECIAL CHARS SUPPORTED for latin1 (all for unicode)!</td></tr>
<tr><td>layout</td> <td>DONE</td></tr>
<tr><td>title</td> <td>DONE</td></tr>
<tr><td>list</td> <td>DONE</td></tr>
<tr><td>paper</td> <td>DONE</td></tr>
<tr><td>footnote, head</td> <td>DONE (still a little bug for first foot/header and a line is added)</td></tr>
<tr><td>comments with kdoc</td> <td>STARTED</td></tr>
<tr><td>tqunicode support</td> <td>DONE (omega package)</td></tr>
<tr><td>unicode support</td> <td>DONE (omega package)</td></tr>
<tr><td>break (line, page)</td> <td>STARTED</td></tr>
<tr><td>indent list</td> <td></td></tr>
</table>
@ -209,7 +209,7 @@
<ul>
<li>features
<ul>
<li>support of tqunicode with omega</li>
<li>support of unicode with omega</li>
</ul>
</li>
</ul>

@ -62,7 +62,7 @@ bool KWEFBaseWorker::doFullAllParagraphs (const TQValueList<ParaData>& paraList)
TQValueList<ParaData>::ConstIterator end(paraList.end());
for (it=paraList.begin();it!=end;++it)
{
if (!doFullParagraph((*it).text,(*it).tqlayout,(*it).formattingList))
if (!doFullParagraph((*it).text,(*it).layout,(*it).formattingList))
return false;
}
return true;

@ -57,7 +57,7 @@ class KOFFICEFILTER_EXPORT KWEFBaseWorker
virtual bool doVariableSettings (const VariableSettingsData &varSettings);
virtual bool doFullDocument (const TQValueList<ParaData> &);
virtual bool doFullAllParagraphs (const TQValueList<ParaData>& paraList);
virtual bool doFullParagraph(const TQString& paraText, const LayoutData& tqlayout,
virtual bool doFullParagraph(const TQString& paraText, const LayoutData& layout,
const ValueListFormatData& paraFormatDataList);
virtual bool doFullPaperFormat (const int format,
const double width, const double height, const int orientation); ///< Like AbiWord's \<papersize\>
@ -77,7 +77,7 @@ class KOFFICEFILTER_EXPORT KWEFBaseWorker
virtual bool doCloseBody (void); ///< Like HTML's \</BODY\>
virtual bool doOpenStyles (void); ///< Like HTML's \<style\>
virtual bool doCloseStyles (void); ///< Like HTML's \</style\>
virtual bool doFullDefineStyle (LayoutData& tqlayout); ///< Defines a single style
virtual bool doFullDefineStyle (LayoutData& layout); ///< Defines a single style
virtual bool doOpenSpellCheckIgnoreList (void); ///< like AbiWord's \<ignorewords\> and KWord's \<SPELLCHECKIGNORELIST\>
virtual bool doCloseSpellCheckIgnoreList (void); ///< like AbiWord's \</ignorewords\> and Kwords \</SPELLCHECKIGNORELIST\>
virtual bool doFullSpellCheckIgnoreWord (const TQString& ignoreword); ///< like AbiWord's \<iw\> and Kwords \</SPELLCHECKIGNOREWORD\>

@ -189,11 +189,11 @@ static void ProcessParagraphTag ( TQDomNode myNode,
TQValueList<TagProcessing> tagProcessingList;
tagProcessingList << TagProcessing ( "TEXT", ProcessTextTag, &paraData.text )
<< TagProcessing ( "FORMATS", ProcessFormatsTag, &paraData.formattingList )
<< TagProcessing ( "LAYOUT", ProcessLayoutTag, &paraData.tqlayout );
<< TagProcessing ( "LAYOUT", ProcessLayoutTag, &paraData.layout );
if ( leader->m_oldSyntax )
{
tagProcessingList.append( TagProcessing( "HARDBRK", ProcessHardBrkTag, &paraData.tqlayout.pageBreakBefore ) );
tagProcessingList.append( TagProcessing( "HARDBRK", ProcessHardBrkTag, &paraData.layout.pageBreakBefore ) );
}
ProcessSubtags (myNode, tagProcessingList, leader);
@ -203,9 +203,9 @@ static void ProcessParagraphTag ( TQDomNode myNode,
// TODO/FIXME: why !paraData.text.isEmpty()
if ( paraData.formattingList.isEmpty () && !paraData.text.isEmpty () )
{
if ( paraData.tqlayout.formatData.id == 1 )
if ( paraData.layout.formatData.id == 1 )
{
paraData.formattingList << paraData.tqlayout.formatData;
paraData.formattingList << paraData.layout.formatData;
}
else
{
@ -591,11 +591,11 @@ static void ProcessFramesetsTag ( TQDomNode myNode,
static void ProcessStyleTag (TQDomNode myNode, void *, KWEFKWordLeader *leader )
{
LayoutData tqlayout;
LayoutData layout;
ProcessLayoutTag (myNode, &tqlayout, leader);
ProcessLayoutTag (myNode, &layout, leader);
leader->doFullDefineStyle (tqlayout);
leader->doFullDefineStyle (layout);
}
@ -1227,10 +1227,10 @@ bool KWEFKWordLeader::doFullPaperFormatOther ( const int columns, const double c
return false;
}
bool KWEFKWordLeader::doFullDefineStyle ( LayoutData &tqlayout )
bool KWEFKWordLeader::doFullDefineStyle ( LayoutData &layout )
{
if ( m_worker )
return m_worker->doFullDefineStyle (tqlayout);
return m_worker->doFullDefineStyle (layout);
return false;
}

@ -63,7 +63,7 @@ class KOFFICEFILTER_EXPORT KWEFKWordLeader
bool doCloseBody (void);
bool doOpenStyles (void);
bool doCloseStyles (void);
bool doFullDefineStyle (LayoutData& tqlayout);
bool doFullDefineStyle (LayoutData& layout);
bool doOpenSpellCheckIgnoreList (void);
bool doCloseSpellCheckIgnoreList (void);
bool doFullSpellCheckIgnoreWord (const TQString& ignoreword);

@ -412,7 +412,7 @@ public:
virtual ~TabulatorList(void) {}
};
/// Paragraph tqlayout
/// Paragraph layout
class LayoutData
{
public:
@ -459,7 +459,7 @@ struct ParaData
{
TQString text;
ValueListFormatData formattingList;
LayoutData tqlayout;
LayoutData layout;
};
struct HeaderFooterData

@ -36,7 +36,7 @@ TQString KWEFUtil::EscapeSgmlText(const TQTextCodec* codec,
for (uint i=0; i<strIn.length(); i++)
{
ch=strIn[i];
switch (ch.tqunicode())
switch (ch.unicode())
{
case 38: // &
{
@ -78,7 +78,7 @@ TQString KWEFUtil::EscapeSgmlText(const TQTextCodec* codec,
{
if (!codec->canEncode(ch))
{
strReturn+=TQString("&#%1;").arg(ch.tqunicode());
strReturn+=TQString("&#%1;").arg(ch.unicode());
break;
}
}

@ -607,7 +607,7 @@ static void SubProcessFormatSixTag(TQDomNode myNode,
TQString instance;
TQValueList<TagProcessing> tagProcessingList;
// TODO: We can have all tqlayout information as in regular texts
// TODO: We can have all layout information as in regular texts
// They simply apply to the table frames
// FONT is just the first that we've come across so far
tagProcessingList << TagProcessing ( "FONT" )
@ -765,12 +765,12 @@ static void ProcessLayoutTabulatorTag ( TQDomNode myNode, void *tagData, KWEFKWo
static void ProcessIndentsTag (TQDomNode myNode, void *tagData, KWEFKWordLeader *leader )
{
LayoutData *tqlayout = (LayoutData *) tagData;
LayoutData *layout = (LayoutData *) tagData;
TQValueList<AttrProcessing> attrProcessingList;
attrProcessingList << AttrProcessing ("first" , tqlayout->indentFirst );
attrProcessingList << AttrProcessing ("left" , tqlayout->indentLeft );
attrProcessingList << AttrProcessing ("right" , tqlayout->indentRight );
attrProcessingList << AttrProcessing ("first" , layout->indentFirst );
attrProcessingList << AttrProcessing ("left" , layout->indentLeft );
attrProcessingList << AttrProcessing ("right" , layout->indentRight );
ProcessAttributes (myNode, attrProcessingList);
AllowNoSubtags (myNode, leader);
@ -779,11 +779,11 @@ static void ProcessIndentsTag (TQDomNode myNode, void *tagData, KWEFKWordLeader
static void ProcessLayoutOffsetTag ( TQDomNode myNode, void *tagData, KWEFKWordLeader *leader )
{
LayoutData *tqlayout = (LayoutData *) tagData;
LayoutData *layout = (LayoutData *) tagData;
TQValueList<AttrProcessing> attrProcessingList;
attrProcessingList << AttrProcessing ("after" , tqlayout->marginBottom );
attrProcessingList << AttrProcessing ("before" , tqlayout->marginTop );
attrProcessingList << AttrProcessing ("after" , layout->marginBottom );
attrProcessingList << AttrProcessing ("before" , layout->marginTop );
ProcessAttributes (myNode, attrProcessingList);
AllowNoSubtags (myNode, leader);
@ -792,14 +792,14 @@ static void ProcessLayoutOffsetTag ( TQDomNode myNode, void *tagData, KWEFKWordL
static void ProcessLineBreakingTag ( TQDomNode myNode, void *tagData, KWEFKWordLeader *leader )
{
LayoutData *tqlayout = (LayoutData *) tagData;
LayoutData *layout = (LayoutData *) tagData;
TQString strBefore, strAfter;
TQValueList<AttrProcessing> attrProcessingList;
attrProcessingList << AttrProcessing ( "linesTogether", tqlayout->keepLinesTogether );
attrProcessingList << AttrProcessing ( "hardFrameBreak", tqlayout->pageBreakBefore );
attrProcessingList << AttrProcessing ( "hardFrameBreakAfter", tqlayout->pageBreakAfter );
attrProcessingList << AttrProcessing ( "linesTogether", layout->keepLinesTogether );
attrProcessingList << AttrProcessing ( "hardFrameBreak", layout->pageBreakBefore );
attrProcessingList << AttrProcessing ( "hardFrameBreakAfter", layout->pageBreakAfter );
attrProcessingList << AttrProcessing ( "keepWithNext" ); // RTF import filter
ProcessAttributes (myNode, attrProcessingList);
@ -809,21 +809,21 @@ static void ProcessLineBreakingTag ( TQDomNode myNode, void *tagData, KWEFKWordL
static void ProcessShadowTag ( TQDomNode myNode, void *tagData, KWEFKWordLeader *leader)
{
LayoutData *tqlayout = (LayoutData *) tagData;
LayoutData *layout = (LayoutData *) tagData;
int red=0;
int green=0;
int blue=0;
TQValueList<AttrProcessing> attrProcessingList;
attrProcessingList << AttrProcessing ( "distance", tqlayout->shadowDistance );
attrProcessingList << AttrProcessing ( "direction", tqlayout->shadowDirection );
attrProcessingList << AttrProcessing ( "distance", layout->shadowDistance );
attrProcessingList << AttrProcessing ( "direction", layout->shadowDirection );
attrProcessingList << AttrProcessing ( "red", red );
attrProcessingList << AttrProcessing ( "green", green );
attrProcessingList << AttrProcessing ( "blue", blue );
ProcessAttributes (myNode, attrProcessingList);
tqlayout->shadowColor.setRgb(red,green,blue);
layout->shadowColor.setRgb(red,green,blue);
AllowNoSubtags (myNode, leader);
}
@ -856,7 +856,7 @@ static void ProcessFollowingTag ( TQDomNode myNode, void *tagData, KWEFKWordLead
static void ProcessLinespacingTag (TQDomNode myNode, void *tagData, KWEFKWordLeader* /*leader*/ )
{
LayoutData *tqlayout = (LayoutData *) tagData;
LayoutData *layout = (LayoutData *) tagData;
TQString oldValue, spacingType;
double spacingValue;
@ -873,9 +873,9 @@ static void ProcessLinespacingTag (TQDomNode myNode, void *tagData, KWEFKWordLea
{
// for old format
if( oldValue == "oneandhalf" )
tqlayout->lineSpacingType = LayoutData::LS_ONEANDHALF;
layout->lineSpacingType = LayoutData::LS_ONEANDHALF;
else if ( oldValue == "double" )
tqlayout->lineSpacingType = LayoutData::LS_DOUBLE;
layout->lineSpacingType = LayoutData::LS_DOUBLE;
else
{
bool ok = false;
@ -883,38 +883,38 @@ static void ProcessLinespacingTag (TQDomNode myNode, void *tagData, KWEFKWordLea
if ( ok && ( size >= 0.0 ) ) // 0 is allowed but negative values are not
{
// We have a valid size
tqlayout->lineSpacingType = LayoutData::LS_CUSTOM; // set to custom
tqlayout->lineSpacing = size;
layout->lineSpacingType = LayoutData::LS_CUSTOM; // set to custom
layout->lineSpacing = size;
}
else
tqlayout->lineSpacingType = LayoutData::LS_SINGLE; // assume single linespace
layout->lineSpacingType = LayoutData::LS_SINGLE; // assume single linespace
}
}
else
{
// for new format
if( spacingType == "oneandhalf" )
tqlayout->lineSpacingType = LayoutData::LS_ONEANDHALF;
layout->lineSpacingType = LayoutData::LS_ONEANDHALF;
else if ( spacingType == "double" )
tqlayout->lineSpacingType = LayoutData::LS_DOUBLE;
layout->lineSpacingType = LayoutData::LS_DOUBLE;
else if ( spacingType == "custom" )
tqlayout->lineSpacingType = LayoutData::LS_CUSTOM;
layout->lineSpacingType = LayoutData::LS_CUSTOM;
else if ( spacingType == "atleast" )
tqlayout->lineSpacingType = LayoutData::LS_ATLEAST;
layout->lineSpacingType = LayoutData::LS_ATLEAST;
else if ( spacingType == "multiple" )
tqlayout->lineSpacingType = LayoutData::LS_MULTIPLE;
layout->lineSpacingType = LayoutData::LS_MULTIPLE;
else if ( spacingType == "fixed" )
tqlayout->lineSpacingType = LayoutData::LS_FIXED;
layout->lineSpacingType = LayoutData::LS_FIXED;
else
tqlayout->lineSpacingType = LayoutData::LS_SINGLE; // assume single linespace
tqlayout->lineSpacing = spacingValue;
layout->lineSpacingType = LayoutData::LS_SINGLE; // assume single linespace
layout->lineSpacing = spacingValue;
}
}
static void ProcessLineSpaceTag (TQDomNode myNode, void *tagData, KWEFKWordLeader* /*leader*/ )
{
// <LINESPACE> is an old tag, of before syntax 1
LayoutData *tqlayout = (LayoutData *) tagData;
LayoutData *layout = (LayoutData *) tagData;
double spacingValue = 0.0;
TQValueList<AttrProcessing> attrProcessingList;
@ -923,13 +923,13 @@ static void ProcessLineSpaceTag (TQDomNode myNode, void *tagData, KWEFKWordLeade
attrProcessingList << AttrProcessing ( "inch" );
ProcessAttributes (myNode, attrProcessingList);
tqlayout->lineSpacingType = LayoutData::LS_CUSTOM; // set to custom
tqlayout->lineSpacing = spacingValue;
layout->lineSpacingType = LayoutData::LS_CUSTOM; // set to custom
layout->lineSpacing = spacingValue;
}
static void ProcessFlowTag ( TQDomNode myNode, void *tagData, KWEFKWordLeader *leader )
{
LayoutData *tqlayout = (LayoutData *) tagData;
LayoutData *layout = (LayoutData *) tagData;
TQString oldAlign, normalAlign;
@ -948,7 +948,7 @@ static void ProcessFlowTag ( TQDomNode myNode, void *tagData, KWEFKWordLeader *l
{
if ( oldAlign.isEmpty() )
{
tqlayout->alignment = "left"; // KWord 0.8 did not support right-to-left
layout->alignment = "left"; // KWord 0.8 did not support right-to-left
}
else
{
@ -956,19 +956,19 @@ static void ProcessFlowTag ( TQDomNode myNode, void *tagData, KWEFKWordLeader *l
if ( ( align < 0 ) || ( align > 3) )
{
kdWarning(30508) << "KWord 0.8 flow unknown: " << oldAlign << endl;
tqlayout->alignment = "left"; // Unknown, so assume left
layout->alignment = "left"; // Unknown, so assume left
}
else
{
const char* flows[]={"left", "right", "center", "justify" };
tqlayout->alignment = flows[ align ];
layout->alignment = flows[ align ];
}
}
kdDebug(30508) << "KWord 0.8 flow: " << oldAlign << " corrected: " << tqlayout->alignment << endl;
kdDebug(30508) << "KWord 0.8 flow: " << oldAlign << " corrected: " << layout->alignment << endl;
}
else
{
tqlayout->alignment = normalAlign;
layout->alignment = normalAlign;
}
}
@ -981,36 +981,36 @@ void ProcessLayoutTag ( TQDomNode myNode, void *tagData, KWEFKWordLeader *leader
attrProcessingList << AttrProcessing ( "outline" ); // Only in <STYLE>
ProcessAttributes (myNode, attrProcessingList);
LayoutData *tqlayout = (LayoutData *) tagData;
LayoutData *layout = (LayoutData *) tagData;
ValueListFormatData formatDataList;
TQValueList<TagProcessing> tagProcessingList;
tagProcessingList << TagProcessing ( "NAME", ProcessStringValueTag, &tqlayout->styleName );
tagProcessingList << TagProcessing ( "FOLLOWING", ProcessFollowingTag, &tqlayout->styleFollowing );
tagProcessingList << TagProcessing ( "FLOW", ProcessFlowTag, tqlayout );
tagProcessingList << TagProcessing ( "INDENTS", ProcessIndentsTag, tqlayout );
tagProcessingList << TagProcessing ( "OFFSETS", ProcessLayoutOffsetTag, tqlayout );
tagProcessingList << TagProcessing ( "LINESPACING", ProcessLinespacingTag, tqlayout );
tagProcessingList << TagProcessing ( "PAGEBREAKING", ProcessLineBreakingTag, tqlayout );
tagProcessingList << TagProcessing ( "LEFTBORDER", ProcessAnyBorderTag, &tqlayout->leftBorder );
tagProcessingList << TagProcessing ( "RIGHTBORDER", ProcessAnyBorderTag, &tqlayout->rightBorder );
tagProcessingList << TagProcessing ( "TOPBORDER", ProcessAnyBorderTag, &tqlayout->topBorder );
tagProcessingList << TagProcessing ( "BOTTOMBORDER", ProcessAnyBorderTag, &tqlayout->bottomBorder );
tagProcessingList << TagProcessing ( "COUNTER", ProcessCounterTag, &tqlayout->counter );
tagProcessingList << TagProcessing ( "NAME", ProcessStringValueTag, &layout->styleName );
tagProcessingList << TagProcessing ( "FOLLOWING", ProcessFollowingTag, &layout->styleFollowing );
tagProcessingList << TagProcessing ( "FLOW", ProcessFlowTag, layout );
tagProcessingList << TagProcessing ( "INDENTS", ProcessIndentsTag, layout );
tagProcessingList << TagProcessing ( "OFFSETS", ProcessLayoutOffsetTag, layout );
tagProcessingList << TagProcessing ( "LINESPACING", ProcessLinespacingTag, layout );
tagProcessingList << TagProcessing ( "PAGEBREAKING", ProcessLineBreakingTag, layout );
tagProcessingList << TagProcessing ( "LEFTBORDER", ProcessAnyBorderTag, &layout->leftBorder );
tagProcessingList << TagProcessing ( "RIGHTBORDER", ProcessAnyBorderTag, &layout->rightBorder );
tagProcessingList << TagProcessing ( "TOPBORDER", ProcessAnyBorderTag, &layout->topBorder );
tagProcessingList << TagProcessing ( "BOTTOMBORDER", ProcessAnyBorderTag, &layout->bottomBorder );
tagProcessingList << TagProcessing ( "COUNTER", ProcessCounterTag, &layout->counter );
tagProcessingList << TagProcessing ( "FORMAT", ProcessFormatTag, &formatDataList );
tagProcessingList << TagProcessing ( "TABULATOR", ProcessLayoutTabulatorTag, &tqlayout->tabulatorList );
tagProcessingList << TagProcessing ( "SHADOW", ProcessShadowTag, tqlayout );
tagProcessingList << TagProcessing ( "TABULATOR", ProcessLayoutTabulatorTag, &layout->tabulatorList );
tagProcessingList << TagProcessing ( "SHADOW", ProcessShadowTag, layout );
if ( leader->m_oldSyntax )
{
tqlayout->indentLeft = 0.0; // ### TODO: needed or not?
layout->indentLeft = 0.0; // ### TODO: needed or not?
tagProcessingList
<< TagProcessing ( "OHEAD", ProcessOldLayoutChildTag, &tqlayout->marginTop )
<< TagProcessing ( "OFOOT", ProcessOldLayoutChildTag, &tqlayout->marginBottom )
<< TagProcessing ( "ILEFT", ProcessOldLayoutChildTag, &tqlayout->indentLeft )
<< TagProcessing ( "IFIRST", ProcessOldLayoutChildTag, &tqlayout->indentFirst )
<< TagProcessing ( "LINESPACE", ProcessLineSpaceTag, tqlayout )
<< TagProcessing ( "OHEAD", ProcessOldLayoutChildTag, &layout->marginTop )
<< TagProcessing ( "OFOOT", ProcessOldLayoutChildTag, &layout->marginBottom )
<< TagProcessing ( "ILEFT", ProcessOldLayoutChildTag, &layout->indentLeft )
<< TagProcessing ( "IFIRST", ProcessOldLayoutChildTag, &layout->indentFirst )
<< TagProcessing ( "LINESPACE", ProcessLineSpaceTag, layout )
;
}
@ -1023,7 +1023,7 @@ void ProcessLayoutTag ( TQDomNode myNode, void *tagData, KWEFKWordLeader *leader
}
else
{
tqlayout->formatData = formatDataList.first ();
layout->formatData = formatDataList.first ();
if ( formatDataList.count () > 1 )
{
@ -1031,10 +1031,10 @@ void ProcessLayoutTag ( TQDomNode myNode, void *tagData, KWEFKWordLeader *leader
}
}
if ( tqlayout->styleName.isEmpty () )
if ( layout->styleName.isEmpty () )
{
tqlayout->styleName = "Standard";
kdWarning (30508) << "Empty tqlayout name!" << endl;
layout->styleName = "Standard";
kdWarning (30508) << "Empty layout name!" << endl;
}
}

@ -568,7 +568,7 @@ void KWordTextHandler::writeOutParagraph( const TQString& styleName, const TQStr
m_paragraph = TQString( "" );
m_index = 0;
m_oldLayout = layoutElement; // Keep a reference to the old tqlayout for some hacks
m_oldLayout = layoutElement; // Keep a reference to the old layout for some hacks
}
void KWordTextHandler::writeLayout( TQDomElement& parentElement, const wvWare::ParagraphProperties& paragraphProperties, const wvWare::Style* style )
@ -659,7 +659,7 @@ void KWordTextHandler::writeLayout( TQDomElement& parentElement, const wvWare::P
// which kword doesn't support. We map it to 0 with a clever '%4' :)
tabElement.setAttribute( "type", td.tbd.jc % 4 );
int filling = 0;
double width = 0.5; // default kword value, see koparagtqlayout.cc
double width = 0.5; // default kword value, see koparaglayout.cc
switch ( td.tbd.tlc ) {
case 1: // dots
case 2: // hyphenated

@ -1286,7 +1286,7 @@ public:
bool processTable (const Table &table)
{
// just dump the table out for now (no tqlayout)
// just dump the table out for now (no layout)
for (TQValueList <TableCell>::ConstIterator it = table.cellList.begin ();
it != table.cellList.end ();
it++)
@ -1417,12 +1417,12 @@ public:
bool doFullParagraph (const ParaData &paraData)
{
return doFullParagraph (paraData.text,
paraData.tqlayout,
paraData.layout,
paraData.formattingList);
}
bool doFullParagraph (const TQString &paraText,
const LayoutData &tqlayout,
const LayoutData &layout,
const ValueListFormatData &paraFormatDataList)
{
MSWrite::FormatParaProperty paraProp;
@ -1446,34 +1446,34 @@ public:
paraProp.setIsText (true);
// Alignment
if (!tqlayout.alignment.isEmpty ())
if (!layout.alignment.isEmpty ())
{
if (tqlayout.alignment == "left")
if (layout.alignment == "left")
// quite useless since MSWrite::Alignment::Left is the default anyway
paraProp.setAlignment (MSWrite::Alignment::Left);
else if (tqlayout.alignment == "right")
else if (layout.alignment == "right")
paraProp.setAlignment (MSWrite::Alignment::Right);
else if (tqlayout.alignment == "center")
else if (layout.alignment == "center")
paraProp.setAlignment (MSWrite::Alignment::Center);
else if (tqlayout.alignment == "justify")
else if (layout.alignment == "justify")
paraProp.setAlignment (MSWrite::Alignment::Justify);
else
kdWarning (30509) << "Unknown Alignment: " << tqlayout.alignment << endl;
kdWarning (30509) << "Unknown Alignment: " << layout.alignment << endl;
}
// Indentation
if (tqlayout.indentFirst) paraProp.setLeftIndentFirstLine (MSWrite::Short (Point2Twip (tqlayout.indentFirst)));
if (tqlayout.indentLeft >= 0) paraProp.setLeftIndent (MSWrite::Word (Point2Twip (tqlayout.indentLeft)));
if (tqlayout.indentRight >= 0) paraProp.setRightIndent (MSWrite::Word (Point2Twip (tqlayout.indentRight)));
if (layout.indentFirst) paraProp.setLeftIndentFirstLine (MSWrite::Short (Point2Twip (layout.indentFirst)));
if (layout.indentLeft >= 0) paraProp.setLeftIndent (MSWrite::Word (Point2Twip (layout.indentLeft)));
if (layout.indentRight >= 0) paraProp.setRightIndent (MSWrite::Word (Point2Twip (layout.indentRight)));
#if 0
kdDebug (30509) << "Indent: " << Point2Twip (tqlayout.indentFirst) << " "
<< Point2Twip (tqlayout.indentLeft) << " "
<< Point2Twip (tqlayout.indentRight) << endl;
kdDebug (30509) << "Indent: " << Point2Twip (layout.indentFirst) << " "
<< Point2Twip (layout.indentLeft) << " "
<< Point2Twip (layout.indentRight) << endl;
#endif
// Line Spacing
MSWrite::Word lineSpacing = MSWrite::LineSpacing::Normal;
switch (tqlayout.lineSpacingType)
switch (layout.lineSpacingType)
{
case LayoutData::LS_SINGLE:
lineSpacing = MSWrite::LineSpacing::Normal;
@ -1487,12 +1487,12 @@ public:
case LayoutData::LS_CUSTOM:
case LayoutData::LS_FIXED:
case LayoutData::LS_ATLEAST:
lineSpacing = getClosestLineSpacing (tqlayout.lineSpacing);
lineSpacing = getClosestLineSpacing (layout.lineSpacing);
break;
case LayoutData::LS_MULTIPLE:
break;
default:
kdWarning (30509) << "unknown lineSpacingType \'" << tqlayout.lineSpacingType << "\'" << endl;
kdWarning (30509) << "unknown lineSpacingType \'" << layout.lineSpacingType << "\'" << endl;
}
paraProp.setLineSpacing (lineSpacing);
@ -1500,8 +1500,8 @@ public:
// It seems that Write applies the 1st paragraph's Tabulator settings to the _entire_ document
// Word97 and KWord, however, will treat them like a Paragraph Property
int numTabs = 0;
for (TabulatorList::ConstIterator tabIt = tqlayout.tabulatorList.begin ();
tabIt != tqlayout.tabulatorList.end ();
for (TabulatorList::ConstIterator tabIt = layout.tabulatorList.begin ();
tabIt != layout.tabulatorList.end ();
tabIt++)
{
MSWrite::FormatParaPropertyTabulator tab;
@ -1544,7 +1544,7 @@ public:
// get this paragraph's "default formatting"
MSWrite::FormatCharProperty charPropDefault;
processFormatData (charPropDefault, tqlayout.formatData.text);
processFormatData (charPropDefault, layout.formatData.text);
MSWrite::DWord uptoByte = 0; // relative to start of KWord paragraph
MSWrite::DWord numBytes = paraText.length (); // relative to start of KWord paragraph
@ -1561,18 +1561,18 @@ public:
if (!m_generator->writeCharInfoBegin (&charPropDefault)) return false;
// page break at start of paragraph?
if (tqlayout.pageBreakBefore)
if (layout.pageBreakBefore)
if (!m_generator->writePageBreak ()) return false;
// counter data
processCounter (tqlayout.counter);
processCounter (layout.counter);
// end of line
if (!m_generator->writeCarriageReturn ()) return false;
if (!m_generator->writeNewLine (true/*end of paragraph*/)) return false;
// page break at end of paragraph?
if (tqlayout.pageBreakAfter)
if (layout.pageBreakAfter)
if (!m_generator->writePageBreak ()) return false;
// write default character property end
@ -1595,11 +1595,11 @@ public:
if (uptoByte == 0)
{
// page break at start of paragraph?
if (tqlayout.pageBreakBefore)
if (layout.pageBreakBefore)
if (!m_generator->writePageBreak ()) return false;
// counter data
processCounter (tqlayout.counter);
processCounter (layout.counter);
}
// yes, this is slightly premature but it doesn't matter
@ -1733,7 +1733,7 @@ public:
}
// page break at end of paragraph?
if (tqlayout.pageBreakAfter)
if (layout.pageBreakAfter)
if (!m_generator->writePageBreak ()) return false;
}

@ -183,7 +183,7 @@ namespace MSWrite
void setNumPages (const Word val) { m_numPages = val; }
};
// Page tqlayout information (margins, dimensions, ...)
// Page layout information (margins, dimensions, ...)
class PageLayoutGenerated : public NeedsDevice
{
public:

@ -96,7 +96,7 @@ TQString OOWriterWorker::escapeOOSpan(const TQString& strText) const
}
// ### TODO: would be switch/case or if/elseif the best?
switch (ch.tqunicode())
switch (ch.unicode())
{
case 9: // Tab
{
@ -180,7 +180,7 @@ TQString OOWriterWorker::escapeOOSpan(const TQString& strText) const
case 30:
case 31:
{
kdWarning(30518) << "Not allowed XML character: " << ch.tqunicode() << endl;
kdWarning(30518) << "Not allowed XML character: " << ch.unicode() << endl;
strReturn += '?';
break;
}
@ -1729,38 +1729,38 @@ void OOWriterWorker::processParagraphData ( const TQString &paraText,
}
TQString OOWriterWorker::layoutToParagraphStyle(const LayoutData& layoutOrigin,
const LayoutData& tqlayout, const bool force, TQString& styleKey)
const LayoutData& layout, const bool force, TQString& styleKey)
{
TQString props; // Props has to remain empty, if there is no difference.
styleKey += tqlayout.styleName;
styleKey += layout.styleName;
styleKey += ',';
if (force || (layoutOrigin.alignment!=tqlayout.alignment))
if (force || (layoutOrigin.alignment!=layout.alignment))
{
// NOTE: OO 1.0.x uses start and end like left and right (section 3.11.4)
// Unfortunately in XSL-FO's text-align, they are really supposed to be the start and the end.
if (tqlayout.alignment == "left")
if (layout.alignment == "left")
{
props += "fo:text-align=\"start\" ";
styleKey += 'L';
}
else if (tqlayout.alignment == "right")
else if (layout.alignment == "right")
{
props += "fo:text-align=\"end\" ";
styleKey += 'R';
}
else if (tqlayout.alignment == "center")
else if (layout.alignment == "center")
{
props += "fo:text-align=\"center\" ";
styleKey += 'C';
}
else if (tqlayout.alignment == "justify")
else if (layout.alignment == "justify")
{
props += "fo:text-align=\"justify\" ";
styleKey += 'J';
}
else if (tqlayout.alignment == "auto")
else if (layout.alignment == "auto")
{
props += "fo:text-align=\"start\" ";
#ifndef STRICT_OOWRITER_VERSION_1
@ -1770,68 +1770,68 @@ TQString OOWriterWorker::layoutToParagraphStyle(const LayoutData& layoutOrigin,
}
else
{
kdWarning(30518) << "Unknown alignment: " << tqlayout.alignment << endl;
kdWarning(30518) << "Unknown alignment: " << layout.alignment << endl;
}
}
styleKey += ',';
if ((tqlayout.indentLeft>=0.0)
&& (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft)))
if ((layout.indentLeft>=0.0)
&& (force || (layoutOrigin.indentLeft!=layout.indentLeft)))
{
props += TQString("fo:margin-left=\"%1pt\" ").arg(tqlayout.indentLeft);
styleKey += TQString::number(tqlayout.indentLeft);
props += TQString("fo:margin-left=\"%1pt\" ").arg(layout.indentLeft);
styleKey += TQString::number(layout.indentLeft);
}
styleKey += ',';
if ((tqlayout.indentRight>=0.0)
&& (force || (layoutOrigin.indentRight!=tqlayout.indentRight)))
if ((layout.indentRight>=0.0)
&& (force || (layoutOrigin.indentRight!=layout.indentRight)))
{
props += TQString("fo:margin-right=\"%1pt\" ").arg(tqlayout.indentRight);
styleKey += TQString::number(tqlayout.indentRight);
props += TQString("fo:margin-right=\"%1pt\" ").arg(layout.indentRight);
styleKey += TQString::number(layout.indentRight);
}
styleKey += ',';
if (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft))
if (force || (layoutOrigin.indentLeft!=layout.indentLeft))
{
props += "fo:text-indent=\"";
props += TQString::number(tqlayout.indentFirst);
props += TQString::number(layout.indentFirst);
props += "\" ";
styleKey += TQString::number(tqlayout.indentFirst);
styleKey += TQString::number(layout.indentFirst);
}
styleKey += ',';
if ((tqlayout.marginBottom>=0.0)
&& ( force || ( layoutOrigin.marginBottom != tqlayout.marginBottom ) ) )
if ((layout.marginBottom>=0.0)
&& ( force || ( layoutOrigin.marginBottom != layout.marginBottom ) ) )
{
props += TQString("fo:margin-bottom=\"%1pt\" ").arg(tqlayout.marginBottom);
styleKey += TQString::number(tqlayout.marginBottom);
props += TQString("fo:margin-bottom=\"%1pt\" ").arg(layout.marginBottom);
styleKey += TQString::number(layout.marginBottom);
}
styleKey += ',';
if ((tqlayout.marginTop>=0.0)
&& ( force || ( layoutOrigin.marginTop != tqlayout.marginTop ) ) )
if ((layout.marginTop>=0.0)
&& ( force || ( layoutOrigin.marginTop != layout.marginTop ) ) )
{
props += TQString("fo:margin-top=\"%1pt\" ").arg(tqlayout.marginTop);
styleKey += TQString::number(tqlayout.marginTop);
props += TQString("fo:margin-top=\"%1pt\" ").arg(layout.marginTop);
styleKey += TQString::number(layout.marginTop);
}
styleKey += ',';
if (force
|| ( layoutOrigin.lineSpacingType != tqlayout.lineSpacingType )
|| ( layoutOrigin.lineSpacing != tqlayout.lineSpacing ) )
|| ( layoutOrigin.lineSpacingType != layout.lineSpacingType )
|| ( layoutOrigin.lineSpacing != layout.lineSpacing ) )
{
switch ( tqlayout.lineSpacingType )
switch ( layout.lineSpacingType )
{
case LayoutData::LS_CUSTOM:
{
// We have a custom line spacing (in points)
const TQString height ( TQString::number(tqlayout.lineSpacing) ); // ### TODO: rounding?
const TQString height ( TQString::number(layout.lineSpacing) ); // ### TODO: rounding?
props += "style:line-spacing=\"";
props += height;
props += "pt\" ";
@ -1860,7 +1860,7 @@ TQString OOWriterWorker::layoutToParagraphStyle(const LayoutData& layoutOrigin,
case LayoutData::LS_MULTIPLE:
{
// OOWriter 1.1 only allows up to 200%
const TQString mult ( TQString::number( tqRound( tqlayout.lineSpacing * 100 ) ) );
const TQString mult ( TQString::number( tqRound( layout.lineSpacing * 100 ) ) );
props += "fo:line-height=\"";
props += mult;
props += "%\" ";
@ -1871,7 +1871,7 @@ TQString OOWriterWorker::layoutToParagraphStyle(const LayoutData& layoutOrigin,
case LayoutData::LS_FIXED:
{
// We have a fixed line height (in points)
const TQString height ( TQString::number(tqlayout.lineSpacing) ); // ### TODO: rounding?
const TQString height ( TQString::number(layout.lineSpacing) ); // ### TODO: rounding?
props += "fo:line-height=\"";
props += height;
props += "pt\" ";
@ -1882,7 +1882,7 @@ TQString OOWriterWorker::layoutToParagraphStyle(const LayoutData& layoutOrigin,
case LayoutData::LS_ATLEAST:
{
// We have a at-least line height (in points)
const TQString height ( TQString::number(tqlayout.lineSpacing) ); // ### TODO: rounding?
const TQString height ( TQString::number(layout.lineSpacing) ); // ### TODO: rounding?
props += "style:line-height-at-least=\"";
props += height;
props += "pt\" ";
@ -1892,7 +1892,7 @@ TQString OOWriterWorker::layoutToParagraphStyle(const LayoutData& layoutOrigin,
}
default:
{
kdWarning(30518) << "Unsupported lineSpacingType: " << tqlayout.lineSpacingType << " (Ignoring!)" << endl;
kdWarning(30518) << "Unsupported lineSpacingType: " << layout.lineSpacingType << " (Ignoring!)" << endl;
break;
}
}
@ -1900,7 +1900,7 @@ TQString OOWriterWorker::layoutToParagraphStyle(const LayoutData& layoutOrigin,
styleKey += ',';
if ( tqlayout.pageBreakBefore )
if ( layout.pageBreakBefore )
{
// We have a page break before the paragraph
props += "fo:page-break-before=\"page\" ";
@ -1909,7 +1909,7 @@ TQString OOWriterWorker::layoutToParagraphStyle(const LayoutData& layoutOrigin,
styleKey += ',';
if ( tqlayout.pageBreakAfter )
if ( layout.pageBreakAfter )
{
// We have a page break after the paragraph
props += "fo:page-break-after=\"page\" ";
@ -1918,20 +1918,20 @@ TQString OOWriterWorker::layoutToParagraphStyle(const LayoutData& layoutOrigin,
styleKey += '@'; // A more visible seperator
props += textFormatToStyle(layoutOrigin.formatData.text,tqlayout.formatData.text,force,styleKey);
props += textFormatToStyle(layoutOrigin.formatData.text,layout.formatData.text,force,styleKey);
props += ">";
styleKey += '@'; // A more visible seperator
// ### TODO/FIXME: what if all tabulators must be erased?
if (!tqlayout.tabulatorList.isEmpty()
&& (force || (layoutOrigin.tabulatorList!=tqlayout.tabulatorList) ))
if (!layout.tabulatorList.isEmpty()
&& (force || (layoutOrigin.tabulatorList!=layout.tabulatorList) ))
{
props += "\n <style:tab-stops>\n";
TabulatorList::ConstIterator it;
TabulatorList::ConstIterator end(tqlayout.tabulatorList.end());
for (it=tqlayout.tabulatorList.begin();it!=end;++it)
TabulatorList::ConstIterator end(layout.tabulatorList.end());
for (it=layout.tabulatorList.begin();it!=end;++it)
{
props+=" <style:tab-stop style:position=\"";
props += TQString::number((*it).m_ptpos);
@ -1966,27 +1966,27 @@ TQString OOWriterWorker::layoutToParagraphStyle(const LayoutData& layoutOrigin,
return props;
}
bool OOWriterWorker::doFullParagraph(const TQString& paraText, const LayoutData& tqlayout,
bool OOWriterWorker::doFullParagraph(const TQString& paraText, const LayoutData& layout,
const ValueListFormatData& paraFormatDataList)
{
const bool header = ( (tqlayout.counter.numbering == CounterData::NUM_CHAPTER)
&& (tqlayout.counter.depth<10) ); // ### TODO: Does OOWriter really limits to 10?
const bool header = ( (layout.counter.numbering == CounterData::NUM_CHAPTER)
&& (layout.counter.depth<10) ); // ### TODO: Does OOWriter really limits to 10?
if (header)
{
*m_streamOut << " <text:h text:level=\"";
*m_streamOut << TQString::number(tqlayout.counter.depth+1,10);
*m_streamOut << TQString::number(layout.counter.depth+1,10);
*m_streamOut << "\" ";
}
else
*m_streamOut << " <text:p ";
const LayoutData& styleLayout=m_styleMap[tqlayout.styleName];
const LayoutData& styleLayout=m_styleMap[layout.styleName];
TQString styleKey;
const TQString props(layoutToParagraphStyle(styleLayout,tqlayout,false,styleKey));
const TQString props(layoutToParagraphStyle(styleLayout,layout,false,styleKey));
TQString actualStyle(tqlayout.styleName);
TQString actualStyle(layout.styleName);
if (!props.isEmpty())
{
TQMap<TQString,TQString>::ConstIterator it ( m_mapParaStyleKeys.find(styleKey) );
@ -2003,7 +2003,7 @@ bool OOWriterWorker::doFullParagraph(const TQString& paraText, const LayoutData&
m_contentAutomaticStyles += " <style:style";
m_contentAutomaticStyles += " style:name=\"" + escapeOOText(automaticStyle) + "\"";
m_contentAutomaticStyles += " style:parent-style-name=\"" + escapeOOText(tqlayout.styleName) + "\"";
m_contentAutomaticStyles += " style:parent-style-name=\"" + escapeOOText(layout.styleName) + "\"";
m_contentAutomaticStyles += " style:family=\"paragraph\" style:class=\"text\"";
m_contentAutomaticStyles += ">\n";
m_contentAutomaticStyles += " <style:properties ";
@ -2032,7 +2032,7 @@ bool OOWriterWorker::doFullParagraph(const TQString& paraText, const LayoutData&
*m_streamOut << ">";
processParagraphData(paraText, tqlayout.formatData.text, paraFormatDataList);
processParagraphData(paraText, layout.formatData.text, paraFormatDataList);
if (header)
*m_streamOut << "</text:h>\n";
@ -2054,21 +2054,21 @@ bool OOWriterWorker::doOpenStyles(void)
return true;
}
bool OOWriterWorker::doFullDefineStyle(LayoutData& tqlayout)
bool OOWriterWorker::doFullDefineStyle(LayoutData& layout)
{
//Register style in the style map
m_styleMap[tqlayout.styleName]=tqlayout;
m_styleMap[layout.styleName]=layout;
m_styles += " <style:style";
m_styles += " style:name=\"" + escapeOOText( tqlayout.styleName ) + "\"";
m_styles += " style:next-style-name=\"" + escapeOOText( tqlayout.styleFollowing ) + "\"";
m_styles += " style:name=\"" + escapeOOText( layout.styleName ) + "\"";
m_styles += " style:next-style-name=\"" + escapeOOText( layout.styleFollowing ) + "\"";
m_styles += " style:family=\"paragraph\" style:class=\"text\"";
m_styles += ">\n";
m_styles += " <style:properties ";
TQString debugKey; // Not needed
m_styles += layoutToParagraphStyle(tqlayout,tqlayout,true,debugKey);
m_styles += layoutToParagraphStyle(layout,layout,true,debugKey);
kdDebug(30518) << "Defining style: " << debugKey << endl;
m_styles += "</style:properties>\n";

@ -68,7 +68,7 @@ public:
virtual bool doCloseFile(void); ///< Close file in normal conditions
virtual bool doOpenDocument(void);
virtual bool doCloseDocument(void);
virtual bool doFullParagraph(const TQString& paraText, const LayoutData& tqlayout,
virtual bool doFullParagraph(const TQString& paraText, const LayoutData& layout,
const ValueListFormatData& paraFormatDataList);
virtual bool doFullPaperFormat(const int format,
const double width, const double height, const int orientation);
@ -81,7 +81,7 @@ public:
virtual bool doFullPaperFormatOther ( const int columns, const double columnspacing, const int numPages );
virtual bool doOpenStyles(void);
virtual bool doCloseStyles(void);
virtual bool doFullDefineStyle(LayoutData& tqlayout);
virtual bool doFullDefineStyle(LayoutData& layout);
virtual bool doFullDocumentInfo(const KWEFDocumentInfo& docInfo);
virtual bool doVariableSettings(const VariableSettingsData& vs);
virtual bool doOpenBody (void);
@ -107,7 +107,7 @@ private:
TQString textFormatToStyle(const TextFormatting& formatOrigin,
const TextFormatting& formatData, const bool force, TQString& key);
TQString layoutToParagraphStyle(const LayoutData& layoutOrigin,
const LayoutData& tqlayout, const bool force, TQString& styleKey);
const LayoutData& layout, const bool force, TQString& styleKey);
TQString escapeOOText(const TQString& strText) const;
TQString escapeOOSpan(const TQString& strText) const;
TQString cellToProperties( const TableCell& cell, TQString& key) const;

@ -873,13 +873,13 @@ void OoWriterImport::writeCounter( TQDomDocument& doc, TQDomElement& layoutEleme
TQString bulletChar = listStyle.attributeNS( ooNS::text, "bullet-char", TQString() );