diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-21 14:05:41 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-21 14:05:41 -0600 |
| commit | 2d6954f69caf63ed5057bd8e1405a65d7d970292 (patch) | |
| tree | 88e6436b2e81d4e68313f02a9021054252e14cc4 | |
| parent | f0de9e167e289ab7dc33e57f077c1f04ec7c68c8 (diff) | |
| download | koffice-2d6954f69caf63ed5057bd8e1405a65d7d970292.tar.gz koffice-2d6954f69caf63ed5057bd8e1405a65d7d970292.zip | |
Rename obsolete tq methods to standard names
662 files changed, 3996 insertions, 3996 deletions
diff --git a/chalk/HACKING b/chalk/HACKING index c6f4ba66..a48526b0 100644 --- a/chalk/HACKING +++ b/chalk/HACKING @@ -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 diff --git a/chalk/chalkcolor/kis_basic_histogram_producers.h b/chalk/chalkcolor/kis_basic_histogram_producers.h index 8b913ece..83222765 100644 --- a/chalk/chalkcolor/kis_basic_histogram_producers.h +++ b/chalk/chalkcolor/kis_basic_histogram_producers.h @@ -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) **/ diff --git a/chalk/colorspaces/wet/kis_wet_palette_widget.cc b/chalk/colorspaces/wet/kis_wet_palette_widget.cc index 901f2909..7c115325 100644 --- a/chalk/colorspaces/wet/kis_wet_palette_widget.cc +++ b/chalk/colorspaces/wet/kis_wet_palette_widget.cc @@ -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"); diff --git a/chalk/doc/doc-outline b/chalk/doc/doc-outline index 081f9ed7..88722a45 100644 --- a/chalk/doc/doc-outline +++ b/chalk/doc/doc-outline @@ -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 diff --git a/chalk/doc/the preview widget b/chalk/doc/the preview widget index cc06b9de..a403da86 100644 --- a/chalk/doc/the preview widget +++ b/chalk/doc/the preview widget @@ -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. > diff --git a/chalk/plugins/filters/blur/wdgblur.ui b/chalk/plugins/filters/blur/wdgblur.ui index 56f9e1c7..8cd89f63 100644 --- a/chalk/plugins/filters/blur/wdgblur.ui +++ b/chalk/plugins/filters/blur/wdgblur.ui @@ -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"> diff --git a/chalk/plugins/filters/colorify/WdgColorifyBase.ui b/chalk/plugins/filters/colorify/WdgColorifyBase.ui index c3c5afc6..90337f22 100644 --- a/chalk/plugins/filters/colorify/WdgColorifyBase.ui +++ b/chalk/plugins/filters/colorify/WdgColorifyBase.ui @@ -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"> diff --git a/chalk/plugins/filters/colors/wdgcolortoalphabase.ui b/chalk/plugins/filters/colors/wdgcolortoalphabase.ui index ba89fd8f..70ff3071 100644 --- a/chalk/plugins/filters/colors/wdgcolortoalphabase.ui +++ b/chalk/plugins/filters/colors/wdgcolortoalphabase.ui @@ -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"> diff --git a/chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui b/chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui index 8cd59c00..3382102c 100644 --- a/chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui +++ b/chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui @@ -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"> diff --git a/chalk/plugins/filters/colorsfilters/wdg_perchannel.ui b/chalk/plugins/filters/colorsfilters/wdg_perchannel.ui index c2955071..7f413abc 100644 --- a/chalk/plugins/filters/colorsfilters/wdg_perchannel.ui +++ b/chalk/plugins/filters/colorsfilters/wdg_perchannel.ui @@ -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"> diff --git a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui index 9426d92c..860595e2 100644 --- a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui +++ b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui @@ -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"> diff --git a/chalk/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui b/chalk/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui index 78259420..97379cea 100644 --- a/chalk/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui +++ b/chalk/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> diff --git a/chalk/plugins/filters/levelfilter/wdg_level.ui b/chalk/plugins/filters/levelfilter/wdg_level.ui index 6ce5874b..f365e3d1 100644 --- a/chalk/plugins/filters/levelfilter/wdg_level.ui +++ b/chalk/plugins/filters/levelfilter/wdg_level.ui @@ -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"> diff --git a/chalk/plugins/paintops/defaultpaintops/kis_dlgbrushcurvecontrol.ui b/chalk/plugins/paintops/defaultpaintops/kis_dlgbrushcurvecontrol.ui index bca19dce..e88ecbe3 100644 --- a/chalk/plugins/paintops/defaultpaintops/kis_dlgbrushcurvecontrol.ui +++ b/chalk/plugins/paintops/defaultpaintops/kis_dlgbrushcurvecontrol.ui @@ -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"> diff --git a/chalk/plugins/tools/defaulttools/wdgcolorpicker.ui b/chalk/plugins/tools/defaulttools/wdgcolorpicker.ui index 0da52d4e..5463d3e3 100644 --- a/chalk/plugins/tools/defaulttools/wdgcolorpicker.ui +++ b/chalk/plugins/tools/defaulttools/wdgcolorpicker.ui @@ -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"> diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc index 4a59c384..d6c8dd23 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc @@ -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; diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc index cc164680..94c28e01 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc @@ -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))); diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc index 3028d121..c499f48a 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc @@ -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; diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc index 118281e1..de5b92f1 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc @@ -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; diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc index 8bac379c..a21b731e 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc @@ -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; diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc index 85a53c94..39f306ac 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc @@ -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; diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc index 54bfbdd6..3d580f89 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc @@ -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; diff --git a/chalk/plugins/tools/tool_crop/wdg_tool_crop.ui b/chalk/plugins/tools/tool_crop/wdg_tool_crop.ui index 7f929231..5cbcd476 100644 --- a/chalk/plugins/tools/tool_crop/wdg_tool_crop.ui +++ b/chalk/plugins/tools/tool_crop/wdg_tool_crop.ui @@ -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"> diff --git a/chalk/plugins/tools/tool_curves/kis_tool_curve.cc b/chalk/plugins/tools/tool_curves/kis_tool_curve.cc index d4a8605d..16d238fc 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_curve.cc +++ b/chalk/plugins/tools/tool_curves/kis_tool_curve.cc @@ -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; diff --git a/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc b/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc index 42806771..28545a50 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc +++ b/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc @@ -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); diff --git a/chalk/plugins/tools/tool_curves/wdg_tool_example.ui b/chalk/plugins/tools/tool_curves/wdg_tool_example.ui index 035eff3b..1384ff58 100644 --- a/chalk/plugins/tools/tool_curves/wdg_tool_example.ui +++ b/chalk/plugins/tools/tool_curves/wdg_tool_example.ui @@ -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"> diff --git a/chalk/plugins/tools/tool_star/wdg_tool_star.ui b/chalk/plugins/tools/tool_star/wdg_tool_star.ui index 3f4f30f5..a6395037 100644 --- a/chalk/plugins/tools/tool_star/wdg_tool_star.ui +++ b/chalk/plugins/tools/tool_star/wdg_tool_star.ui @@ -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"> diff --git a/chalk/plugins/tools/tool_transform/wdg_tool_transform.ui b/chalk/plugins/tools/tool_transform/wdg_tool_transform.ui index 8be9071b..5375d564 100644 --- a/chalk/plugins/tools/tool_transform/wdg_tool_transform.ui +++ b/chalk/plugins/tools/tool_transform/wdg_tool_transform.ui @@ -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"> diff --git a/chalk/plugins/viewplugins/colorrange/wdg_colorrange.ui b/chalk/plugins/viewplugins/colorrange/wdg_colorrange.ui index 4655a4d9..876f0319 100644 --- a/chalk/plugins/viewplugins/colorrange/wdg_colorrange.ui +++ b/chalk/plugins/viewplugins/colorrange/wdg_colorrange.ui @@ -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"> diff --git a/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc b/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc index bdda9901..e0bec7ec 100644 --- a/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc +++ b/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc @@ -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())); } diff --git a/chalk/plugins/viewplugins/histogram/wdghistogram.ui b/chalk/plugins/viewplugins/histogram/wdghistogram.ui index 0c5c5a9d..be6f9552 100644 --- a/chalk/plugins/viewplugins/histogram/wdghistogram.ui +++ b/chalk/plugins/viewplugins/histogram/wdghistogram.ui @@ -133,7 +133,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> diff --git a/chalk/plugins/viewplugins/performancetest/wdg_perftest.ui b/chalk/plugins/viewplugins/performancetest/wdg_perftest.ui index 20f66825..b019e9e1 100644 --- a/chalk/plugins/viewplugins/performancetest/wdg_perftest.ui +++ b/chalk/plugins/viewplugins/performancetest/wdg_perftest.ui @@ -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"> diff --git a/chalk/plugins/viewplugins/rotateimage/wdg_rotateimage.ui b/chalk/plugins/viewplugins/rotateimage/wdg_rotateimage.ui index 841341f7..af18881a 100644 --- a/chalk/plugins/viewplugins/rotateimage/wdg_rotateimage.ui +++ b/chalk/plugins/viewplugins/rotateimage/wdg_rotateimage.ui @@ -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"> diff --git a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp index 2a4c5029..32e825ee 100644 --- a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp +++ b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp @@ -162,7 +162,7 @@ bool KSnapshot::save( const KURL& url ) void KSnapshot::slotCopy() { - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); cb->setPixmap( snapshot ); } diff --git a/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp b/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp index 374033d6..c3675590 100644 --- a/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp +++ b/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp @@ -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(); diff --git a/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc b/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc index afaedeeb..ea387c45 100644 --- a/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc +++ b/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc @@ -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); diff --git a/chalk/plugins/viewplugins/substrate/wdgsubstrate.ui b/chalk/plugins/viewplugins/substrate/wdgsubstrate.ui index 3382fe1f..de5850d6 100644 --- a/chalk/plugins/viewplugins/substrate/wdgsubstrate.ui +++ b/chalk/plugins/viewplugins/substrate/wdgsubstrate.ui @@ -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"> diff --git a/chalk/plugins/viewplugins/variations/wdg_variations.ui b/chalk/plugins/viewplugins/variations/wdg_variations.ui index 45795b42..a9c7adea 100644 --- a/chalk/plugins/viewplugins/variations/wdg_variations.ui +++ b/chalk/plugins/viewplugins/variations/wdg_variations.ui @@ -228,7 +228,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <property name="geometry"> <rect> diff --git a/chalk/ui/kis_brush_chooser.cc b/chalk/ui/kis_brush_chooser.cc index 894db607..0e06a781 100644 --- a/chalk/ui/kis_brush_chooser.cc +++ b/chalk/ui/kis_brush_chooser.cc @@ -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); diff --git a/chalk/ui/kis_clipboard.cc b/chalk/ui/kis_clipboard.cc index 702ec210..0c3f65e7 100644 --- a/chalk/ui/kis_clipboard.cc +++ b/chalk/ui/kis_clipboard.cc @@ -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(); diff --git a/chalk/ui/kis_color_cup.cc b/chalk/ui/kis_color_cup.cc index b691295c..fe2b93fd 100644 --- a/chalk/ui/kis_color_cup.cc +++ b/chalk/ui/kis_color_cup.cc @@ -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() ); } } diff --git a/chalk/ui/kis_controlframe.cc b/chalk/ui/kis_controlframe.cc index fab8c4bb..74f3cd0a 100644 --- a/chalk/ui/kis_controlframe.cc +++ b/chalk/ui/kis_controlframe.cc @@ -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); diff --git a/chalk/ui/kis_dlg_adj_layer_props.cc b/chalk/ui/kis_dlg_adj_layer_props.cc index f5227eee..159d966f 100644 --- a/chalk/ui/kis_dlg_adj_layer_props.cc +++ b/chalk/ui/kis_dlg_adj_layer_props.cc @@ -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"); diff --git a/chalk/ui/kis_dlg_adjustment_layer.cc b/chalk/ui/kis_dlg_adjustment_layer.cc index 0594659b..9819228e 100644 --- a/chalk/ui/kis_dlg_adjustment_layer.cc +++ b/chalk/ui/kis_dlg_adjustment_layer.cc @@ -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 { diff --git a/chalk/ui/kis_dlg_layer_properties.cc b/chalk/ui/kis_dlg_layer_properties.cc index 7742969b..500d29a1 100644 --- a/chalk/ui/kis_dlg_layer_properties.cc +++ b/chalk/ui/kis_dlg_layer_properties.cc @@ -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); diff --git a/chalk/ui/kis_dlg_new_layer.cc b/chalk/ui/kis_dlg_new_layer.cc index 154dbf2c..4eb5a409 100644 --- a/chalk/ui/kis_dlg_new_layer.cc +++ b/chalk/ui/kis_dlg_new_layer.cc @@ -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")); diff --git a/chalk/ui/kis_double_widget.cc b/chalk/ui/kis_double_widget.cc index 6c03b3e9..a966691d 100644 --- a/chalk/ui/kis_double_widget.cc +++ b/chalk/ui/kis_double_widget.cc @@ -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); diff --git a/chalk/ui/kis_gradient_chooser.cc b/chalk/ui/kis_gradient_chooser.cc index 203f0718..098efb55 100644 --- a/chalk/ui/kis_gradient_chooser.cc +++ b/chalk/ui/kis_gradient_chooser.cc @@ -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); diff --git a/chalk/ui/kis_int_spinbox.cc b/chalk/ui/kis_int_spinbox.cc index 108d60fe..92573c9f 100644 --- a/chalk/ui/kis_int_spinbox.cc +++ b/chalk/ui/kis_int_spinbox.cc @@ -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) diff --git a/chalk/ui/kis_palette_widget.cc b/chalk/ui/kis_palette_widget.cc index 892686b3..5511ae09 100644 --- a/chalk/ui/kis_palette_widget.cc +++ b/chalk/ui/kis_palette_widget.cc @@ -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()); diff --git a/chalk/ui/kis_pattern_chooser.cc b/chalk/ui/kis_pattern_chooser.cc index 9dd99023..b05f62a0 100644 --- a/chalk/ui/kis_pattern_chooser.cc +++ b/chalk/ui/kis_pattern_chooser.cc @@ -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); diff --git a/chalk/ui/kis_previewdialog.cc b/chalk/ui/kis_previewdialog.cc index e2857c19..d67d5e58 100644 --- a/chalk/ui/kis_previewdialog.cc +++ b/chalk/ui/kis_previewdialog.cc @@ -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() diff --git a/chalk/ui/kis_previewwidgetbase.ui b/chalk/ui/kis_previewwidgetbase.ui index 8e7bf40a..6ba86353 100644 --- a/chalk/ui/kis_previewwidgetbase.ui +++ b/chalk/ui/kis_previewwidgetbase.ui @@ -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"> diff --git a/chalk/ui/kis_selection_manager.cc b/chalk/ui/kis_selection_manager.cc index 0655b834..5d7a31d1 100644 --- a/chalk/ui/kis_selection_manager.cc +++ b/chalk/ui/kis_selection_manager.cc @@ -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())); } diff --git a/chalk/ui/kis_tool_paint.cc b/chalk/ui/kis_tool_paint.cc index 9d37dae6..995a3fe4 100644 --- a/chalk/ui/kis_tool_paint.cc +++ b/chalk/ui/kis_tool_paint.cc @@ -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) diff --git a/chalk/ui/kis_tool_paint.h b/chalk/ui/kis_tool_paint.h index 7fb4b819..565d1476 100644 --- a/chalk/ui/kis_tool_paint.h +++ b/chalk/ui/kis_tool_paint.h @@ -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(); diff --git a/chalk/ui/kis_view.cc b/chalk/ui/kis_view.cc index 629072ff..decc9eca 100644 --- a/chalk/ui/kis_view.cc +++ b/chalk/ui/kis_view.cc @@ -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; diff --git a/chalk/ui/layerlist.cpp b/chalk/ui/layerlist.cpp index 58d28358..19f49200 100644 --- a/chalk/ui/layerlist.cpp +++ b/chalk/ui/layerlist.cpp @@ -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() diff --git a/chalk/ui/squeezedcombobox.cpp b/chalk/ui/squeezedcombobox.cpp index 31a044f2..d0cd8825 100644 --- a/chalk/ui/squeezedcombobox.cpp +++ b/chalk/ui/squeezedcombobox.cpp @@ -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()); } diff --git a/chalk/ui/wdgautobrush.ui b/chalk/ui/wdgautobrush.ui index 632a0398..6d3a572d 100644 --- a/chalk/ui/wdgautobrush.ui +++ b/chalk/ui/wdgautobrush.ui @@ -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"> diff --git a/chalk/ui/wdgautogradient.ui b/chalk/ui/wdgautogradient.ui index 3a2ca629..aec6907d 100644 --- a/chalk/ui/wdgautogradient.ui +++ b/chalk/ui/wdgautogradient.ui @@ -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> diff --git a/chalk/ui/wdgbirdeye.ui b/chalk/ui/wdgbirdeye.ui index d0078c8b..506e2803 100644 --- a/chalk/ui/wdgbirdeye.ui +++ b/chalk/ui/wdgbirdeye.ui @@ -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"> diff --git a/chalk/ui/wdgcolorsettings.ui b/chalk/ui/wdgcolorsettings.ui index 10346895..f4a0f695 100644 --- a/chalk/ui/wdgcolorsettings.ui +++ b/chalk/ui/wdgcolorsettings.ui @@ -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"> diff --git a/chalk/ui/wdgcustombrush.ui b/chalk/ui/wdgcustombrush.ui index bc6f898a..f1c67ffa 100644 --- a/chalk/ui/wdgcustombrush.ui +++ b/chalk/ui/wdgcustombrush.ui @@ -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"> diff --git a/chalk/ui/wdgcustompattern.ui b/chalk/ui/wdgcustompattern.ui index 4783a4a1..5b03a7f0 100644 --- a/chalk/ui/wdgcustompattern.ui +++ b/chalk/ui/wdgcustompattern.ui @@ -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"> diff --git a/chalk/ui/wdgdisplaysettings.ui b/chalk/ui/wdgdisplaysettings.ui index 3a32af21..757b6b27 100644 --- a/chalk/ui/wdgdisplaysettings.ui +++ b/chalk/ui/wdgdisplaysettings.ui @@ -49,7 +49,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <vbox> <property name="name"> diff --git a/chalk/ui/wdggeneralsettings.ui b/chalk/ui/wdggeneralsettings.ui index 9dfd1ff4..9383fbfd 100644 --- a/chalk/ui/wdggeneralsettings.ui +++ b/chalk/ui/wdggeneralsettings.ui @@ -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"> diff --git a/chalk/ui/wdggridsettings.ui b/chalk/ui/wdggridsettings.ui index 23ba8ba7..dbb90e0a 100644 --- a/chalk/ui/wdggridsettings.ui +++ b/chalk/ui/wdggridsettings.ui @@ -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"> diff --git a/chalk/ui/wdglayerbox.ui b/chalk/ui/wdglayerbox.ui index d276a2cf..02c15129 100644 --- a/chalk/ui/wdglayerbox.ui +++ b/chalk/ui/wdglayerbox.ui @@ -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"> diff --git a/chalk/ui/wdgnewimage.ui b/chalk/ui/wdgnewimage.ui index b1b607ef..82548e11 100644 --- a/chalk/ui/wdgnewimage.ui +++ b/chalk/ui/wdgnewimage.ui @@ -316,7 +316,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> diff --git a/chalk/ui/wdgpalettechooser.ui b/chalk/ui/wdgpalettechooser.ui index 3f8797d1..c4de4e1d 100644 --- a/chalk/ui/wdgpalettechooser.ui +++ b/chalk/ui/wdgpalettechooser.ui @@ -29,7 +29,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> diff --git a/chalk/ui/wdgperformancesettings.ui b/chalk/ui/wdgperformancesettings.ui index 1d3110d5..82deb5b9 100644 --- a/chalk/ui/wdgperformancesettings.ui +++ b/chalk/ui/wdgperformancesettings.ui @@ -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"> diff --git a/chalk/ui/wdgselectionoptions.ui b/chalk/ui/wdgselectionoptions.ui index ca71ee01..f6f02f39 100644 --- a/chalk/ui/wdgselectionoptions.ui +++ b/chalk/ui/wdgselectionoptions.ui @@ -24,7 +24,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> diff --git a/chalk/ui/wdgtabletdevicesettings.ui b/chalk/ui/wdgtabletdevicesettings.ui index 091997bf..44a43e94 100644 --- a/chalk/ui/wdgtabletdevicesettings.ui +++ b/chalk/ui/wdgtabletdevicesettings.ui @@ -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"> diff --git a/chalk/ui/wdgtabletsettings.ui b/chalk/ui/wdgtabletsettings.ui index 34688d5d..41be6f39 100644 --- a/chalk/ui/wdgtabletsettings.ui +++ b/chalk/ui/wdgtabletsettings.ui @@ -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"> diff --git a/chalk/ui/wdgtextbrush.ui b/chalk/ui/wdgtextbrush.ui index 114c4baa..e51a4d6c 100644 --- a/chalk/ui/wdgtextbrush.ui +++ b/chalk/ui/wdgtextbrush.ui @@ -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"> diff --git a/filters/chalk/jpeg/kis_wdg_options_jpeg.ui b/filters/chalk/jpeg/kis_wdg_options_jpeg.ui index 8222cd77..456fc67a 100644 --- a/filters/chalk/jpeg/kis_wdg_options_jpeg.ui +++ b/filters/chalk/jpeg/kis_wdg_options_jpeg.ui @@ -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"> diff --git a/filters/chalk/pdf/pdfimportwidgetbase.ui b/filters/chalk/pdf/pdfimportwidgetbase.ui index c91ecd99..88d24dc6 100644 --- a/filters/chalk/pdf/pdfimportwidgetbase.ui +++ b/filters/chalk/pdf/pdfimportwidgetbase.ui @@ -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"> diff --git a/filters/chalk/png/kis_wdg_options_png.ui b/filters/chalk/png/kis_wdg_options_png.ui index dcb733b8..5797c407 100644 --- a/filters/chalk/png/kis_wdg_options_png.ui +++ b/filters/chalk/png/kis_wdg_options_png.ui @@ -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"> diff --git a/filters/chalk/raw/wdgrawimport.ui b/filters/chalk/raw/wdgrawimport.ui index ffd7c59d..59d9642e 100644 --- a/filters/chalk/raw/wdgrawimport.ui +++ b/filters/chalk/raw/wdgrawimport.ui @@ -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"> diff --git a/filters/chalk/tiff/kis_wdg_options_tiff.ui b/filters/chalk/tiff/kis_wdg_options_tiff.ui index f1854d43..29038890 100644 --- a/filters/chalk/tiff/kis_wdg_options_tiff.ui +++ b/filters/chalk/tiff/kis_wdg_options_tiff.ui @@ -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"> diff --git a/filters/karbon/applixgraphics/applixgraphicimport.cc b/filters/karbon/applixgraphics/applixgraphicimport.cc index 82debb58..fd81b108 100644 --- a/filters/karbon/applixgraphics/applixgraphicimport.cc +++ b/filters/karbon/applixgraphics/applixgraphicimport.cc @@ -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"; diff --git a/filters/karbon/kontour/kontourimport.cpp b/filters/karbon/kontour/kontourimport.cpp index 6e515b3f..30b77ccf 100644 --- a/filters/karbon/kontour/kontourimport.cpp +++ b/filters/karbon/kontour/kontourimport.cpp @@ -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 { diff --git a/filters/karbon/xfig/xfigimport.cc b/filters/karbon/xfig/xfigimport.cc index 015c4006..c3d6ab6a 100644 --- a/filters/karbon/xfig/xfigimport.cc +++ b/filters/karbon/xfig/xfigimport.cc @@ -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; diff --git a/filters/kformula/png/pngexportdia.cc b/filters/kformula/png/pngexportdia.cc index fb0407e0..21d321ca 100644 --- a/filters/kformula/png/pngexportdia.cc +++ b/filters/kformula/png/pngexportdia.cc @@ -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(); } diff --git a/filters/kpresenter/magicpoint/mgp2kpr.py b/filters/kpresenter/magicpoint/mgp2kpr.py index c0609de6..97527471 100755 --- a/filters/kpresenter/magicpoint/mgp2kpr.py +++ b/filters/kpresenter/magicpoint/mgp2kpr.py @@ -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) diff --git a/filters/kpresenter/ooimpress/ooimpressexport.cc b/filters/kpresenter/ooimpress/ooimpressexport.cc index 55a3e265..47173cb9 100644 --- a/filters/kpresenter/ooimpress/ooimpressexport.cc +++ b/filters/kpresenter/ooimpress/ooimpressexport.cc @@ -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 ) { diff --git a/filters/kpresenter/powerpoint/import/powerpointimport.cc b/filters/kpresenter/powerpoint/import/powerpointimport.cc index 8b9d1e77..7b84c3d0 100644 --- a/filters/kpresenter/powerpoint/import/powerpointimport.cc +++ b/filters/kpresenter/powerpoint/import/powerpointimport.cc @@ -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 ) diff --git a/filters/kpresenter/powerpoint/libppt/pole.cpp b/filters/kpresenter/powerpoint/libppt/pole.cpp index abfa9385..2a78b79f 100644 --- a/filters/kpresenter/powerpoint/libppt/pole.cpp +++ b/filters/kpresenter/powerpoint/libppt/pole.cpp @@ -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 diff --git a/filters/kpresenter/powerpoint/libppt/ustring.cpp b/filters/kpresenter/powerpoint/libppt/ustring.cpp index 23b61d30..b0a44e56 100644 --- a/filters/kpresenter/powerpoint/libppt/ustring.cpp +++ b/filters/kpresenter/powerpoint/libppt/ustring.cpp @@ -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); } diff --git a/filters/kpresenter/powerpoint/libppt/ustring.h b/filters/kpresenter/powerpoint/libppt/ustring.h index c0e34cf4..52a43afe 100644 --- a/filters/kpresenter/powerpoint/libppt/ustring.h +++ b/filters/kpresenter/powerpoint/libppt/ustring.h @@ -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. */ diff --git a/filters/kspread/csv/dialogui.ui b/filters/kspread/csv/dialogui.ui index 6f7633ec..f8960f4b 100644 --- a/filters/kspread/csv/dialogui.ui +++ b/filters/kspread/csv/dialogui.ui @@ -66,7 +66,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> diff --git a/filters/kspread/csv/exportdialogui.ui b/filters/kspread/csv/exportdialogui.ui index d02f6712..f6a552e1 100644 --- a/filters/kspread/csv/exportdialogui.ui +++ b/filters/kspread/csv/exportdialogui.ui @@ -47,7 +47,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> diff --git a/filters/kspread/excel/sidewinder/excel.cpp b/filters/kspread/excel/sidewinder/excel.cpp index 6985a434..2a3a6247 100644 --- a/filters/kspread/excel/sidewinder/excel.cpp +++ b/filters/kspread/excel/sidewinder/excel.cpp @@ -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. diff --git a/filters/kspread/excel/sidewinder/excel.h b/filters/kspread/excel/sidewinder/excel.h index c05d223b..5221b518 100644 --- a/filters/kspread/excel/sidewinder/excel.h +++ b/filters/kspread/excel/sidewinder/excel.h @@ -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 ); diff --git a/filters/kspread/excel/sidewinder/pole.cpp b/filters/kspread/excel/sidewinder/pole.cpp index 6f12ae13..e4090cd9 100644 --- a/filters/kspread/excel/sidewinder/pole.cpp +++ b/filters/kspread/excel/sidewinder/pole.cpp @@ -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 diff --git a/filters/kspread/excel/sidewinder/ustring.cpp b/filters/kspread/excel/sidewinder/ustring.cpp index b26ee196..304fed18 100644 --- a/filters/kspread/excel/sidewinder/ustring.cpp +++ b/filters/kspread/excel/sidewinder/ustring.cpp @@ -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); } diff --git a/filters/kspread/excel/sidewinder/ustring.h b/filters/kspread/excel/sidewinder/ustring.h index 1c4f2bc5..3f41867b 100644 --- a/filters/kspread/excel/sidewinder/ustring.h +++ b/filters/kspread/excel/sidewinder/ustring.h @@ -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. */ diff --git a/filters/kspread/gnumeric/gnumericexport.cc b/filters/kspread/gnumeric/gnumericexport.cc index b0709ede..22cc7407 100644 --- a/filters/kspread/gnumeric/gnumericexport.cc +++ b/filters/kspread/gnumeric/gnumericexport.cc @@ -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; diff --git a/filters/kspread/gnumeric/status.html b/filters/kspread/gnumeric/status.html index 7bd198cc..a25cdf4b 100644 --- a/filters/kspread/gnumeric/status.html +++ b/filters/kspread/gnumeric/status.html @@ -211,7 +211,7 @@ Bold <br>Cell Size:Qt::Horizontal &Qt::Vertical <br>Hidden columns/rows <br>Selected Tab -<br>Paper tqlayout +<br>Paper layout <br>area name <br>Cell comment <br>Text Rotation diff --git a/filters/kspread/html/exportwidget.ui b/filters/kspread/html/exportwidget.ui index cfaedfa7..1b6ad59b 100644 --- a/filters/kspread/html/exportwidget.ui +++ b/filters/kspread/html/exportwidget.ui @@ -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"> diff --git a/filters/kspread/kexi/kspread_kexiimportdialogbase.ui b/filters/kspread/kexi/kspread_kexiimportdialogbase.ui index 82f95406..fad0e0be 100644 --- a/filters/kspread/kexi/kspread_kexiimportdialogbase.ui +++ b/filters/kspread/kexi/kspread_kexiimportdialogbase.ui @@ -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"> diff --git a/filters/kspread/latex/export/config.h b/filters/kspread/latex/export/config.h index 6e35bd1c..80549c41 100644 --- a/filters/kspread/latex/export/config.h +++ b/filters/kspread/latex/export/config.h @@ -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; } diff --git a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc index 7713a9dc..7a058550 100644 --- a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc +++ b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc @@ -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"); diff --git a/filters/kspread/opencalc/opencalcimport.cc b/filters/kspread/opencalc/opencalcimport.cc index 8e0327c9..60412181 100644 --- a/filters/kspread/opencalc/opencalcimport.cc +++ b/filters/kspread/opencalc/opencalcimport.cc @@ -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(); } diff --git a/filters/kspread/opencalc/opencalcimport.h b/filters/kspread/opencalc/opencalcimport.h index 071a87ff..8965dae5 100644 --- a/filters/kspread/opencalc/opencalcimport.h +++ b/filters/kspread/opencalc/opencalcimport.h @@ -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, diff --git a/filters/kspread/opencalc/status.html b/filters/kspread/opencalc/status.html index 2bd1fc05..b23f6ae9 100644 --- a/filters/kspread/opencalc/status.html +++ b/filters/kspread/opencalc/status.html @@ -51,7 +51,7 @@ KOffice filters status: 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: 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> diff --git a/filters/kword/abiword/ImportFormatting.cc b/filters/kword/abiword/ImportFormatting.cc index 1687e958..7c45f07a 100644 --- a/filters/kword/abiword/ImportFormatting.cc +++ b/filters/kword/abiword/ImportFormatting.cc @@ -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 { diff --git a/filters/kword/abiword/abiwordexport.cc b/filters/kword/abiword/abiwordexport.cc index d4a9819f..cacfcea7 100644 --- a/filters/kword/abiword/abiwordexport.cc +++ b/filters/kword/abiword/abiwordexport.cc @@ -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 ¶Text, } 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) diff --git a/filters/kword/abiword/abiwordimport.cc b/filters/kword/abiword/abiwordimport.cc index b21c6609..2c7e4d3f 100644 --- a/filters/kword/abiword/abiwordimport.cc +++ b/filters/kword/abiword/abiwordimport.cc @@ -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); diff --git a/filters/kword/amipro/FileFormat.txt b/filters/kword/amipro/FileFormat.txt index f628f595..15f20037 100644 --- a/filters/kword/amipro/FileFormat.txt +++ b/filters/kword/amipro/FileFormat.txt @@ -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] diff --git a/filters/kword/amipro/amiproexport.cc b/filters/kword/amipro/amiproexport.cc index 4084d335..e6703fc0 100644 --- a/filters/kword/amipro/amiproexport.cc +++ b/filters/kword/amipro/amiproexport.cc @@ -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; diff --git a/filters/kword/amipro/amiproimport.cc b/filters/kword/amipro/amiproimport.cc index 6061da20..fe45ca18 100644 --- a/filters/kword/amipro/amiproimport.cc +++ b/filters/kword/amipro/amiproimport.cc @@ -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; diff --git a/filters/kword/amipro/amiproparser.cpp b/filters/kword/amipro/amiproparser.cpp index 8d2bed03..3b07c201 100644 --- a/filters/kword/amipro/amiproparser.cpp +++ b/filters/kword/amipro/amiproparser.cpp @@ -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 = ""; diff --git a/filters/kword/amipro/amiproparser.h b/filters/kword/amipro/amiproparser.h index 40a8f82b..b6f07753 100644 --- a/filters/kword/amipro/amiproparser.h +++ b/filters/kword/amipro/amiproparser.h @@ -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 ); }; diff --git a/filters/kword/ascii/ExportDialogUI.ui b/filters/kword/ascii/ExportDialogUI.ui index 8ba0d757..9345a64c 100644 --- a/filters/kword/ascii/ExportDialogUI.ui +++ b/filters/kword/ascii/ExportDialogUI.ui @@ -29,7 +29,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> diff --git a/filters/kword/ascii/ImportDialogUI.ui b/filters/kword/ascii/ImportDialogUI.ui index d173386f..4b32a441 100644 --- a/filters/kword/ascii/ImportDialogUI.ui +++ b/filters/kword/ascii/ImportDialogUI.ui @@ -29,7 +29,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> diff --git a/filters/kword/ascii/asciiexport.cc b/filters/kword/ascii/asciiexport.cc index 7bba005c..f31818f9 100644 --- a/filters/kword/ascii/asciiexport.cc +++ b/filters/kword/ascii/asciiexport.cc @@ -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++) diff --git a/filters/kword/docbook/docbookexport.cc b/filters/kword/docbook/docbookexport.cc index 372a3b5c..f54bec6b 100644 --- a/filters/kword/docbook/docbookexport.cc +++ b/filters/kword/docbook/docbookexport.cc @@ -296,12 +296,12 @@ void DocBookWorker::ProcessParagraphData ( const ParaData ¶, 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 ¶, 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> ¶List ) 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> ¶List ) 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> ¶List ) 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> ¶List ) 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" ); diff --git a/filters/kword/hancomword/pole.cpp b/filters/kword/hancomword/pole.cpp index 261ef526..cb3771f5 100644 --- a/filters/kword/hancomword/pole.cpp +++ b/filters/kword/hancomword/pole.cpp @@ -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 diff --git a/filters/kword/html/export/ExportBasic.cc b/filters/kword/html/export/ExportBasic.cc index b0290371..8199f173 100644 --- a/filters/kword/html/export/ExportBasic.cc +++ b/filters/kword/html/export/ExportBasic.cc @@ -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"; } diff --git a/filters/kword/html/export/ExportBasic.h b/filters/kword/html/export/ExportBasic.h index a6de0082..c8f2864c 100644 --- a/filters/kword/html/export/ExportBasic.h +++ b/filters/kword/html/export/ExportBasic.h @@ -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\> diff --git a/filters/kword/html/export/ExportCss.cc b/filters/kword/html/export/ExportCss.cc index 52d56fbf..7af3dcdf 100644 --- a/filters/kword/html/export/ExportCss.cc +++ b/filters/kword/html/export/ExportCss.cc @@ -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; } diff --git a/filters/kword/html/export/ExportCss.h b/filters/kword/html/export/ExportCss.h index 358ea688..a33a0049 100644 --- a/filters/kword/html/export/ExportCss.h +++ b/filters/kword/html/export/ExportCss.h @@ -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, diff --git a/filters/kword/html/export/ExportDialogUI.ui b/filters/kword/html/export/ExportDialogUI.ui index e68cb6ab..a6683c04 100644 --- a/filters/kword/html/export/ExportDialogUI.ui +++ b/filters/kword/html/export/ExportDialogUI.ui @@ -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"> diff --git a/filters/kword/html/export/ExportDocStruct.cc b/filters/kword/html/export/ExportDocStruct.cc index f0e4b3aa..969ccd40 100644 --- a/filters/kword/html/export/ExportDocStruct.cc +++ b/filters/kword/html/export/ExportDocStruct.cc @@ -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"; } diff --git a/filters/kword/html/export/ExportDocStruct.h b/filters/kword/html/export/ExportDocStruct.h index 43b1e76a..6e963183 100644 --- a/filters/kword/html/export/ExportDocStruct.h +++ b/filters/kword/html/export/ExportDocStruct.h @@ -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: diff --git a/filters/kword/html/export/ExportFilter.cc b/filters/kword/html/export/ExportFilter.cc index 441048b4..05892740 100644 --- a/filters/kword/html/export/ExportFilter.cc +++ b/filters/kword/html/export/ExportFilter.cc @@ -275,13 +275,13 @@ void HtmlWorker::formatTextParagraph(const TQString& strText, } void HtmlWorker::ProcessParagraphData (const TQString& strTag, const TQString ¶Text, - const LayoutData& tqlayout, const ValueListFormatData ¶FormatDataList) + const LayoutData& layout, const ValueListFormatData ¶FormatDataList) { if (paraText.isEmpty() && paraFormatDataList.first().id != 6) { - openParagraph(strTag,tqlayout); + openParagraph(strTag,layout); *m_streamOut << " " ; // 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; diff --git a/filters/kword/html/export/ExportFilter.h b/filters/kword/html/export/ExportFilter.h index f8446c1b..04d3129f 100644 --- a/filters/kword/html/export/ExportFilter.h +++ b/filters/kword/html/export/ExportFilter.h @@ -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 ¶Text, - const LayoutData& tqlayout, const ValueListFormatData ¶FormatDataList); + const LayoutData& layout, const ValueListFormatData ¶FormatDataList); void formatTextParagraph(const TQString& strText, const FormatData& formatOrigin, const FormatData& format); bool makeTable(const FrameAnchor& anchor); diff --git a/filters/kword/html/import/khtmlreader.cpp b/filters/kword/html/import/khtmlreader.cpp index 482c90a5..8545fb0d 100644 --- a/filters/kword/html/import/khtmlreader.cpp +++ b/filters/kword/html/import/khtmlreader.cpp @@ -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 diff --git a/filters/kword/html/import/khtmlreader.h b/filters/kword/html/import/khtmlreader.h index 9987a589..db93531a 100644 --- a/filters/kword/html/import/khtmlreader.h +++ b/filters/kword/html/import/khtmlreader.h @@ -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; diff --git a/filters/kword/html/import/kwdwriter.cpp b/filters/kword/html/import/kwdwriter.cpp index 3223ef42..a194b219 100644 --- a/filters/kword/html/import/kwdwriter.cpp +++ b/filters/kword/html/import/kwdwriter.cpp @@ -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; } diff --git a/filters/kword/html/import/kwdwriter.h b/filters/kword/html/import/kwdwriter.h index 542a1748..2942f22a 100644 --- a/filters/kword/html/import/kwdwriter.h +++ b/filters/kword/html/import/kwdwriter.h @@ -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. diff --git a/filters/kword/kword1.3/import/kword13layout.cpp b/filters/kword/kword1.3/import/kword13layout.cpp index cc8a7046..1ed00358 100644 --- a/filters/kword/kword1.3/import/kword13layout.cpp +++ b/filters/kword/kword1.3/import/kword13layout.cpp @@ -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 diff --git a/filters/kword/kword1.3/import/kword13oasisgenerator.cpp b/filters/kword/kword1.3/import/kword13oasisgenerator.cpp index 6c7ec01f..7f246cad 100644 --- a/filters/kword/kword1.3/import/kword13oasisgenerator.cpp +++ b/filters/kword/kword1.3/import/kword13oasisgenerator.cpp @@ -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 diff --git a/filters/kword/kword1.3/import/kword13oasisgenerator.h b/filters/kword/kword1.3/import/kword13oasisgenerator.h index 39bc232a..3db989f2 100644 --- a/filters/kword/kword1.3/import/kword13oasisgenerator.h +++ b/filters/kword/kword1.3/import/kword13oasisgenerator.h @@ -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; diff --git a/filters/kword/kword1.3/import/kword13parser.cpp b/filters/kword/kword1.3/import/kword13parser.cpp index cbe650dc..a3e22290 100644 --- a/filters/kword/kword1.3/import/kword13parser.cpp +++ b/filters/kword/kword1.3/import/kword13parser.cpp @@ -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) diff --git a/filters/kword/kword1.3/import/kword13parser.h b/filters/kword/kword1.3/import/kword13parser.h index 21b25f20..754a618e 100644 --- a/filters/kword/kword1.3/import/kword13parser.h +++ b/filters/kword/kword1.3/import/kword13parser.h @@ -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 }; diff --git a/filters/kword/kword1.3/import/kword13utils.cpp b/filters/kword/kword1.3/import/kword13utils.cpp index d870f484..0caf48a7 100644 --- a/filters/kword/kword1.3/import/kword13utils.cpp +++ b/filters/kword/kword1.3/import/kword13utils.cpp @@ -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: // & { diff --git a/filters/kword/latex/export/config.h b/filters/kword/latex/export/config.h index 7a81b168..1a87267c 100644 --- a/filters/kword/latex/export/config.h +++ b/filters/kword/latex/export/config.h @@ -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; } diff --git a/filters/kword/latex/export/kwordlatexexportdia.cc b/filters/kword/latex/export/kwordlatexexportdia.cc index 28bb48bf..145b30ed 100644 --- a/filters/kword/latex/export/kwordlatexexportdia.cc +++ b/filters/kword/latex/export/kwordlatexexportdia.cc @@ -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"); diff --git a/filters/kword/latex/export/layout.h b/filters/kword/latex/export/layout.h index 298b08ff..f09ccb1c 100644 --- a/filters/kword/latex/export/layout.h +++ b/filters/kword/latex/export/layout.h @@ -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; } /** diff --git a/filters/kword/latex/export/para.cc b/filters/kword/latex/export/para.cc index 4264d9c6..9cc829b5 100644 --- a/filters/kword/latex/export/para.cc +++ b/filters/kword/latex/export/para.cc @@ -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. */ diff --git a/filters/kword/latex/export/textFrame.cc b/filters/kword/latex/export/textFrame.cc index cdcbba6a..d6141e96 100644 --- a/filters/kword/latex/export/textFrame.cc +++ b/filters/kword/latex/export/textFrame.cc @@ -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())) diff --git a/filters/kword/latex/export/textzone.cc b/filters/kword/latex/export/textzone.cc index a4beb875..0bf4e436 100644 --- a/filters/kword/latex/export/textzone.cc +++ b/filters/kword/latex/export/textzone.cc @@ -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() ) { diff --git a/filters/kword/latex/export/textzone.h b/filters/kword/latex/export/textzone.h index fbc09280..1d28c73f 100644 --- a/filters/kword/latex/export/textzone.h +++ b/filters/kword/latex/export/textzone.h @@ -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); diff --git a/filters/kword/latex/export/variablezone.cc b/filters/kword/latex/export/variablezone.cc index 09a16635..b73788b3 100644 --- a/filters/kword/latex/export/variablezone.cc +++ b/filters/kword/latex/export/variablezone.cc @@ -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' */ diff --git a/filters/kword/latex/import/lateximportdia.cc b/filters/kword/latex/import/lateximportdia.cc index 9489d491..8354b9ab 100644 --- a/filters/kword/latex/import/lateximportdia.cc +++ b/filters/kword/latex/import/lateximportdia.cc @@ -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); diff --git a/filters/kword/latex/import/lateximportdia.h b/filters/kword/latex/import/lateximportdia.h index b6f83baa..13afc1af 100644 --- a/filters/kword/latex/import/lateximportdia.h +++ b/filters/kword/latex/import/lateximportdia.h @@ -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: diff --git a/filters/kword/latex/status.html b/filters/kword/latex/status.html index ea2a527c..0b78eac2 100644 --- a/filters/kword/latex/status.html +++ b/filters/kword/latex/status.html @@ -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> diff --git a/filters/kword/libexport/KWEFBaseWorker.cc b/filters/kword/libexport/KWEFBaseWorker.cc index d3d41ff3..a47f647d 100644 --- a/filters/kword/libexport/KWEFBaseWorker.cc +++ b/filters/kword/libexport/KWEFBaseWorker.cc @@ -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; diff --git a/filters/kword/libexport/KWEFBaseWorker.h b/filters/kword/libexport/KWEFBaseWorker.h index e2046913..67cdb691 100644 --- a/filters/kword/libexport/KWEFBaseWorker.h +++ b/filters/kword/libexport/KWEFBaseWorker.h @@ -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\> diff --git a/filters/kword/libexport/KWEFKWordLeader.cc b/filters/kword/libexport/KWEFKWordLeader.cc index 149e9b9d..a3fca243 100644 --- a/filters/kword/libexport/KWEFKWordLeader.cc +++ b/filters/kword/libexport/KWEFKWordLeader.cc @@ -189,11 +189,11 @@ static void ProcessParagraphTag ( TQDomNode myNode, TQValueList<TagProcessing> tagProcessingList; tagProcessingList << TagProcessing ( "TEXT", ProcessTextTag, ¶Data.text ) << TagProcessing ( "FORMATS", ProcessFormatsTag, ¶Data.formattingList ) - << TagProcessing ( "LAYOUT", ProcessLayoutTag, ¶Data.tqlayout ); + << TagProcessing ( "LAYOUT", ProcessLayoutTag, ¶Data.layout ); if ( leader->m_oldSyntax ) { - tagProcessingList.append( TagProcessing( "HARDBRK", ProcessHardBrkTag, ¶Data.tqlayout.pageBreakBefore ) ); + tagProcessingList.append( TagProcessing( "HARDBRK", ProcessHardBrkTag, ¶Data.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; } diff --git a/filters/kword/libexport/KWEFKWordLeader.h b/filters/kword/libexport/KWEFKWordLeader.h index ee1d7694..fc7e787a 100644 --- a/filters/kword/libexport/KWEFKWordLeader.h +++ b/filters/kword/libexport/KWEFKWordLeader.h @@ -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); diff --git a/filters/kword/libexport/KWEFStructures.h b/filters/kword/libexport/KWEFStructures.h index fe302965..682606fe 100644 --- a/filters/kword/libexport/KWEFStructures.h +++ b/filters/kword/libexport/KWEFStructures.h @@ -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 diff --git a/filters/kword/libexport/KWEFUtil.cc b/filters/kword/libexport/KWEFUtil.cc index 65a99977..a02a45ec 100644 --- a/filters/kword/libexport/KWEFUtil.cc +++ b/filters/kword/libexport/KWEFUtil.cc @@ -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; } } diff --git a/filters/kword/libexport/ProcessDocument.cc b/filters/kword/libexport/ProcessDocument.cc index c6c0cb41..3a626f7f 100644 --- a/filters/kword/libexport/ProcessDocument.cc +++ b/filters/kword/libexport/ProcessDocument.cc @@ -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; } } diff --git a/filters/kword/msword/texthandler.cpp b/filters/kword/msword/texthandler.cpp index ba359cd2..242a6d39 100644 --- a/filters/kword/msword/texthandler.cpp +++ b/filters/kword/msword/texthandler.cpp @@ -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 diff --git a/filters/kword/mswrite/mswriteexport.cc b/filters/kword/mswrite/mswriteexport.cc index 088a669e..a65cd330 100644 --- a/filters/kword/mswrite/mswriteexport.cc +++ b/filters/kword/mswrite/mswriteexport.cc @@ -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 ¶Data) { return doFullParagraph (paraData.text, - paraData.tqlayout, + paraData.layout, paraData.formattingList); } bool doFullParagraph (const TQString ¶Text, - const LayoutData &tqlayout, + const LayoutData &layout, const ValueListFormatData ¶FormatDataList) { 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; } diff --git a/filters/kword/mswrite/structures_generated.h b/filters/kword/mswrite/structures_generated.h index 28f7cc4e..feb0f563 100644 --- a/filters/kword/mswrite/structures_generated.h +++ b/filters/kword/mswrite/structures_generated.h @@ -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: diff --git a/filters/kword/oowriter/ExportFilter.cc b/filters/kword/oowriter/ExportFilter.cc index 5e2d3e42..73acf741 100644 --- a/filters/kword/oowriter/ExportFilter.cc +++ b/filters/kword/oowriter/ExportFilter.cc @@ -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 ¶Text, } 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"; diff --git a/filters/kword/oowriter/ExportFilter.h b/filters/kword/oowriter/ExportFilter.h index 0a898227..c89e15ac 100644 --- a/filters/kword/oowriter/ExportFilter.h +++ b/filters/kword/oowriter/ExportFilter.h @@ -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; diff --git a/filters/kword/oowriter/oowriterimport.cc b/filters/kword/oowriter/oowriterimport.cc index 3f267beb..07262c86 100644 --- a/filters/kword/oowriter/oowriterimport.cc +++ b/filters/kword/oowriter/oowriterimport.cc @@ -873,13 +873,13 @@ void OoWriterImport::writeCounter( TQDomDocument& doc, TQDomElement& layoutEleme TQString bulletChar = listStyle.attributeNS( ooNS::text, "bullet-char", TQString() ); if ( !bulletChar.isEmpty() ) { #if 0 // doesn't work well. Fonts lack those symbols! - counter.setAttribute( "bullet", bulletChar[0].tqunicode() ); - kdDebug(30518) << "bullet code " << bulletChar[0].tqunicode() << endl; + counter.setAttribute( "bullet", bulletChar[0].unicode() ); + kdDebug(30518) << "bullet code " << bulletChar[0].unicode() << endl; TQString fontName = listStyleProperties.attributeNS( ooNS::style, "font-name", TQString() ); counter.setAttribute( "bulletfont", fontName ); #endif // Reverse engineering, I found those codes: - switch( bulletChar[0].tqunicode() ) { + switch( bulletChar[0].unicode() ) { case 0x2022: // small disc counter.setAttribute( "type", 10 ); // a disc bullet break; @@ -1209,12 +1209,12 @@ TQDomElement OoWriterImport::parseParagraph( TQDomDocument& doc, const TQDomElem TQDomElement* paragraphStyle = m_styles[paragraph.attributeNS( ooNS::text, "style-name", TQString() )]; TQString masterPageName = paragraphStyle ? paragraphStyle->attributeNS( ooNS::style, "master-page-name", TQString() ) : TQString(); if ( masterPageName.isEmpty() ) - masterPageName = "Standard"; // Seems to be a builtin name for the default tqlayout... + masterPageName = "Standard"; // Seems to be a builtin name for the default layout... if ( masterPageName != m_currentMasterPage ) { - // Detected a change in the master page -> this means we have to use a new page tqlayout + // Detected a change in the master page -> this means we have to use a new page layout // and insert a frame break if not on the first paragraph. - // In KWord we don't support sections so the first paragraph is the one that determines the page tqlayout. + // In KWord we don't support sections so the first paragraph is the one that determines the page layout. if ( m_currentMasterPage.isEmpty() ) { m_currentMasterPage = masterPageName; // before writePageLayout to avoid recursion writePageLayout( doc, masterPageName ); @@ -1228,7 +1228,7 @@ TQDomElement OoWriterImport::parseParagraph( TQDomDocument& doc, const TQDomElem layoutElement.appendChild( pageBreakElem ); } pageBreakElem.setAttribute( "hardFrameBreak", "true" ); - // We have no way to store the new page tqlayout, KWord doesn't have sections. + // We have no way to store the new page layout, KWord doesn't have sections. } } diff --git a/filters/kword/palmdoc/palmdb.cpp b/filters/kword/palmdoc/palmdb.cpp index 7c2ea412..b7155fa8 100644 --- a/filters/kword/palmdoc/palmdb.cpp +++ b/filters/kword/palmdoc/palmdb.cpp @@ -18,7 +18,7 @@ */ /* - The database tqlayout for PalmDB files is described in + The database layout for PalmDB files is described in http://www.palmos.com/dev/support/docs/protein_books/FileFormats/Intro.html */ diff --git a/filters/kword/palmdoc/palmdocexport.cc b/filters/kword/palmdoc/palmdocexport.cc index 9b748fa7..37f8d9cf 100644 --- a/filters/kword/palmdoc/palmdocexport.cc +++ b/filters/kword/palmdoc/palmdocexport.cc @@ -53,7 +53,7 @@ public: virtual bool doOpenDocument(void); virtual bool doCloseDocument(void); virtual bool doFullDocumentInfo(const KWEFDocumentInfo& docInfo); - virtual bool doFullParagraph(const TQString& paraText, const LayoutData& tqlayout, + virtual bool doFullParagraph(const TQString& paraText, const LayoutData& layout, const ValueListFormatData& paraFormatDataList); private: TQString title; @@ -101,7 +101,7 @@ bool PalmDocWorker::doFullDocumentInfo( const KWEFDocumentInfo& docInfo ) } bool PalmDocWorker::doFullParagraph(const TQString& paraText, - const LayoutData& /*tqlayout*/, const ValueListFormatData& /*paraFormatDataList*/) + const LayoutData& /*layout*/, const ValueListFormatData& /*paraFormatDataList*/) { kdDebug(30525) << "Entering ::doFullParagraph" << endl; text.append( paraText ); diff --git a/filters/kword/palmdoc/palmdocimport.cc b/filters/kword/palmdoc/palmdocimport.cc index 54056085..a1e8107b 100644 --- a/filters/kword/palmdoc/palmdocimport.cc +++ b/filters/kword/palmdoc/palmdocimport.cc @@ -96,7 +96,7 @@ KoFilter::ConversionStatus PalmDocImport::convert( const TQCString& from, const TQString PalmDocImport::processPlainParagraph( TQString text ) { - TQString formats, tqlayout, result; + TQString formats, layout, result; // specify FORMAT (just empty element) formats.append ( " <FORMAT id=\"1\" pos=\"0\" len=\"" + @@ -108,29 +108,29 @@ TQString PalmDocImport::processPlainParagraph( TQString text ) double fontSize = font.pointSizeFloat(); // default LAYOUT - tqlayout.append( "<LAYOUT>\n" ); - tqlayout.append( " <NAME value=\"Standard\" />\n" ); - tqlayout.append( " <FLOW align=\"left\" />\n" ); - tqlayout.append( " <LINESPACING value=\"0\" />\n" ); - tqlayout.append( " <LEFTBORDER width=\"0\" style=\"0\" />\n" ); - tqlayout.append( " <RIGHTBORDER width=\"0\" style=\"0\" />\n" ); - tqlayout.append( " <TOPBORDER width=\"0\" style=\"0\" />\n" ); - tqlayout.append( " <BOTTOMBORDER width=\"0\" style=\"0\" />\n" ); - tqlayout.append( " <INDENTS />\n" ); - tqlayout.append( " <OFFSETS after=\"9\" />\n" ); - tqlayout.append( " <PAGEBREAKING />\n" ); - tqlayout.append( " <COUNTER />\n" ); - tqlayout.append( " <FORMAT id=\"1\">\n" ); - tqlayout.append( " <SIZE value=\"" + TQString::number( fontSize ) + "\" />\n" ); - tqlayout.append( " <WEIGHT value=\"50\" />\n" ); - tqlayout.append( " <ITALIC value=\"0\" />\n" ); - tqlayout.append( " <UNDERLINE value=\"0\" />\n" ); - tqlayout.append( " <STRIKEOUT value=\"0\" />\n" ); - tqlayout.append( " <CHARSET value=\"0\" />\n" ); - tqlayout.append( " <VERTALIGN value=\"0\" />\n" ); - tqlayout.append( " <FONT name=\"" + fontFamily + "\" />\n" ); - tqlayout.append( " </FORMAT>\n" ); - tqlayout.append( "</LAYOUT>\n" ); + layout.append( "<LAYOUT>\n" ); + layout.append( " <NAME value=\"Standard\" />\n" ); + layout.append( " <FLOW align=\"left\" />\n" ); + layout.append( " <LINESPACING value=\"0\" />\n" ); + layout.append( " <LEFTBORDER width=\"0\" style=\"0\" />\n" ); + layout.append( " <RIGHTBORDER width=\"0\" style=\"0\" />\n" ); + layout.append( " <TOPBORDER width=\"0\" style=\"0\" />\n" ); + layout.append( " <BOTTOMBORDER width=\"0\" style=\"0\" />\n" ); + layout.append( " <INDENTS />\n" ); + layout.append( " <OFFSETS after=\"9\" />\n" ); + layout.append( " <PAGEBREAKING />\n" ); + layout.append( " <COUNTER />\n" ); + layout.append( " <FORMAT id=\"1\">\n" ); + layout.append( " <SIZE value=\"" + TQString::number( fontSize ) + "\" />\n" ); + layout.append( " <WEIGHT value=\"50\" />\n" ); + layout.append( " <ITALIC value=\"0\" />\n" ); + layout.append( " <UNDERLINE value=\"0\" />\n" ); + layout.append( " <STRIKEOUT value=\"0\" />\n" ); + layout.append( " <CHARSET value=\"0\" />\n" ); + layout.append( " <VERTALIGN value=\"0\" />\n" ); + layout.append( " <FONT name=\"" + fontFamily + "\" />\n" ); + layout.append( " </FORMAT>\n" ); + layout.append( "</LAYOUT>\n" ); // encode text for XML-ness text.replace( '&', "&" ); @@ -145,7 +145,7 @@ TQString PalmDocImport::processPlainParagraph( TQString text ) result.append( "<FORMATS>\n"); result.append( formats ); result.append( "</FORMATS>\n"); - result.append( tqlayout ); + result.append( layout ); result.append( "</PARAGRAPH>\n" ); return result; diff --git a/filters/kword/pdf/FilterPage.cpp b/filters/kword/pdf/FilterPage.cpp index 1ba81776..14d3d384 100644 --- a/filters/kword/pdf/FilterPage.cpp +++ b/filters/kword/pdf/FilterPage.cpp @@ -85,7 +85,7 @@ void Page::addString(TextString *str) // TQString s; // for (int i=0; i<str->len; i++) s += TQChar(str->text[i]); // kdDebug(30516) << "string: " << s << " (" -// << (str->len>0 ? s[0].tqunicode() : 0) << ")" << endl; +// << (str->len>0 ? s[0].unicode() : 0) << ")" << endl; TextPage::addString(str); // kdDebug(30516) << " ...addString done" << endl; } @@ -315,14 +315,14 @@ void Page::fillParagraph(Paragraph &par, double &offset) const TQChar c = par.blocks[bi].text[si]; int psi = par.charFromEnd(1, pbi); TQChar prev = (psi<0 ? TQChar::null : par.blocks[pbi].text[psi]); - if ( !prev.isNull() && type(c.tqunicode())==Hyphen ) + if ( !prev.isNull() && type(c.unicode())==Hyphen ) kdDebug(30516) << "hyphen ? " << TQString(prev) - << " type=" << type(prev.tqunicode()) + << " type=" << type(prev.unicode()) << endl; TextString *next = ((*it)->next ? (*it)->next->blocks->strings : 0); - if ( !prev.isNull() && type(c.tqunicode())==Hyphen - && isLetter( type(prev.tqunicode()) ) + if ( !prev.isNull() && type(c.unicode())==Hyphen + && isLetter( type(prev.unicode()) ) && next && next->len>0 && isLetter( type(next->text[next->len-1]) ) ) { kdDebug(30516) << "found hyphen" << endl; @@ -389,7 +389,7 @@ void Page::fillParagraph(Paragraph &par, double &offset) const FontFamily Page::checkSpecial(TQChar &c, const Font &font) const { Unicode res = 0; - switch ( PDFImport::checkSpecial(c.tqunicode(), res) ) { + switch ( PDFImport::checkSpecial(c.unicode(), res) ) { case Bullet: kdDebug(30516) << "found bullet" << endl; // #### FIXME : if list, use a COUNTER @@ -405,7 +405,7 @@ FontFamily Page::checkSpecial(TQChar &c, const Font &font) const kdDebug(30516) << "found latex special" << endl; return Times; case SpecialSymbol: - kdDebug(30516) << "found symbol=" << c.tqunicode() << endl; + kdDebug(30516) << "found symbol=" << c.unicode() << endl; return Times; //return Symbol; default: diff --git a/filters/kword/pdf/data.cpp b/filters/kword/pdf/data.cpp index 3c7caae4..3236aa39 100644 --- a/filters/kword/pdf/data.cpp +++ b/filters/kword/pdf/data.cpp @@ -189,13 +189,13 @@ void Data::createParagraph(const TQString &text, ParagraphType type, textElement.appendChild( _document.createTextNode(text) ); paragraph.appendChild(textElement); - TQDomElement tqlayout = _document.createElement("LAYOUT"); - paragraph.appendChild(tqlayout); + TQDomElement layout = _document.createElement("LAYOUT"); + paragraph.appendChild(layout); TQDomElement element = _document.createElement("NAME"); element.setAttribute("value", "Standard"); - tqlayout.appendChild(element); + layout.appendChild(element); for (uint i=0; i<layouts.size(); i++) - tqlayout.appendChild(layouts[i]); + layout.appendChild(layouts[i]); if ( formats.size() ) { TQDomElement format = _document.createElement("FORMATS"); diff --git a/filters/kword/pdf/dialog.cpp b/filters/kword/pdf/dialog.cpp index d1a51fb4..013d4cb3 100644 --- a/filters/kword/pdf/dialog.cpp +++ b/filters/kword/pdf/dialog.cpp @@ -148,7 +148,7 @@ Dialog::Dialog(uint nbPages, bool isEncrypted, TQWidget *widget) TQWhatsThis::add(_smart, i18n("Removes returns and hyphens at end of line. " "Also tries to compute the paragraph alignment. " - "Note that the tqlayout of some pages can " + "Note that the layout of some pages can " "get messed up.")); top->addWidget(_smart); diff --git a/filters/kword/pdf/xpdf/xpdf/FTFont.cc b/filters/kword/pdf/xpdf/xpdf/FTFont.cc index ebbbff40..8de09e0e 100644 --- a/filters/kword/pdf/xpdf/xpdf/FTFont.cc +++ b/filters/kword/pdf/xpdf/xpdf/FTFont.cc @@ -50,7 +50,7 @@ FTFontEngine::~FTFontEngine() { FTFontFile::FTFontFile(FTFontEngine *engineA, char *fontFileName, char **fontEnc, GBool pdfFontHasEncoding) { char *name; - int tqunicodeCmap, macRomanCmap, msSymbolCmap; + int unicodeCmap, macRomanCmap, msSymbolCmap; int i, j; ok = gFalse; @@ -89,11 +89,11 @@ FTFontFile::FTFontFile(FTFontEngine *engineA, char *fontFileName, // and use (0xf000 + char code). // 3. If none of these rules apply, use the first cmap and hope for // the best (this shouldn't happen). - tqunicodeCmap = macRomanCmap = msSymbolCmap = 0xffff; + unicodeCmap = macRomanCmap = msSymbolCmap = 0xffff; for (i = 0; i < face->num_charmaps; ++i) { if (face->charmaps[i]->platform_id == 3 && face->charmaps[i]->encoding_id == 1) { - tqunicodeCmap = i; + unicodeCmap = i; } else if (face->charmaps[i]->platform_id == 1 && face->charmaps[i]->encoding_id == 0) { macRomanCmap = i; @@ -106,8 +106,8 @@ FTFontFile::FTFontFile(FTFontEngine *engineA, char *fontFileName, mode = ftFontModeCharCode; charMapOffset = 0; if (pdfFontHasEncoding) { - if (tqunicodeCmap != 0xffff) { - i = tqunicodeCmap; + if (unicodeCmap != 0xffff) { + i = unicodeCmap; mode = ftFontModeUnicode; } else if (macRomanCmap != 0xffff) { i = macRomanCmap; diff --git a/filters/kword/pdf/xpdf/xpdf/FontFile.cc b/filters/kword/pdf/xpdf/xpdf/FontFile.cc index 73a7f1d3..ccb880bf 100644 --- a/filters/kword/pdf/xpdf/xpdf/FontFile.cc +++ b/filters/kword/pdf/xpdf/xpdf/FontFile.cc @@ -3206,7 +3206,7 @@ void TrueTypeFontFile::cvtCharStrings(const char **encodingA, GBool pdfFontHasEncoding, FontFileOutputFunc outputFunc, void *outputStream) { - int tqunicodeCmap, macRomanCmap, msSymbolCmap; + int unicodeCmap, macRomanCmap, msSymbolCmap; int nCmaps, cmapPlatform, cmapEncoding, cmapFmt, cmapOffset; T42FontIndexMode mode; const char *name; @@ -3239,13 +3239,13 @@ void TrueTypeFontFile::cvtCharStrings(const char **encodingA, // 3. If none of these rules apply, use the first cmap and hope for // the best (this shouldn't happen). nCmaps = getUShort(pos+2); - tqunicodeCmap = macRomanCmap = msSymbolCmap = -1; + unicodeCmap = macRomanCmap = msSymbolCmap = -1; cmapOffset = 0; for (i = 0; i < nCmaps; ++i) { cmapPlatform = getUShort(pos + 4 + 8*i); cmapEncoding = getUShort(pos + 4 + 8*i + 2); if (cmapPlatform == 3 && cmapEncoding == 1) { - tqunicodeCmap = i; + unicodeCmap = i; } else if (cmapPlatform == 1 && cmapEncoding == 0) { macRomanCmap = i; } else if (cmapPlatform == 3 && cmapEncoding == 0) { @@ -3255,8 +3255,8 @@ void TrueTypeFontFile::cvtCharStrings(const char **encodingA, i = 0; mode = t42FontModeCharCode; if (pdfFontHasEncoding) { - if (tqunicodeCmap >= 0) { - i = tqunicodeCmap; + if (unicodeCmap >= 0) { + i = unicodeCmap; mode = t42FontModeUnicode; } else if (macRomanCmap >= 0) { i = macRomanCmap; diff --git a/filters/kword/pdf/xpdf/xpdf/GlobalParams.cc b/filters/kword/pdf/xpdf/xpdf/GlobalParams.cc index d25970de..8a7b36de 100644 --- a/filters/kword/pdf/xpdf/xpdf/GlobalParams.cc +++ b/filters/kword/pdf/xpdf/xpdf/GlobalParams.cc @@ -139,7 +139,7 @@ GlobalParams::GlobalParams(const char *cfgFileName) { nameToUnicode = new NameToCharCode(); cidToUnicodes = new GHash(gTrue); residentUnicodeMaps = new GHash(); - tqunicodeMaps = new GHash(gTrue); + unicodeMaps = new GHash(gTrue); cMapDirs = new GHash(gTrue); toUnicodeDirs = new GList(); displayFonts = new GHash(); @@ -195,7 +195,7 @@ GlobalParams::GlobalParams(const char *cfgFileName) { errQuiet = gFalse; cidToUnicodeCache = new CIDToUnicodeCache(); - tqunicodeMapCache = new UnicodeMapCache(); + unicodeMapCache = new UnicodeMapCache(); cMapCache = new CMapCache(); // set up the initial nameToUnicode table @@ -318,7 +318,7 @@ void GlobalParams::parseFile(GString *fileName, FILE *f) { parseNameToUnicode(tokens, fileName, line); } else if (!cmd->cmp("cidToUnicode")) { parseCIDToUnicode(tokens, fileName, line); - } else if (!cmd->cmp("tqunicodeMap")) { + } else if (!cmd->cmp("unicodeMap")) { parseUnicodeMap(tokens, fileName, line); } else if (!cmd->cmp("cMapDir")) { parseCMapDir(tokens, fileName, line); @@ -465,16 +465,16 @@ void GlobalParams::parseUnicodeMap(GList *tokens, GString *fileName, GString *encodingName, *name, *old; if (tokens->getLength() != 3) { - error(-1, "Bad 'tqunicodeMap' config file command (%s:%d)", + error(-1, "Bad 'unicodeMap' config file command (%s:%d)", fileName->getCString(), line); return; } encodingName = (GString *)tokens->get(1); name = (GString *)tokens->get(2); - if ((old = (GString *)tqunicodeMaps->remove(encodingName))) { + if ((old = (GString *)unicodeMaps->remove(encodingName))) { delete old; } - tqunicodeMaps->add(encodingName->copy(), name->copy()); + unicodeMaps->add(encodingName->copy(), name->copy()); } void GlobalParams::parseCMapDir(GList *tokens, GString *fileName, int line) { @@ -765,7 +765,7 @@ GlobalParams::~GlobalParams() { delete nameToUnicode; deleteGHash(cidToUnicodes, GString); deleteGHash(residentUnicodeMaps, UnicodeMap); - deleteGHash(tqunicodeMaps, GString); + deleteGHash(unicodeMaps, GString); deleteGList(toUnicodeDirs, GString); deleteGHash(displayFonts, DisplayFontParam); deleteGHash(displayCIDFonts, DisplayFontParam); @@ -793,7 +793,7 @@ GlobalParams::~GlobalParams() { delete cMapDirs; delete cidToUnicodeCache; - delete tqunicodeMapCache; + delete unicodeMapCache; delete cMapCache; } @@ -825,7 +825,7 @@ UnicodeMap *GlobalParams::getResidentUnicodeMap(const GString *encodingName) { FILE *GlobalParams::getUnicodeMapFile(const GString *encodingName) { GString *fileName; - if (!(fileName = (GString *)tqunicodeMaps->lookup(encodingName))) { + if (!(fileName = (GString *)unicodeMaps->lookup(encodingName))) { return NULL; } return fopen(fileName->getCString(), "r"); @@ -959,7 +959,7 @@ UnicodeMap *GlobalParams::getUnicodeMap(GString *encodingName) { map->incRefCnt(); return map; } - return tqunicodeMapCache->getUnicodeMap(encodingName); + return unicodeMapCache->getUnicodeMap(encodingName); } CMap *GlobalParams::getCMap(GString *collection, GString *cMapName) { diff --git a/filters/kword/pdf/xpdf/xpdf/GlobalParams.h b/filters/kword/pdf/xpdf/xpdf/GlobalParams.h index 1f3e4c53..86114a15 100644 --- a/filters/kword/pdf/xpdf/xpdf/GlobalParams.h +++ b/filters/kword/pdf/xpdf/xpdf/GlobalParams.h @@ -237,7 +237,7 @@ private: // [GString] GHash *residentUnicodeMaps; // mappings from Unicode to char codes, // indexed by encoding name [UnicodeMap] - GHash *tqunicodeMaps; // files for mappings from Unicode to char + GHash *unicodeMaps; // files for mappings from Unicode to char // codes, indexed by encoding name [GString] GHash *cMapDirs; // list of CMap dirs, indexed by collection // name [GList[GString]] @@ -263,7 +263,7 @@ private: GBool psEmbedCIDTrueType; // embed CID TrueType fonts? GBool psOPI; // generate PostScript OPI comments? GBool psASCIIHex; // use ASCIIHex instead of ASCII85? - GString *textEncoding; // encoding (tqunicodeMap) to use for text + GString *textEncoding; // encoding (unicodeMap) to use for text // output EndOfLineKind textEOL; // type of EOL marker to use for text // output @@ -280,7 +280,7 @@ private: GBool errQuiet; // suppress error messages? CIDToUnicodeCache *cidToUnicodeCache; - UnicodeMapCache *tqunicodeMapCache; + UnicodeMapCache *unicodeMapCache; CMapCache *cMapCache; }; diff --git a/filters/kword/pdf/xpdf/xpdf/TTFont.cc b/filters/kword/pdf/xpdf/xpdf/TTFont.cc index 6077f3c0..6107fd43 100644 --- a/filters/kword/pdf/xpdf/xpdf/TTFont.cc +++ b/filters/kword/pdf/xpdf/xpdf/TTFont.cc @@ -48,7 +48,7 @@ TTFontEngine::~TTFontEngine() { TTFontFile::TTFontFile(TTFontEngine *engineA, char *fontFileName, char **fontEnc, GBool pdfFontHasEncoding) { TT_Face_Properties props; - TT_UShort tqunicodeCmap, macRomanCmap, msSymbolCmap; + TT_UShort unicodeCmap, macRomanCmap, msSymbolCmap; TT_UShort platform, encoding, i; int j; @@ -77,11 +77,11 @@ TTFontFile::TTFontFile(TTFontEngine *engineA, char *fontFileName, // and use (0xf000 + char code). // 3. If none of these rules apply, use the first cmap and hope for // the best (this shouldn't happen). - tqunicodeCmap = macRomanCmap = msSymbolCmap = 0xffff; + unicodeCmap = macRomanCmap = msSymbolCmap = 0xffff; for (i = 0; i < props.num_CharMaps; ++i) { if (!TT_Get_CharMap_ID(face, i, &platform, &encoding)) { if (platform == 3 && encoding == 1) { - tqunicodeCmap = i; + unicodeCmap = i; } else if (platform == 1 && encoding == 0) { macRomanCmap = i; } else if (platform == 3 && encoding == 0) { @@ -93,8 +93,8 @@ TTFontFile::TTFontFile(TTFontEngine *engineA, char *fontFileName, mode = ttFontModeCharCode; charMapOffset = 0; if (pdfFontHasEncoding) { - if (tqunicodeCmap != 0xffff) { - i = tqunicodeCmap; + if (unicodeCmap != 0xffff) { + i = unicodeCmap; mode = ttFontModeUnicode; } else if (macRomanCmap != 0xffff) { i = macRomanCmap; diff --git a/filters/kword/pdf/xpdf/xpdf/UnicodeMap.cc b/filters/kword/pdf/xpdf/xpdf/UnicodeMap.cc index d197e5cf..fe1185d7 100644 --- a/filters/kword/pdf/xpdf/xpdf/UnicodeMap.cc +++ b/filters/kword/pdf/xpdf/xpdf/UnicodeMap.cc @@ -46,7 +46,7 @@ UnicodeMap *UnicodeMap::parse(GString *encodingNameA) { char *tok1, *tok2, *tok3; if (!(f = globalParams->getUnicodeMapFile(encodingNameA))) { - error(-1, "Couldn't find tqunicodeMap file for the '%s' encoding", + error(-1, "Couldn't find unicodeMap file for the '%s' encoding", encodingNameA->getCString()); return NULL; } @@ -93,11 +93,11 @@ UnicodeMap *UnicodeMap::parse(GString *encodingNameA) { eMap->nBytes = nBytes; ++map->eMapsLen; } else { - error(-1, "Bad line (%d) in tqunicodeMap file for the '%s' encoding", + error(-1, "Bad line (%d) in unicodeMap file for the '%s' encoding", line, encodingNameA->getCString()); } } else { - error(-1, "Bad line (%d) in tqunicodeMap file for the '%s' encoding", + error(-1, "Bad line (%d) in unicodeMap file for the '%s' encoding", line, encodingNameA->getCString()); } ++line; @@ -110,8 +110,8 @@ UnicodeMap *UnicodeMap::parse(GString *encodingNameA) { UnicodeMap::UnicodeMap(GString *encodingNameA) { encodingName = encodingNameA; - tqunicodeOut = gFalse; - kind = tqunicodeMapUser; + unicodeOut = gFalse; + kind = unicodeMapUser; ranges = NULL; len = 0; eMaps = NULL; @@ -119,11 +119,11 @@ UnicodeMap::UnicodeMap(GString *encodingNameA) { refCnt = 1; } -UnicodeMap::UnicodeMap(const char *encodingNameA, GBool tqunicodeOutA, +UnicodeMap::UnicodeMap(const char *encodingNameA, GBool unicodeOutA, UnicodeMapRange *rangesA, int lenA) { encodingName = new GString(encodingNameA); - tqunicodeOut = tqunicodeOutA; - kind = tqunicodeMapResident; + unicodeOut = unicodeOutA; + kind = unicodeMapResident; ranges = rangesA; len = lenA; eMaps = NULL; @@ -131,11 +131,11 @@ UnicodeMap::UnicodeMap(const char *encodingNameA, GBool tqunicodeOutA, refCnt = 1; } -UnicodeMap::UnicodeMap(const char *encodingNameA, GBool tqunicodeOutA, +UnicodeMap::UnicodeMap(const char *encodingNameA, GBool unicodeOutA, UnicodeMapFunc funcA) { encodingName = new GString(encodingNameA); - tqunicodeOut = tqunicodeOutA; - kind = tqunicodeMapFunc; + unicodeOut = unicodeOutA; + kind = unicodeMapFunc; func = funcA; eMaps = NULL; eMapsLen = 0; @@ -144,7 +144,7 @@ UnicodeMap::UnicodeMap(const char *encodingNameA, GBool tqunicodeOutA, UnicodeMap::~UnicodeMap() { delete encodingName; - if (kind == tqunicodeMapUser && ranges) { + if (kind == unicodeMapUser && ranges) { gfree(ranges); } if (eMaps) { @@ -170,7 +170,7 @@ int UnicodeMap::mapUnicode(Unicode u, char *buf, int bufSize) { int a, b, m, n, i, j; Guint code; - if (kind == tqunicodeMapFunc) { + if (kind == unicodeMapFunc) { return (*func)(u, buf, bufSize); } @@ -219,7 +219,7 @@ int UnicodeMap::mapUnicode(Unicode u, char *buf, int bufSize) { UnicodeMapCache::UnicodeMapCache() { int i; - for (i = 0; i < tqunicodeMapCacheSize; ++i) { + for (i = 0; i < unicodeMapCacheSize; ++i) { cache[i] = NULL; } } @@ -227,7 +227,7 @@ UnicodeMapCache::UnicodeMapCache() { UnicodeMapCache::~UnicodeMapCache() { int i; - for (i = 0; i < tqunicodeMapCacheSize; ++i) { + for (i = 0; i < unicodeMapCacheSize; ++i) { if (cache[i]) { cache[i]->decRefCnt(); } @@ -242,7 +242,7 @@ UnicodeMap *UnicodeMapCache::getUnicodeMap(GString *encodingName) { cache[0]->incRefCnt(); return cache[0]; } - for (i = 1; i < tqunicodeMapCacheSize; ++i) { + for (i = 1; i < unicodeMapCacheSize; ++i) { if (cache[i] && cache[i]->match(encodingName)) { map = cache[i]; for (j = i; j >= 1; --j) { @@ -254,10 +254,10 @@ UnicodeMap *UnicodeMapCache::getUnicodeMap(GString *encodingName) { } } if ((map = UnicodeMap::parse(encodingName))) { - if (cache[tqunicodeMapCacheSize - 1]) { - cache[tqunicodeMapCacheSize - 1]->decRefCnt(); + if (cache[unicodeMapCacheSize - 1]) { + cache[unicodeMapCacheSize - 1]->decRefCnt(); } - for (j = tqunicodeMapCacheSize - 1; j >= 1; --j) { + for (j = unicodeMapCacheSize - 1; j >= 1; --j) { cache[j] = cache[j - 1]; } cache[0] = map; diff --git a/filters/kword/pdf/xpdf/xpdf/UnicodeMap.h b/filters/kword/pdf/xpdf/xpdf/UnicodeMap.h index 35506aab..189f3154 100644 --- a/filters/kword/pdf/xpdf/xpdf/UnicodeMap.h +++ b/filters/kword/pdf/xpdf/xpdf/UnicodeMap.h @@ -25,9 +25,9 @@ class GString; //------------------------------------------------------------------------ enum UnicodeMapKind { - tqunicodeMapUser, // read from a file - tqunicodeMapResident, // static list of ranges - tqunicodeMapFunc // function pointer + unicodeMapUser, // read from a file + unicodeMapResident, // static list of ranges + unicodeMapFunc // function pointer }; typedef int (*UnicodeMapFunc)(Unicode u, char *buf, int bufSize); @@ -49,12 +49,12 @@ public: static UnicodeMap *parse(GString *encodingNameA); // Create a resident UnicodeMap. - UnicodeMap(const char *encodingNameA, GBool tqunicodeOutA, + UnicodeMap(const char *encodingNameA, GBool unicodeOutA, UnicodeMapRange *rangesA, int lenA); // Create a resident UnicodeMap that uses a function instead of a // list of ranges. - UnicodeMap(const char *encodingNameA, GBool tqunicodeOutA, + UnicodeMap(const char *encodingNameA, GBool unicodeOutA, UnicodeMapFunc funcA); ~UnicodeMap(); @@ -64,7 +64,7 @@ public: GString *getEncodingName() { return encodingName; } - GBool isUnicode() { return tqunicodeOut; } + GBool isUnicode() { return unicodeOut; } // Return true if this UnicodeMap matches the specified // <encodingNameA>. @@ -82,7 +82,7 @@ private: GString *encodingName; UnicodeMapKind kind; - GBool tqunicodeOut; + GBool unicodeOut; union { UnicodeMapRange *ranges; // (user, resident) UnicodeMapFunc func; // (func) @@ -95,7 +95,7 @@ private: //------------------------------------------------------------------------ -#define tqunicodeMapCacheSize 4 +#define unicodeMapCacheSize 4 class UnicodeMapCache { public: @@ -110,7 +110,7 @@ public: private: - UnicodeMap *cache[tqunicodeMapCacheSize]; + UnicodeMap *cache[unicodeMapCacheSize]; }; #endif diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFTree.cc b/filters/kword/pdf/xpdf/xpdf/XPDFTree.cc index 69a173af..8f5baeb5 100644 --- a/filters/kword/pdf/xpdf/xpdf/XPDFTree.cc +++ b/filters/kword/pdf/xpdf/xpdf/XPDFTree.cc @@ -56,7 +56,7 @@ static void insertChildOnList(XPDFTreeEntry *e, XPDFTreeEntry **listHead); static void deleteChildFromList(XPDFTreeEntry *e, XPDFTreeEntry **listHead); static void createGC(Widget widget); static void destroyGC(Widget widget); -static void tqlayout(Widget widget, Widget instigator); +static void layout(Widget widget, Widget instigator); static int layoutSubtree(XPDFTreeWidget w, Widget instigator, XPDFTreeEntry *e, Position x, Position y, Boolean visible); @@ -66,7 +66,7 @@ static void calcSize(Widget widget, Widget instigator, static void calcSubtreeSize(XPDFTreeWidget w, Widget instigator, XPDFTreeEntry *e, Dimension *width, Dimension *height); -static Boolean needRetqlayout(Widget oldWidget, Widget newWidget); +static Boolean needRelayout(Widget oldWidget, Widget newWidget); static void click(Widget widget, XEvent *event, String *params, Cardinal *numParams); static Boolean findPosition(XPDFTreeWidget w, int x, int y, @@ -195,9 +195,9 @@ externaldef(xpdftreeclassrec) XPDFTreeClassRec xpdfTreeClassRec = { { // XPDFTree &createGC, // createGC &destroyGC, // destroyGC - &tqlayout, // tqlayout + &layout, // layout &calcSize, // calcSize - &needRetqlayout, // needRetqlayout + &needRelayout, // needRelayout NULL // extension } }; @@ -218,14 +218,14 @@ static void classPartInitialize(WidgetClass widgetCls) { if (wc->treeClass.destroyGC == XPDFInheritDestroyGC) { wc->treeClass.destroyGC = sc->treeClass.destroyGC; } - if (wc->treeClass.tqlayout == XPDFInheritLayout) { - wc->treeClass.tqlayout = sc->treeClass.tqlayout; + if (wc->treeClass.layout == XPDFInheritLayout) { + wc->treeClass.layout = sc->treeClass.layout; } if (wc->treeClass.calcSize == XPDFInheritCalcSize) { wc->treeClass.calcSize = sc->treeClass.calcSize; } - if (wc->treeClass.needRetqlayout == XPDFInheritNeedRetqlayout) { - wc->treeClass.needRetqlayout = sc->treeClass.needRetqlayout; + if (wc->treeClass.needRelayout == XPDFInheritNeedRelayout) { + wc->treeClass.needRelayout = sc->treeClass.needRelayout; } } @@ -270,10 +270,10 @@ static void destroySubtree(XPDFTreeEntry *e) { static void resize(Widget widget) { XPDFTreeWidgetClass cls = (XPDFTreeWidgetClass)XtClass(widget); - if (cls->treeClass.tqlayout) { - (*cls->treeClass.tqlayout)(widget, NULL); + if (cls->treeClass.layout) { + (*cls->treeClass.layout)(widget, NULL); } else { - tqlayout(widget, NULL); + layout(widget, NULL); } } @@ -346,16 +346,16 @@ static Boolean setValues(Widget oldWidget, Widget requestWidget, XPDFTreeWidget ow = (XPDFTreeWidget)oldWidget; XPDFTreeWidget nw = (XPDFTreeWidget)newWidget; XPDFTreeWidgetClass cls = (XPDFTreeWidgetClass)XtClass(nw); - Boolean retqlayout, redisp; + Boolean relayout, redisp; - // check to see if tqlayout-affecting resources have changed - if (cls->treeClass.needRetqlayout) { - retqlayout = (*cls->treeClass.needRetqlayout)((Widget)ow, (Widget)nw); + // check to see if layout-affecting resources have changed + if (cls->treeClass.needRelayout) { + relayout = (*cls->treeClass.needRelayout)((Widget)ow, (Widget)nw); } else { - retqlayout = needRetqlayout((Widget)ow, (Widget)nw); + relayout = needRelayout((Widget)ow, (Widget)nw); } redisp = False; - if (retqlayout) { + if (relayout) { // calculate a new ideal size (reset the widget size first so // calcSize will compute a new one) @@ -372,14 +372,14 @@ static Boolean setValues(Widget oldWidget, Widget requestWidget, calcSize((Widget)nw, NULL, &nw->core.width, &nw->core.height); } - // if resources have changed but size hasn't, tqlayout manually + // if resources have changed but size hasn't, layout manually // (because Xt just looks at the size) if (nw->core.width == ow->core.width && nw->core.height == ow->core.height) { - if (cls->treeClass.tqlayout) { - (*cls->treeClass.tqlayout)((Widget)nw, NULL); + if (cls->treeClass.layout) { + (*cls->treeClass.layout)((Widget)nw, NULL); } else { - tqlayout((Widget)nw, NULL); + layout((Widget)nw, NULL); } redisp = True; } @@ -394,12 +394,12 @@ static void setValuesAlmost(Widget oldWidget, Widget newWidget, XPDFTreeWidgetClass cls = (XPDFTreeWidgetClass)XtClass(newWidget); // our parent rejected a geometry request, so accept the compromise - // and retqlayout + // and relayout if (!reply->request_mode) { - if (cls->treeClass.tqlayout) { - (*cls->treeClass.tqlayout)(newWidget, NULL); + if (cls->treeClass.layout) { + (*cls->treeClass.layout)(newWidget, NULL); } else { - tqlayout(newWidget, NULL); + layout(newWidget, NULL); } } *request = *reply; @@ -496,10 +496,10 @@ static XtGeometryResult geometryManager(Widget widget, w->core.height = curHeight; w->core.border_width = curBW; } else { - if (cls->treeClass.tqlayout) { - (*cls->treeClass.tqlayout)((Widget)w, widget); + if (cls->treeClass.layout) { + (*cls->treeClass.layout)((Widget)w, widget); } else { - tqlayout((Widget)w, widget); + layout((Widget)w, widget); } } @@ -529,11 +529,11 @@ static void changeManaged(Widget widget) { while (XtMakeResizeRequest(widget, width, height, &width, &height) == XtGeometryAlmost) ; - // retqlayout - if (cls->treeClass.tqlayout) { - (*cls->treeClass.tqlayout)(widget, NULL); + // relayout + if (cls->treeClass.layout) { + (*cls->treeClass.layout)(widget, NULL); } else { - tqlayout(widget, NULL); + layout(widget, NULL); } #if XmVERSION > 1 @@ -591,7 +591,7 @@ static Boolean constraintSetValues(Widget oldWidget, Widget requestWidget, XPDFTreeWidget w = (XPDFTreeWidget)XtParent(newWidget); XPDFTreeWidgetClass cls = (XPDFTreeWidgetClass)XtClass((Widget)w); XPDFTreeConstraint oc, nc; - Boolean retqlayout; + Boolean relayout; Dimension width, height; if (!XtIsManaged(newWidget)) { @@ -599,7 +599,7 @@ static Boolean constraintSetValues(Widget oldWidget, Widget requestWidget, } oc = XPDFTreeCPart(oldWidget); nc = XPDFTreeCPart(newWidget); - retqlayout = False; + relayout = False; if (nc->entryParent != oc->entryParent || nc->entryPosition != oc->entryPosition) { if (oc->entryParent) { @@ -612,12 +612,12 @@ static Boolean constraintSetValues(Widget oldWidget, Widget requestWidget, } else { insertChildOnList(nc->e, &w->tree.root); } - retqlayout = True; + relayout = True; } else if (nc->entryExpanded != oc->entryExpanded) { - retqlayout = True; + relayout = True; } - if (retqlayout) { + if (relayout) { // calculate a new ideal size (reset the widget size first so // calcSize will compute a new one) @@ -634,15 +634,15 @@ static Boolean constraintSetValues(Widget oldWidget, Widget requestWidget, while (XtMakeResizeRequest((Widget)w, width, height, &width, &height) == XtGeometryAlmost) ; - // retqlayout the widget - if (cls->treeClass.tqlayout) { - (*cls->treeClass.tqlayout)((Widget)w, NULL); + // relayout the widget + if (cls->treeClass.layout) { + (*cls->treeClass.layout)((Widget)w, NULL); } else { - tqlayout((Widget)w, NULL); + layout((Widget)w, NULL); } } - return retqlayout; + return relayout; } static void insertChildOnList(XPDFTreeEntry *e, XPDFTreeEntry **listHead) { @@ -701,7 +701,7 @@ static void destroyGC(Widget widget) { XtReleaseGC(widget, w->tree.dottedGC); } -static void tqlayout(Widget widget, Widget instigator) { +static void layout(Widget widget, Widget instigator) { XPDFTreeWidget w = (XPDFTreeWidget)widget; XPDFTreeEntry *e; Position x, y; @@ -836,7 +836,7 @@ static void calcSubtreeSize(XPDFTreeWidget w, Widget instigator, *height = h1; } -static Boolean needRetqlayout(Widget oldWidget, Widget newWidget) { +static Boolean needRelayout(Widget oldWidget, Widget newWidget) { XPDFTreeWidget ow = (XPDFTreeWidget)oldWidget; XPDFTreeWidget nw = (XPDFTreeWidget)newWidget; diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFTreeP.h b/filters/kword/pdf/xpdf/xpdf/XPDFTreeP.h index 9f31f9e2..16ab137a 100644 --- a/filters/kword/pdf/xpdf/xpdf/XPDFTreeP.h +++ b/filters/kword/pdf/xpdf/xpdf/XPDFTreeP.h @@ -22,14 +22,14 @@ typedef Boolean (*XPDFNeedRelayoutProc)(Widget oldWidget, Widget newWidget); #define XPDFInheritDestroyGC ((XtWidgetProc)_XtInherit) #define XPDFInheritLayout ((XPDFLayoutProc)_XtInherit) #define XPDFInheritCalcSize ((XPDFCalcSizeProc)_XtInherit) -#define XPDFInheritNeedRetqlayout ((XPDFNeedRelayoutProc)_XtInherit) +#define XPDFInheritNeedRelayout ((XPDFNeedRelayoutProc)_XtInherit) typedef struct { XtWidgetProc createGC; XtWidgetProc destroyGC; - XPDFLayoutProc tqlayout; + XPDFLayoutProc layout; XPDFCalcSizeProc calcSize; - XPDFNeedRelayoutProc needRetqlayout; + XPDFNeedRelayoutProc needRelayout; XtPointer extension; } XPDFTreeClassPart; diff --git a/filters/kword/rtf/export/ExportFilter.cc b/filters/kword/rtf/export/ExportFilter.cc index 12719f4a..f4f8d894 100644 --- a/filters/kword/rtf/export/ExportFilter.cc +++ b/filters/kword/rtf/export/ExportFilter.cc @@ -174,7 +174,7 @@ TQString RTFWorker::makeTable(const FrameAnchor& anchor) for (it=paraList->begin();it!=end;++it) { rowText += endOfParagraph; - rowText += ProcessParagraphData( (*it).text,(*it).tqlayout,(*it).formattingList); + rowText += ProcessParagraphData( (*it).text,(*it).layout,(*it).formattingList); rowText += m_eol; endOfParagraph = "\\par"; // The problem is that the last paragraph ends with \cell not with \par } @@ -362,7 +362,7 @@ TQString RTFWorker::formatTextParagraph(const TQString& strText, } TQString RTFWorker::ProcessParagraphData ( const TQString ¶Text, - const LayoutData& tqlayout, const ValueListFormatData ¶FormatDataList) + const LayoutData& layout, const ValueListFormatData ¶FormatDataList) { TQString str; TQString content; @@ -374,40 +374,40 @@ TQString RTFWorker::ProcessParagraphData ( const TQString ¶Text, markup += "\\intbl"; //lists - if (tqlayout.counter.style) + if (layout.counter.style) { markup += "{\\pntext\\pard\\plain"; - if( tqlayout.formatData.text.fontSize >= 0) + if( layout.formatData.text.fontSize >= 0) { markup += "\\fs"; - markup += TQString::number((2 * tqlayout.formatData.text.fontSize)); - markup += lookupFont("\\f",tqlayout.formatData.text.fontName); + markup += TQString::number((2 * layout.formatData.text.fontSize)); + markup += lookupFont("\\f",layout.formatData.text.fontName); } markup += " "; - markup += tqlayout.counter.text; + markup += layout.counter.text; markup += "\\tab}{\\*\\pn"; - if (tqlayout.counter.style > 5) + if (layout.counter.style > 5) { markup += "\\pnlvlblt "; markup += "{\\pntxtb "; - if (!tqlayout.counter.lefttext.isEmpty() && tqlayout.counter.lefttext != "{" && tqlayout.counter.lefttext != "}") + if (!layout.counter.lefttext.isEmpty() && layout.counter.lefttext != "{" && layout.counter.lefttext != "}") { - markup += tqlayout.counter.lefttext; + markup += layout.counter.lefttext; } - switch (tqlayout.counter.style) + switch (layout.counter.style) { case 6: { //custom bullets (one char) //TODO: use correct character/sign for bullet - markup += tqlayout.counter.customCharacter; + markup += layout.counter.customCharacter; break; } case 7: { //custom bullets (complex) - markup += tqlayout.counter.text; + markup += layout.counter.text; break; } case 8: @@ -435,7 +435,7 @@ TQString RTFWorker::ProcessParagraphData ( const TQString ¶Text, { //disc bullets //TODO: use correct character/sign for bullet - markup += tqlayout.counter.text; + markup += layout.counter.text; break; } default: @@ -445,23 +445,23 @@ TQString RTFWorker::ProcessParagraphData ( const TQString ¶Text, } else { - if (tqlayout.counter.numbering!=0) + if (layout.counter.numbering!=0) { markup += "\\pnlvl"; - markup += TQString::number(tqlayout.counter.depth + 1); + markup += TQString::number(layout.counter.depth + 1); markup += "\\pnprev1"; } - else if (tqlayout.counter.style==1) + else if (layout.counter.style==1) { markup += "\\pnlvlbody"; } else { markup += "\\pnlvl"; - markup += TQString::number(11 - tqlayout.counter.style); + markup += TQString::number(11 - layout.counter.style); } - switch (tqlayout.counter.style) + switch (layout.counter.style) { case 1: { @@ -492,18 +492,18 @@ TQString RTFWorker::ProcessParagraphData ( const TQString ¶Text, markup += "\\pndec"; } markup += "{\\pntxtb "; - markup += tqlayout.counter.lefttext; + markup += layout.counter.lefttext; markup += " }"; } markup += "{\\pntxta "; - markup += tqlayout.counter.righttext; + markup += layout.counter.righttext; markup += " }"; // ### FIXME: that is too late! And why at every list paragraph? (See bug #88241) - if (tqlayout.counter.start!=0) + if (layout.counter.start!=0) { markup += "\\pnstart"; - markup += TQString::number(tqlayout.counter.start); + markup += TQString::number(layout.counter.start); } else { @@ -511,15 +511,15 @@ TQString RTFWorker::ProcessParagraphData ( const TQString ¶Text, } markup += "\\pnindent0\\pnhang"; - if( tqlayout.formatData.text.fontSize > 0 ) + if( layout.formatData.text.fontSize > 0 ) { markup += "\\pnfs"; - markup += TQString::number((2 * tqlayout.formatData.text.fontSize)); + markup += TQString::number((2 * layout.formatData.text.fontSize)); } - if( !tqlayout.formatData.text.fontName.isEmpty() ) + if( !layout.formatData.text.fontName.isEmpty() ) { - markup += lookupFont("\\pnf", tqlayout.formatData.text.fontName); + markup += lookupFont("\\pnf", layout.formatData.text.fontName); } markup += "}"; @@ -527,20 +527,20 @@ TQString RTFWorker::ProcessParagraphData ( const TQString ¶Text, LayoutData styleLayout; - markup += lookupStyle(tqlayout.styleName, styleLayout); - markup += layoutToRtf(styleLayout,tqlayout,true); + markup += lookupStyle(layout.styleName, styleLayout); + markup += layoutToRtf(styleLayout,layout,true); - if ( 1==tqlayout.formatData.text.verticalAlignment ) + if ( 1==layout.formatData.text.verticalAlignment ) { markup += "\\sub"; //Subscript } - else if ( 2==tqlayout.formatData.text.verticalAlignment ) + else if ( 2==layout.formatData.text.verticalAlignment ) { markup += "\\super"; //Superscript } - if (tqlayout.pageBreakBefore) + if (layout.pageBreakBefore) content += "\\page "; @@ -554,7 +554,7 @@ TQString RTFWorker::ProcessParagraphData ( const TQString ¶Text, TQString partialText; - FormatData formatRef = tqlayout.formatData; + FormatData formatRef = layout.formatData; for ( paraFormatDataIt = paraFormatDataList.begin (); paraFormatDataIt != paraFormatDataList.end (); @@ -728,7 +728,7 @@ TQString RTFWorker::ProcessParagraphData ( const TQString ¶Text, const TQString prefixSaved = m_prefix; m_prefix = TQString(); for (it=paraList->begin();it!=end;++it) - fstr += ProcessParagraphData( (*it).text, (*it).tqlayout,(*it).formattingList); + fstr += ProcessParagraphData( (*it).text, (*it).layout,(*it).formattingList); m_prefix = prefixSaved; content += "{\\super "; content += automatic ? "\\chftn " : value; @@ -779,7 +779,7 @@ TQString RTFWorker::ProcessParagraphData ( const TQString ¶Text, } } - if (tqlayout.pageBreakAfter) + if (layout.pageBreakAfter) content += "\\page"; if (!content.isEmpty()) @@ -807,10 +807,10 @@ TQString RTFWorker::ProcessParagraphData ( const TQString ¶Text, } bool RTFWorker::doFullParagraph(const TQString& paraText, - const LayoutData& tqlayout, const ValueListFormatData& paraFormatDataList) + const LayoutData& layout, const ValueListFormatData& paraFormatDataList) { kdDebug(30515) << "Entering RTFWorker::doFullParagraph" << endl << paraText << endl; - TQString par = ProcessParagraphData( paraText, tqlayout, paraFormatDataList); + TQString par = ProcessParagraphData( paraText, layout, paraFormatDataList); m_textBody += par; kdDebug(30515) << "Quiting RTFWorker::doFullParagraph" << endl; return true; @@ -836,7 +836,7 @@ bool RTFWorker::doHeader(const HeaderData& header) TQValueList<ParaData>::ConstIterator it; TQValueList<ParaData>::ConstIterator end(header.para.end()); for (it=header.para.begin();it!=end;++it) - content += ProcessParagraphData( (*it).text,(*it).tqlayout,(*it).formattingList); + content += ProcessParagraphData( (*it).text,(*it).layout,(*it).formattingList); if (content!="\\par\\pard\\plain") { @@ -871,7 +871,7 @@ bool RTFWorker::doFooter(const FooterData& footer) TQValueList<ParaData>::ConstIterator it; TQValueList<ParaData>::ConstIterator end(footer.para.end()); for (it=footer.para.begin();it!=end;++it) - content += ProcessParagraphData( (*it).text,(*it).tqlayout,(*it).formattingList); + content += ProcessParagraphData( (*it).text,(*it).layout,(*it).formattingList); if (content!="\\par\\pard\\plain") { @@ -1182,7 +1182,7 @@ TQString RTFWorker::closeSpan(const FormatData& , const FormatData& ) return result; } -// The following function encodes the kword tqunicode characters into +// The following function encodes the kword unicode characters into // RTF seven bit ASCII. This affects any 8 bit characters. // They are encoded either with \' or with \u TQString RTFWorker::escapeRtfText ( const TQString& text ) const @@ -1192,8 +1192,8 @@ TQString RTFWorker::escapeRtfText ( const TQString& text ) const const uint length = text.length(); for ( uint i = 0; i < length; i++ ) { - TQChar TQCh ( text.at( i ) ); // get out one tqunicode char from the string - const ushort ch = TQCh.tqunicode(); // take tqunicode value of the char + TQChar TQCh ( text.at( i ) ); // get out one unicode char from the string + const ushort ch = TQCh.unicode(); // take unicode value of the char if ( TQCh == '\\' ) escapedText += "\\\\"; // back-slash else if ( TQCh == '{' ) escapedText += "\\{"; @@ -1226,7 +1226,7 @@ TQString RTFWorker::escapeRtfText ( const TQString& text ) const } else if ( ch >= 256) // check for a higher code non-ASCII character { - // encode this as decimal tqunicode with a replacement character. + // encode this as decimal unicode with a replacement character. escapedText += "\\u"; escapedText += TQString::number ( ch, 10 ); // We decompose the character. If it works, the first character is whitout any accent. @@ -1270,15 +1270,15 @@ bool RTFWorker::doFullPaperBorders (const double top, const double left, return true; } -bool RTFWorker::doFullDefineStyle(LayoutData& tqlayout) +bool RTFWorker::doFullDefineStyle(LayoutData& layout) { //Register the new style in the style list - m_styleList << tqlayout; + m_styleList << layout; // Now we must register a few things (with help of the lookup methods.) - lookupFont("\\f", tqlayout.formatData.text.fontName); - lookupColor(TQString(), tqlayout.formatData.text.fgColor); - lookupColor(TQString(), tqlayout.formatData.text.bgColor); + lookupFont("\\f", layout.formatData.text.fontName); + lookupColor(TQString(), layout.formatData.text.fgColor); + lookupColor(TQString(), layout.formatData.text.bgColor); return true; } @@ -1459,121 +1459,121 @@ TQString RTFWorker::textFormatToRtf(const TextFormatting& formatOrigin, } TQString RTFWorker::layoutToRtf(const LayoutData& layoutOrigin, - const LayoutData& tqlayout, const bool force) + const LayoutData& layout, const bool force) { TQString strLayout; - if (force || (layoutOrigin.alignment!=tqlayout.alignment)) + if (force || (layoutOrigin.alignment!=layout.alignment)) { - if (tqlayout.alignment=="left") + if (layout.alignment=="left") strLayout += "\\ql"; - else if (tqlayout.alignment== "right") + else if (layout.alignment== "right") strLayout += "\\qr"; - else if (tqlayout.alignment=="center") + else if (layout.alignment=="center") strLayout += "\\qc"; - else if (tqlayout.alignment=="justify") + else if (layout.alignment=="justify") strLayout += "\\qj"; - else if ( tqlayout.alignment=="auto") + else if ( layout.alignment=="auto") { // ### TODO: what for BIDI? //strLayout += "\\ql"; } else { - kdWarning(30515) << "Unknown alignment: " << tqlayout.alignment << endl; + kdWarning(30515) << "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 += "\\li"; - strLayout += TQString::number(int(tqlayout.indentLeft)*20, 10); + strLayout += TQString::number(int(layout.indentLeft)*20, 10); } - if ((tqlayout.indentRight>=0.0) - && (force || (layoutOrigin.indentRight!=tqlayout.indentRight))) + if ((layout.indentRight>=0.0) + && (force || (layoutOrigin.indentRight!=layout.indentRight))) { strLayout += "\\ri"; - strLayout += TQString::number(int(tqlayout.indentRight)*20, 10); + strLayout += TQString::number(int(layout.indentRight)*20, 10); } - if (force || (layoutOrigin.indentFirst!=tqlayout.indentFirst)) + if (force || (layoutOrigin.indentFirst!=layout.indentFirst)) { strLayout += "\\fi"; - strLayout += TQString::number(int(tqlayout.indentFirst)*20, 10); + strLayout += TQString::number(int(layout.indentFirst)*20, 10); } - if ((tqlayout.marginBottom>=0.0) - && (force || (layoutOrigin.marginBottom!=tqlayout.marginBottom))) + if ((layout.marginBottom>=0.0) + && (force || (layoutOrigin.marginBottom!=layout.marginBottom))) { strLayout += "\\sa"; - strLayout += TQString::number(int(tqlayout.marginBottom)*20 ,10); + strLayout += TQString::number(int(layout.marginBottom)*20 ,10); } - if ((tqlayout.marginTop>=0.0) - && (force || (layoutOrigin.marginTop!=tqlayout.marginTop))) + if ((layout.marginTop>=0.0) + && (force || (layoutOrigin.marginTop!=layout.marginTop))) { strLayout += "\\sb"; - strLayout += TQString::number(int(tqlayout.marginTop)*20, 10); + strLayout += TQString::number(int(layout.marginTop)*20, 10); } - if (force || (layoutOrigin.keepLinesTogether!=tqlayout.keepLinesTogether)) + if (force || (layoutOrigin.keepLinesTogether!=layout.keepLinesTogether)) { - if(tqlayout.keepLinesTogether) strLayout += "\\keep"; + if(layout.keepLinesTogether) strLayout += "\\keep"; } - // Note: there seems to be too many problems of using a page break in a tqlayout + // Note: there seems to be too many problems of using a page break in a layout // - KWord's RTF import filter makes the page break immediately (also in styles) // - AbiWord's RTF import does not like \*\pgbrk // ### TODO: decide if we really remove this code #if 0 - if (force || (layoutOrigin.pageBreakBefore!=tqlayout.pageBreakBefore)) + if (force || (layoutOrigin.pageBreakBefore!=layout.pageBreakBefore)) { - if(tqlayout.pageBreakBefore) strLayout += "\\pagebb"; + if(layout.pageBreakBefore) strLayout += "\\pagebb"; } // Note: RTF doesn't specify "page break after" // \*\pgbrk0 is used after OpenOffice.org Writer - if (force || (layoutOrigin.pageBreakAfter!=tqlayout.pageBreakAfter)) + if (force || (layoutOrigin.pageBreakAfter!=layout.pageBreakAfter)) { - if(tqlayout.pageBreakAfter) strLayout += "\\*\\pgbrk0"; + if(layout.pageBreakAfter) strLayout += "\\*\\pgbrk0"; } #endif if (force - || ( layoutOrigin.lineSpacingType != tqlayout.lineSpacingType ) - || ( layoutOrigin.lineSpacing != tqlayout.lineSpacing ) ) + || ( layoutOrigin.lineSpacingType != layout.lineSpacingType ) + || ( layoutOrigin.lineSpacing != layout.lineSpacing ) ) { - if ( tqlayout.lineSpacingType==LayoutData::LS_SINGLE ) + if ( layout.lineSpacingType==LayoutData::LS_SINGLE ) ;// do nothing, single linespace is default in RTF - else if ( tqlayout.lineSpacingType==LayoutData::LS_ONEANDHALF ) + else if ( layout.lineSpacingType==LayoutData::LS_ONEANDHALF ) strLayout += "\\sl360\\slmult1"; // one-and-half linespace - else if ( tqlayout.lineSpacingType==LayoutData::LS_DOUBLE ) + else if ( layout.lineSpacingType==LayoutData::LS_DOUBLE ) strLayout += "\\sl480\\slmult1"; // double linespace - else if ( tqlayout.lineSpacingType==LayoutData::LS_ATLEAST ) - strLayout += TQString("\\sl%1\\slmult0").arg(int(tqlayout.lineSpacing)*20); + else if ( layout.lineSpacingType==LayoutData::LS_ATLEAST ) + strLayout += TQString("\\sl%1\\slmult0").arg(int(layout.lineSpacing)*20); - else if ( tqlayout.lineSpacingType==LayoutData::LS_MULTIPLE ) - strLayout += TQString("\\sl%1\\slmult1").arg( int(tqlayout.lineSpacing)*240 ); + else if ( layout.lineSpacingType==LayoutData::LS_MULTIPLE ) + strLayout += TQString("\\sl%1\\slmult1").arg( int(layout.lineSpacing)*240 ); - else if ( tqlayout.lineSpacingType==LayoutData::LS_CUSTOM ) + else if ( layout.lineSpacingType==LayoutData::LS_CUSTOM ) // "Custom" in KWord is like "Exactly" in MS Word - strLayout += TQString("\\sl-%1\\slmult0").arg(int(tqlayout.lineSpacing)*20); + strLayout += TQString("\\sl-%1\\slmult0").arg(int(layout.lineSpacing)*20); else - kdWarning(30515) << "Unsupported lineSpacingType: " << tqlayout.lineSpacingType << " (Ignoring!)" << endl; + kdWarning(30515) << "Unsupported lineSpacingType: " << layout.lineSpacingType << " (Ignoring!)" << endl; } - if (!tqlayout.tabulatorList.isEmpty() - && (force || (layoutOrigin.tabulatorList!=tqlayout.tabulatorList) )) + if (!layout.tabulatorList.isEmpty() + && (force || (layoutOrigin.tabulatorList!=layout.tabulatorList) )) { TabulatorList::ConstIterator it; - for (it=tqlayout.tabulatorList.begin();it!=tqlayout.tabulatorList.end();++it) + for (it=layout.tabulatorList.begin();it!=layout.tabulatorList.end();++it) { switch ((*it).m_type) { @@ -1606,7 +1606,7 @@ TQString RTFWorker::layoutToRtf(const LayoutData& layoutOrigin, // shadow support // note shadow in KWord is more full-feature/sophisticated than RTF // here we just treat KWord's shadow as simple \shad mark-up - if( tqlayout.shadowDistance > 0 ) + if( layout.shadowDistance > 0 ) { strLayout += "\\shad"; } @@ -1615,7 +1615,7 @@ TQString RTFWorker::layoutToRtf(const LayoutData& layoutOrigin, // This must remain last, as it adds a terminating space. strLayout+=textFormatToRtf(layoutOrigin.formatData.text, - tqlayout.formatData.text,force); + layout.formatData.text,force); return strLayout; } @@ -1708,9 +1708,9 @@ TQString RTFWorker::lookupStyle(const TQString& styleName, LayoutData& returnLay } kdDebug(30515) << "New style: " << styleName << " count: " << counter << endl; - LayoutData tqlayout; - m_styleList << tqlayout; - returnLayout=tqlayout; + LayoutData layout; + m_styleList << layout; + returnLayout=layout; strMarkup += TQString::number(counter); return strMarkup; diff --git a/filters/kword/rtf/export/ExportFilter.h b/filters/kword/rtf/export/ExportFilter.h index 88158efe..f5707680 100644 --- a/filters/kword/rtf/export/ExportFilter.h +++ b/filters/kword/rtf/export/ExportFilter.h @@ -44,7 +44,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); @@ -53,7 +53,7 @@ public: const double width, const double height, const int orientation); virtual bool doFullPaperBorders (const double top, const double left, const double bottom, const double right); - virtual bool doFullDefineStyle(LayoutData& tqlayout); + virtual bool doFullDefineStyle(LayoutData& layout); virtual bool doHeader(const HeaderData& header); virtual bool doFooter(const FooterData& footer); virtual bool doVariableSettings(const VariableSettingsData& vs); @@ -69,7 +69,7 @@ private: */ TQString escapeRtfText ( const TQString& text ) const; TQString ProcessParagraphData ( const TQString ¶Text, - const LayoutData& tqlayout, const ValueListFormatData ¶FormatDataList); + const LayoutData& layout, const ValueListFormatData ¶FormatDataList); TQString formatTextParagraph(const TQString& strText, const FormatData& formatOrigin, const FormatData& format); TQString makeTable(const FrameAnchor& anchor); @@ -81,7 +81,7 @@ private: TQString textFormatToRtf(const TextFormatting& formatOrigin, const TextFormatting& formatData, const bool force); TQString layoutToRtf(const LayoutData& layoutOrigin, - const LayoutData& tqlayout, const bool force); + const LayoutData& layout, const bool force); TQString lookupFont(const TQString& markup, const TQString& fontName); TQString lookupColor(const TQString& markup, const TQColor& color); TQString lookupStyle(const TQString& styleName, LayoutData& returnLayout); diff --git a/filters/kword/rtf/import/rtfimport.cpp b/filters/kword/rtf/import/rtfimport.cpp index 465a7478..eb8c467d 100644 --- a/filters/kword/rtf/import/rtfimport.cpp +++ b/filters/kword/rtf/import/rtfimport.cpp @@ -98,7 +98,7 @@ static RTFProperty propertyTable[] = MEMBER( 0L, "b", setToggleProperty, state.format.bold, 0 ), // \bin is handled in the tokenizer MEMBER( "@colortbl", "blue", setNumericProperty, blue, 0 ), - MEMBER( 0L, "box", setEnumProperty, state.tqlayout.border, 0 ), + MEMBER( 0L, "box", setEnumProperty, state.layout.border, 0 ), PROP( 0L, "brdrb", selectLayoutBorder, 0L, 3 ), PROP( 0L, "brdrcf", setBorderColor, 0L, 0 ), PROP( 0L, "brdrdash", setBorderStyle, 0L, RTFBorder::Dashes ), @@ -148,7 +148,7 @@ static RTFProperty propertyTable[] = MEMBER( "@rtf", "facingp", setFlagProperty, facingPages, true ), PROP( 0L, "fcharset", setCharset, 0L, 0 ), // Not needed with TQt PROP( "@fonttbl", "fdecor", setFontStyleHint, 0L, TQFont::Decorative ), - MEMBER( 0L, "fi", setNumericProperty, state.tqlayout.firstIndent, 0 ), + MEMBER( 0L, "fi", setNumericProperty, state.layout.firstIndent, 0 ), PROP( "@fonttbl", "fmodern", setFontStyleHint, 0L, TQFont::TypeWriter ), PROP( "@fonttbl", "fnil", setFontStyleHint, 0L, TQFont::AnyStyle ), MEMBER( 0L, "footery", setNumericProperty, state.section.footerMargin, 0 ), @@ -162,13 +162,13 @@ static RTFProperty propertyTable[] = MEMBER( "@colortbl", "green", setNumericProperty, green, 0 ), MEMBER( 0L, "headery", setNumericProperty, state.section.headerMargin, 0 ), MEMBER( 0L, "i", setToggleProperty, state.format.italic, 0 ), - MEMBER( 0L, "intbl", setFlagProperty, state.tqlayout.inTable, true ), + MEMBER( 0L, "intbl", setFlagProperty, state.layout.inTable, true ), PROP( "@pict", "jpegblip", setPictureType, 0L, RTFPicture::JPEG ), - MEMBER( 0L, "keep", setFlagProperty, state.tqlayout.keep, true ), - MEMBER( 0L, "keepn", setFlagProperty, state.tqlayout.keepNext, true ), + MEMBER( 0L, "keep", setFlagProperty, state.layout.keep, true ), + MEMBER( 0L, "keepn", setFlagProperty, state.layout.keepNext, true ), MEMBER( "@rtf", "landscape", setFlagProperty, landscape, true ), PROP( 0L, "ldblquote", insertSymbol, 0L, 0x201c ), - MEMBER( 0L, "li", setNumericProperty, state.tqlayout.leftIndent, 0 ), + MEMBER( 0L, "li", setNumericProperty, state.layout.leftIndent, 0 ), PROP( 0L, "line", insertSymbol, 0L, 0x000a ), PROP( 0L, "lquote", insertSymbol, 0L, 0x2018 ), PROP( 0L, "ltrmark", insertSymbol, 0L, 0x200e ), @@ -180,14 +180,14 @@ static RTFProperty propertyTable[] = MEMBER( "@rtf", "margt", setNumericProperty, topMargin, 0 ), MEMBER( 0L, "nosupersub", setEnumProperty, state.format.vertAlign, RTFFormat::Normal ), PROP( "Text", "page", insertPageBreak, 0L, 0 ), - MEMBER( 0L, "pagebb", setFlagProperty, state.tqlayout.pageBB, true ), + MEMBER( 0L, "pagebb", setFlagProperty, state.layout.pageBB, true ), MEMBER( "@rtf", "paperh", setNumericProperty, paperHeight, 0 ), MEMBER( "@rtf", "paperw", setNumericProperty, paperWidth, 0 ), PROP( "Text", "par", insertParagraph, 0L, 0 ), PROP( 0L, "pard", setParagraphDefaults, 0L, 0 ), PROP( 0L, "pc", setPcCodepage, 0L, 0 ), PROP( 0L, "pca", setPcaCodepage, 0L, 0 ), - MEMBER( 0L, "pgbrk", setToggleProperty, state.tqlayout.pageBA, true ), + MEMBER( 0L, "pgbrk", setToggleProperty, state.layout.pageBA, true ), MEMBER( "@pict", "piccropb", setNumericProperty, picture.cropBottom, 0 ), MEMBER( "@pict", "piccropl", setNumericProperty, picture.cropLeft, 0 ), MEMBER( "@pict", "piccropr", setNumericProperty, picture.cropRight, 0 ), @@ -202,25 +202,25 @@ static RTFProperty propertyTable[] = PROP( 0L, "plain", setPlainFormatting, 0L, 0 ), PROP( "@pict", "pmmetafile", setPictureType, 0L, RTFPicture::WMF ), PROP( "@pict", "pngblip", setPictureType, 0L, RTFPicture::PNG ), - MEMBER( 0L, "qc", setEnumProperty, state.tqlayout.alignment, RTFLayout::Centered ), - MEMBER( 0L, "qj", setEnumProperty, state.tqlayout.alignment, RTFLayout::Justified ), - MEMBER( 0L, "ql", setEnumProperty, state.tqlayout.alignment, RTFLayout::Left ), + MEMBER( 0L, "qc", setEnumProperty, state.layout.alignment, RTFLayout::Centered ), + MEMBER( 0L, "qj", setEnumProperty, state.layout.alignment, RTFLayout::Justified ), + MEMBER( 0L, "ql", setEnumProperty, state.layout.alignment, RTFLayout::Left ), PROP( 0L, "qmspace", insertSymbol, 0L, 0x2004 ), - MEMBER( 0L, "qr", setEnumProperty, state.tqlayout.alignment, RTFLayout::Right ), + MEMBER( 0L, "qr", setEnumProperty, state.layout.alignment, RTFLayout::Right ), PROP( 0L, "rdblquote", insertSymbol, 0L, 0x201d ), MEMBER( "@colortbl", "red", setNumericProperty, red, 0 ), - MEMBER( 0L, "ri", setNumericProperty, state.tqlayout.rightIndent, 0 ), + MEMBER( 0L, "ri", setNumericProperty, state.layout.rightIndent, 0 ), PROP( "Text", "row", insertTableRow, 0L, 0 ), PROP( 0L, "rquote", insertSymbol, 0L, 0x2019 ), PROP( 0L, "rtlmark", insertSymbol, 0L, 0x200f ), - MEMBER( 0L, "s", setNumericProperty, state.tqlayout.style, 0 ), - MEMBER( 0L, "sa", setNumericProperty, state.tqlayout.spaceAfter, 0 ), - MEMBER( 0L, "sb", setNumericProperty, state.tqlayout.spaceBefore, 0 ), + MEMBER( 0L, "s", setNumericProperty, state.layout.style, 0 ), + MEMBER( 0L, "sa", setNumericProperty, state.layout.spaceAfter, 0 ), + MEMBER( 0L, "sb", setNumericProperty, state.layout.spaceBefore, 0 ), MEMBER( 0L, "scaps", setToggleProperty, state.format.smallCaps, 0 ), PROP( "Text", "sect", insertPageBreak, 0L, 0 ), PROP( 0L, "sectd", setSectionDefaults, 0L, 0 ), - MEMBER( 0L, "sl", setNumericProperty, state.tqlayout.spaceBetween, 0 ), - MEMBER( 0L, "slmult", setToggleProperty, state.tqlayout.spaceBetweenMultiple, 0 ), + MEMBER( 0L, "sl", setNumericProperty, state.layout.spaceBetween, 0 ), + MEMBER( 0L, "slmult", setToggleProperty, state.layout.spaceBetweenMultiple, 0 ), MEMBER( "@stylesheet", "snext", setNumericProperty, style.next, 0 ), MEMBER( 0L, "strike", setToggleProperty, state.format.strike, 0 ), MEMBER( 0L, "striked", setToggleProperty, state.format.striked, 0 ), @@ -228,13 +228,13 @@ static RTFProperty propertyTable[] = MEMBER( 0L, "super", setEnumProperty, state.format.vertAlign, RTFFormat::SuperScript ), PROP( 0L, "tab", insertSymbol, 0L, 0x0009 ), MEMBER( 0L, "titlepg", setFlagProperty, state.section.titlePage, true ), - MEMBER( 0L, "tldot", setEnumProperty, state.tqlayout.tab.leader, RTFTab::Dots ), - MEMBER( 0L, "tlhyph", setEnumProperty, state.tqlayout.tab.leader, RTFTab::Hyphens ), - MEMBER( 0L, "tlth", setEnumProperty, state.tqlayout.tab.leader, RTFTab::ThickLine ), - MEMBER( 0L, "tlul", setEnumProperty, state.tqlayout.tab.leader, RTFTab::Underline ), - MEMBER( 0L, "tqc", setEnumProperty, state.tqlayout.tab.type, RTFTab::Centered ), - MEMBER( 0L, "tqdec", setEnumProperty, state.tqlayout.tab.type, RTFTab::Decimal ), - MEMBER( 0L, "tqr", setEnumProperty, state.tqlayout.tab.type, RTFTab::FlushRight ), + MEMBER( 0L, "tldot", setEnumProperty, state.layout.tab.leader, RTFTab::Dots ), + MEMBER( 0L, "tlhyph", setEnumProperty, state.layout.tab.leader, RTFTab::Hyphens ), + MEMBER( 0L, "tlth", setEnumProperty, state.layout.tab.leader, RTFTab::ThickLine ), + MEMBER( 0L, "tlul", setEnumProperty, state.layout.tab.leader, RTFTab::Underline ), + MEMBER( 0L, "tqc", setEnumProperty, state.layout.tab.type, RTFTab::Centered ), + MEMBER( 0L, "tqdec", setEnumProperty, state.layout.tab.type, RTFTab::Decimal ), + MEMBER( 0L, "tqr", setEnumProperty, state.layout.tab.type, RTFTab::FlushRight ), MEMBER( 0L, "trleft", setNumericProperty, state.tableRow.left, 0 ), MEMBER( 0L, "trowd", setTableRowDefaults, state.tableRow, 0 ), MEMBER( 0L, "trqc", setEnumProperty, state.tableRow.alignment, RTFLayout::Centered ), @@ -731,7 +731,7 @@ KoFilter::ConversionStatus RTFImport::convert( const TQCString& from, const TQCS // Search for 'following' style for (TQValueList<RTFStyle>::ConstIterator it2=styleSheet.begin();it2!=endStyleSheet;++it2) { - if ((*it2).tqlayout.style == (*it).next) + if ((*it2).layout.style == (*it).next) { mainDoc.addNode( "FOLLOWING" ); mainDoc.setAttribute( "name", CheckAndEscapeXmlText( (*it2).name )); @@ -739,7 +739,7 @@ KoFilter::ConversionStatus RTFImport::convert( const TQCString& from, const TQCS break; } } - addLayout( mainDoc, (*it).name, (*it).tqlayout, false ); + addLayout( mainDoc, (*it).name, (*it).layout, false ); addFormat( mainDoc, kwFormat, 0L ); mainDoc.closeNode( "STYLE" ); } @@ -933,15 +933,15 @@ void RTFImport::setUnderlineProperty( RTFProperty* property ) void RTFImport::setBorderStyle( RTFProperty *property ) { - if (state.tqlayout.border) + if (state.layout.border) { - state.tqlayout.border->style = static_cast <RTFBorder::BorderStyle> ( property->value ); + state.layout.border->style = static_cast <RTFBorder::BorderStyle> ( property->value ); } else { for (uint i=0; i < 4; i++) { - state.tqlayout.borders[i].style = static_cast <RTFBorder::BorderStyle> ( property->value ); + state.layout.borders[i].style = static_cast <RTFBorder::BorderStyle> ( property->value ); } } } @@ -949,30 +949,30 @@ void RTFImport::setBorderStyle( RTFProperty *property ) void RTFImport::setBorderProperty( RTFProperty *property ) { //kdDebug() << "setBorderProperty: " << endl; - if (state.tqlayout.border) + if (state.layout.border) { - state.tqlayout.border->width = token.value; + state.layout.border->width = token.value; } else { for (uint i=0; i < 4; i++) { - state.tqlayout.borders[i].width = token.value; + state.layout.borders[i].width = token.value; } } } void RTFImport::setBorderColor( RTFProperty * ) { - if (state.tqlayout.border) + if (state.layout.border) { - state.tqlayout.border->color = token.value; + state.layout.border->color = token.value; } else { for (uint i=0; i < 4; i++) { - state.tqlayout.borders[i].color = token.value; + state.layout.borders[i].color = token.value; } } } @@ -1008,34 +1008,34 @@ void RTFImport::setPlainFormatting( RTFProperty * ) void RTFImport::setParagraphDefaults( RTFProperty * ) { - RTFLayout &tqlayout = state.tqlayout; + RTFLayout &layout = state.layout; - tqlayout.tablist.clear(); - tqlayout.tab.type = RTFTab::Left; - tqlayout.tab.leader = RTFTab::None; + layout.tablist.clear(); + layout.tab.type = RTFTab::Left; + layout.tab.leader = RTFTab::None; for (uint i=0; i < 4; i++) { - RTFBorder &border = tqlayout.borders[i]; + RTFBorder &border = layout.borders[i]; border.color = -1; border.width = 0; border.style = RTFBorder::None; } - tqlayout.firstIndent = 0; - tqlayout.leftIndent = 0; - tqlayout.rightIndent = 0; - tqlayout.spaceBefore = 0; - tqlayout.spaceAfter = 0; - tqlayout.spaceBetween = 0; - tqlayout.spaceBetweenMultiple = false; - tqlayout.style = 0; - tqlayout.alignment = RTFLayout::Left; - tqlayout.border = 0L; - tqlayout.inTable = false; - tqlayout.keep = false; - tqlayout.keepNext = false; - tqlayout.pageBB = false; - tqlayout.pageBA = false; + layout.firstIndent = 0; + layout.leftIndent = 0; + layout.rightIndent = 0; + layout.spaceBefore = 0; + layout.spaceAfter = 0; + layout.spaceBetween = 0; + layout.spaceBetweenMultiple = false; + layout.style = 0; + layout.alignment = RTFLayout::Left; + layout.border = 0L; + layout.inTable = false; + layout.keep = false; + layout.keepNext = false; + layout.pageBB = false; + layout.pageBA = false; } void RTFImport::setSectionDefaults( RTFProperty * ) @@ -1069,17 +1069,17 @@ void RTFImport::setTableRowDefaults( RTFProperty * ) void RTFImport::selectLayoutBorder( RTFProperty * property ) { - state.tqlayout.border = & state.tqlayout.borders [ property->value ]; + state.layout.border = & state.layout.borders [ property->value ]; } void RTFImport::selectLayoutBorderFromCell( RTFProperty * property ) { - state.tqlayout.border = & state.tableCell.borders [ property->value ]; + state.layout.border = & state.tableCell.borders [ property->value ]; } void RTFImport::insertParagraph( RTFProperty * ) { - if (state.tqlayout.inTable) + if (state.layout.inTable) { if (textState->table == 0) { @@ -1110,10 +1110,10 @@ void RTFImport::insertPageBreak( RTFProperty * ) void RTFImport::insertTableCell( RTFProperty * ) { //{{ - bool b = state.tqlayout.inTable; - state.tqlayout.inTable = true; + bool b = state.layout.inTable; + state.layout.inTable = true; insertParagraph(); - state.tqlayout.inTable = b; + state.layout.inTable = b; //}} textState->frameSets << textState->cell.toString(); textState->cell.clear( 3 ); @@ -1135,9 +1135,9 @@ void RTFImport::insertTableRow( RTFProperty * ) // Store the current state on the stack stateStack.push( state ); resetState(); - state.tqlayout.alignment = align; // table alignment + state.layout.alignment = align; // table alignment - // Add anchor for new table (default tqlayout) + // Add anchor for new table (default layout) addAnchor( buf ); addParagraph( textState->node, false ); @@ -1202,9 +1202,9 @@ void RTFImport::insertCellDef( RTFProperty * ) void RTFImport::insertTabDef( RTFProperty * ) { - RTFTab tab = state.tqlayout.tab; + RTFTab tab = state.layout.tab; tab.position = token.value; - state.tqlayout.tablist.push( tab ); + state.layout.tablist.push( tab ); tab.type = RTFTab::Left; tab.leader = RTFTab::None; } @@ -1386,8 +1386,8 @@ void RTFImport::parseStyleSheet( RTFProperty * ) *strchr( token.text, ';' ) = 0; // ### TODO: is this allowed with multi-byte Asian characters? style.name += textCodec->toUnicode( token.text ); style.format = state.format; - style.tqlayout = state.tqlayout; - style.next = (style.next == -1) ? style.tqlayout.style : style.next; + style.layout = state.layout; + style.next = (style.next == -1) ? style.layout.style : style.next; styleSheet << style; style.name.truncate( 0 ); style.next = -1; @@ -2261,40 +2261,40 @@ void RTFImport::addFormat( DomNode &node, const KWFormat& format, const RTFForma node.closeNode( "FORMAT" ); } -void RTFImport::addLayout( DomNode &node, const TQString &name, const RTFLayout &tqlayout, bool frameBreak ) +void RTFImport::addLayout( DomNode &node, const TQString &name, const RTFLayout &layout, bool frameBreak ) { // Style name and alignment node.addNode( "NAME" ); node.setAttribute( "value", CheckAndEscapeXmlText(name) ); node.closeNode( "NAME" ); node.addNode( "FLOW" ); - node.setAttribute( "align", alignN[tqlayout.alignment] ); + node.setAttribute( "align", alignN[layout.alignment] ); node.closeNode( "FLOW" ); // Indents - if (tqlayout.firstIndent || tqlayout.leftIndent || tqlayout.rightIndent) + if (layout.firstIndent || layout.leftIndent || layout.rightIndent) { node.addNode( "INDENTS" ); - if (tqlayout.firstIndent) - node.setAttribute( "first", .05*tqlayout.firstIndent ); - if (tqlayout.leftIndent) - node.setAttribute( "left", .05*tqlayout.leftIndent ); - if (tqlayout.rightIndent) - node.setAttribute( "right", .05*tqlayout.rightIndent ); + if (layout.firstIndent) + node.setAttribute( "first", .05*layout.firstIndent ); + if (layout.leftIndent) + node.setAttribute( "left", .05*layout.leftIndent ); + if (layout.rightIndent) + node.setAttribute( "right", .05*layout.rightIndent ); node.closeNode( "INDENTS" ); } // Offets - if (tqlayout.spaceBefore || tqlayout.spaceAfter) + if (layout.spaceBefore || layout.spaceAfter) { node.addNode( "OFFSETS" ); - if (tqlayout.spaceBefore) - node.setAttribute( "before", .05*tqlayout.spaceBefore ); - if (tqlayout.spaceAfter) - node.setAttribute( "after", .05*tqlayout.spaceAfter ); + if (layout.spaceBefore) + node.setAttribute( "before", .05*layout.spaceBefore ); + if (layout.spaceAfter) + node.setAttribute( "after", .05*layout.spaceAfter ); node.closeNode( "OFFSETS" ); } @@ -2304,10 +2304,10 @@ void RTFImport::addLayout( DomNode &node, const TQString &name, const RTFLayout TQString lineSpacingType; TQString lineSpacingValue; - if ( tqlayout.spaceBetweenMultiple ) + if ( layout.spaceBetweenMultiple ) { // Note: 240 is a sort of magic value for one line (Once upon a time, it meant 12pt for a single line) - switch (tqlayout.spaceBetween ) + switch (layout.spaceBetween ) { case 240: { @@ -2326,10 +2326,10 @@ void RTFImport::addLayout( DomNode &node, const TQString &name, const RTFLayout } default: { - if ( tqlayout.spaceBetween > 0 ) + if ( layout.spaceBetween > 0 ) { lineSpacingType = "multiple"; - lineSpacingValue.setNum( tqlayout.spaceBetween / 240.0 ); + lineSpacingValue.setNum( layout.spaceBetween / 240.0 ); } break; } @@ -2337,16 +2337,16 @@ void RTFImport::addLayout( DomNode &node, const TQString &name, const RTFLayout } else { - if (tqlayout.spaceBetween > 0) + if (layout.spaceBetween > 0) { lineSpacingType = "atleast"; - lineSpacingValue.setNum( 0.05*tqlayout.spaceBetween ); + lineSpacingValue.setNum( 0.05*layout.spaceBetween ); } - if (tqlayout.spaceBetween < 0) + if (layout.spaceBetween < 0) { // negative linespace means "exact" lineSpacingType = "fixed" ; - lineSpacingValue.setNum( -0.05*tqlayout.spaceBetween ); + lineSpacingValue.setNum( -0.05*layout.spaceBetween ); } } @@ -2359,20 +2359,20 @@ void RTFImport::addLayout( DomNode &node, const TQString &name, const RTFLayout node.closeNode( "LINESPACING" ); } - if (tqlayout.keep || tqlayout.pageBB || tqlayout.pageBA || frameBreak || tqlayout.keepNext) + if (layout.keep || layout.pageBB || layout.pageBA || frameBreak || layout.keepNext) { node.addNode( "PAGEBREAKING" ); - node.setAttribute( "linesTogether", boolN[tqlayout.keep] ); - node.setAttribute( "hardFrameBreak", boolN[tqlayout.pageBB] ); - node.setAttribute( "hardFrameBreakAfter", boolN[tqlayout.pageBA || frameBreak] ); - node.setAttribute( "keepWithNext", boolN[tqlayout.keepNext] ); + node.setAttribute( "linesTogether", boolN[layout.keep] ); + node.setAttribute( "hardFrameBreak", boolN[layout.pageBB] ); + node.setAttribute( "hardFrameBreakAfter", boolN[layout.pageBA || frameBreak] ); + node.setAttribute( "keepWithNext", boolN[layout.keepNext] ); node.closeNode( "PAGEBREAKING" ); } // Paragraph borders for (uint i=0; i < 4; i++) { - const RTFBorder &border = tqlayout.borders[i]; + const RTFBorder &border = layout.borders[i]; if (border.style != RTFBorder::None || border.width > 0) { @@ -2386,21 +2386,21 @@ void RTFImport::addLayout( DomNode &node, const TQString &name, const RTFLayout } // Add automatic tab stop for hanging indent - if (tqlayout.firstIndent < 0 && tqlayout.leftIndent > 0) + if (layout.firstIndent < 0 && layout.leftIndent > 0) { node.addNode( "TABULATOR" ); node.setAttribute( "type", 0 ); - node.setAttribute( "ptpos", .05*tqlayout.leftIndent ); + node.setAttribute( "ptpos", .05*layout.leftIndent ); node.closeNode( "TABULATOR" ); } // Tabulators - if (!tqlayout.tablist.isEmpty()) + if (!layout.tablist.isEmpty()) { // ### TODO: use ConstIterator - for (uint i=0; i < tqlayout.tablist.count(); i++) + for (uint i=0; i < layout.tablist.count(); i++) { - const RTFTab &tab = tqlayout.tablist[i]; + const RTFTab &tab = layout.tablist[i]; int l = (int)tab.leader; node.addNode( "TABULATOR" ); node.setAttribute( "type", tab.type ); @@ -2422,12 +2422,12 @@ void RTFImport::addParagraph( DomNode &node, bool frameBreak ) // Search for style in style sheet TQString name; const RTFFormat* format = &state.format; - const int styleNum = state.tqlayout.style; + const int styleNum = state.layout.style; const TQValueList<RTFStyle>::ConstIterator endStyleSheet = styleSheet.end(); for ( TQValueList<RTFStyle>::ConstIterator it=styleSheet.begin(); it!=endStyleSheet; ++it ) { - if ( (*it).tqlayout.style == styleNum ) + if ( (*it).layout.style == styleNum ) { if ( textState->length > 0 ) { @@ -2468,9 +2468,9 @@ void RTFImport::addParagraph( DomNode &node, bool frameBreak ) node.closeNode( "FORMATS" ); } - // Write out tqlayout and format + // Write out layout and format node.addNode( "LAYOUT" ); - addLayout( node, name, state.tqlayout, frameBreak ); + addLayout( node, name, state.layout, frameBreak ); addFormat( node, kwFormat, 0L ); node.closeNode( "LAYOUT" ); node.closeNode( "PARAGRAPH" ); diff --git a/filters/kword/rtf/import/rtfimport.h b/filters/kword/rtf/import/rtfimport.h index bdf6f940..044a6095 100644 --- a/filters/kword/rtf/import/rtfimport.h +++ b/filters/kword/rtf/import/rtfimport.h @@ -173,7 +173,7 @@ struct RTFStyle { TQString name; RTFFormat format; - RTFLayout tqlayout; + RTFLayout layout; int next; }; @@ -232,7 +232,7 @@ struct RTFGroupState RTFTableRow tableRow; RTFTableCell tableCell; RTFFormat format; - RTFLayout tqlayout; + RTFLayout layout; RTFSectionLayout section; /// '}' will close the current destination bool brace0; @@ -408,7 +408,7 @@ public: void insertSymbol( RTFProperty *property ); /// Insert special character (hexadecimal escape value). void insertHexSymbol( RTFProperty * ); - /// Insert tqunicode character (keyword \\u). + /// Insert unicode character (keyword \\u). void insertUnicodeSymbol( RTFProperty * ); /** * Insert a date or time field @@ -489,13 +489,13 @@ public: */ void addFormat( DomNode &node, const KWFormat& format, const RTFFormat* baseFormat ); /** - * Add tqlayout information to document node. + * Add layout information to document node. * @param node the document node (destination) * @param name the name of the current style - * @param tqlayout the paragraph tqlayout information + * @param layout the paragraph layout information * @param frameBreak paragraph is always the last in a frame if true */ - void addLayout( DomNode &node, const TQString &name, const RTFLayout &tqlayout, bool frameBreak ); + void addLayout( DomNode &node, const TQString &name, const RTFLayout &layout, bool frameBreak ); /** * Add paragraph information to document node. * @param node the document node (destination) diff --git a/filters/kword/rtf/import/rtfimport_dom.cpp b/filters/kword/rtf/import/rtfimport_dom.cpp index 95fa43fc..98911415 100644 --- a/filters/kword/rtf/import/rtfimport_dom.cpp +++ b/filters/kword/rtf/import/rtfimport_dom.cpp @@ -30,7 +30,7 @@ TQString CheckAndEscapeXmlText(const TQString& strText) for (uint i=0; i<strReturn.length(); i++) { ch = strReturn[i]; - const int test = ch.tqunicode(); + const int test = ch.unicode(); // The i+= is for the additional characters if (test == 38) { strReturn.replace(i, 1, "&"); i+=4; } // & diff --git a/filters/kword/rtf/status.html b/filters/kword/rtf/status.html index 4642bf83..904da9db 100644 --- a/filters/kword/rtf/status.html +++ b/filters/kword/rtf/status.html @@ -59,7 +59,7 @@ - Style sheet.<br> - Character formatting (size, color, bold, italic, underline, strikeout, subscript, superscript...).<br> - Font mapping (using TQFont/TQFontInfo).<br> - - Paragraph tqlayout (horizontal alignment, indents, space before/after, frame break).<br> + - Paragraph layout (horizontal alignment, indents, space before/after, frame break).<br> - Paragraph borders (style, color, width).<br> - Tabulators, automatic tabulator for hanging indent.<br> - Unicode and codepages support.<br> diff --git a/filters/kword/wml/wmlexport.cc b/filters/kword/wml/wmlexport.cc index f18a3a7b..3f4712b9 100644 --- a/filters/kword/wml/wmlexport.cc +++ b/filters/kword/wml/wmlexport.cc @@ -51,7 +51,7 @@ class WMLWorker : 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; @@ -97,7 +97,7 @@ bool WMLWorker::doCloseDocument(void) } bool WMLWorker::doFullParagraph(const TQString& paraText, - const LayoutData& tqlayout, const ValueListFormatData& paraFormatDataList) + const LayoutData& layout, const ValueListFormatData& paraFormatDataList) { TQString wmlText; TQString text = paraText; @@ -131,7 +131,7 @@ bool WMLWorker::doFullParagraph(const TQString& paraText, } // sentinel check - TQString align = tqlayout.alignment.lower(); + TQString align = layout.alignment.lower(); if( ( align!="left" ) && ( align!="right" ) && ( align!="center" ) ) align = "left"; diff --git a/filters/kword/wml/wmlimport.cc b/filters/kword/wml/wmlimport.cc index a92290d9..83e14d9f 100644 --- a/filters/kword/wml/wmlimport.cc +++ b/filters/kword/wml/wmlimport.cc @@ -54,7 +54,7 @@ class WMLConverter: public WMLParser virtual bool doOpenCard( TQString, TQString ); virtual bool doCloseCard(); virtual bool doParagraph( TQString text, WMLFormatList formatList, - WMLLayout tqlayout ); + WMLLayout layout ); private: TQString m_title; }; @@ -105,13 +105,13 @@ static TQString WMLFormatAsXML( WMLFormat format ) return result; } -static TQString WMLLayoutAsXML( WMLLayout tqlayout ) +static TQString WMLLayoutAsXML( WMLLayout layout ) { TQString result; TQString align = "left"; - if( tqlayout.align == WMLLayout::Center ) align = "center"; - if( tqlayout.align == WMLLayout::Right ) align = "right"; + if( layout.align == WMLLayout::Center ) align = "center"; + if( layout.align == WMLLayout::Right ) align = "right"; TQFont font = KoGlobal::defaultFont(); TQString fontFamily = font.family(); @@ -161,7 +161,7 @@ bool WMLConverter::doCloseCard() } bool WMLConverter::doParagraph( TQString atext, WMLFormatList formatList, - WMLLayout tqlayout ) + WMLLayout layout ) { TQString text, formats; @@ -183,7 +183,7 @@ bool WMLConverter::doParagraph( TQString atext, WMLFormatList formatList, root.append( "<PARAGRAPH>\n" ); root.append( "<TEXT>" + text + "</TEXT>\n" ); root.append( "<FORMATS>" + formats + "</FORMATS>\n" ); - root.append( WMLLayoutAsXML( tqlayout) ); + root.append( WMLLayoutAsXML( layout) ); root.append( "</PARAGRAPH>\n" ); return TRUE; diff --git a/filters/kword/wml/wmlparser.cpp b/filters/kword/wml/wmlparser.cpp index ecbb235c..81ccbd24 100644 --- a/filters/kword/wml/wmlparser.cpp +++ b/filters/kword/wml/wmlparser.cpp @@ -403,7 +403,7 @@ WMLFormat& WMLFormat::operator=( const WMLFormat& f ) return *this; } -// paragraph tqlayout info +// paragraph layout info WMLLayout::WMLLayout() { align = Left; diff --git a/filters/kword/wordperfect/export/wp5.cc b/filters/kword/wordperfect/export/wp5.cc index b3bb7d17..96575353 100644 --- a/filters/kword/wordperfect/export/wp5.cc +++ b/filters/kword/wordperfect/export/wp5.cc @@ -143,7 +143,7 @@ static TQCString WPFiveEscape( const TQString& text ) for( unsigned int i=0; i < text.length(); i++ ) { - int c = text[i].tqunicode(); + int c = text[i].unicode(); if( c < 32 ) result += '.'; else if ( c == 32 ) result += 0x20 ; // hard space else if ( c < 128 ) result += text[i].latin1(); @@ -155,7 +155,7 @@ static TQCString WPFiveEscape( const TQString& text ) bool WPFiveWorker::doFullParagraph(const TQString& paraText, - const LayoutData& /*tqlayout*/, const ValueListFormatData& paraFormatDataList) + const LayoutData& /*layout*/, const ValueListFormatData& paraFormatDataList) { ValueListFormatData::ConstIterator it; for( it = paraFormatDataList.begin(); it!=paraFormatDataList.end(); ++it ) diff --git a/filters/kword/wordperfect/export/wp5.h b/filters/kword/wordperfect/export/wp5.h index 0791459b..dc75e2f7 100644 --- a/filters/kword/wordperfect/export/wp5.h +++ b/filters/kword/wordperfect/export/wp5.h @@ -36,7 +36,7 @@ class WPFiveWorker : 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; diff --git a/filters/kword/wordperfect/export/wp6.cc b/filters/kword/wordperfect/export/wp6.cc index 9db2f1e1..5d0079b4 100644 --- a/filters/kword/wordperfect/export/wp6.cc +++ b/filters/kword/wordperfect/export/wp6.cc @@ -144,7 +144,7 @@ static TQCString WPSixEscape( const TQString& text ) for( unsigned int i=0; i < text.length(); i++ ) { - int c = text[i].tqunicode(); + int c = text[i].unicode(); if( c < 32 ) result += '.'; else if ( c == 32 ) result += 0x80 ; // hard space else if ( c < 128 ) result += text[i].latin1(); @@ -155,14 +155,14 @@ static TQCString WPSixEscape( const TQString& text ) } bool WPSixWorker::doFullParagraph(const TQString& paraText, - const LayoutData& tqlayout, const ValueListFormatData& paraFormatDataList) + const LayoutData& layout, const ValueListFormatData& paraFormatDataList) { // handle paragraph alignment/justification (default to left) unsigned char wp_align[] = { 0xd3, 5, 12, 0, 0, 1, 0, 0, 2, 12, 0, 0xd3 }; - if( tqlayout.alignment == "left" ) wp_align[7] = 0; - if( tqlayout.alignment == "justify" ) wp_align[7] = 1; - if( tqlayout.alignment == "center" ) wp_align[7] = 2; - if( tqlayout.alignment == "right" ) wp_align[7] = 3; + if( layout.alignment == "left" ) wp_align[7] = 0; + if( layout.alignment == "justify" ) wp_align[7] = 1; + if( layout.alignment == "center" ) wp_align[7] = 2; + if( layout.alignment == "right" ) wp_align[7] = 3; output.writeRawBytes( (const char*)wp_align, 12 ); ValueListFormatData::ConstIterator it; diff --git a/filters/kword/wordperfect/export/wp6.h b/filters/kword/wordperfect/export/wp6.h index 73397338..05abb60f 100644 --- a/filters/kword/wordperfect/export/wp6.h +++ b/filters/kword/wordperfect/export/wp6.h @@ -36,7 +36,7 @@ class WPSixWorker : 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; diff --git a/filters/kword/wordperfect/import/kwordfilter.cpp b/filters/kword/wordperfect/import/kwordfilter.cpp index de9246cc..1b3b83df 100644 --- a/filters/kword/wordperfect/import/kwordfilter.cpp +++ b/filters/kword/wordperfect/import/kwordfilter.cpp @@ -128,7 +128,7 @@ KWordFilter::parse (const TQString & filename) tokens.append( new Token( Token::HardReturn ) ); TQString text; - TQString tqlayout; + TQString layout; TQString formats; int LeftMargin = 0; int TopMargin = 36; @@ -253,32 +253,32 @@ KWordFilter::parse (const TQString & filename) formats.append( " " + fmt ); formats.append ( " </FORMAT>\n" ); - tqlayout = ""; - tqlayout.append( "<LAYOUT>\n" ); - tqlayout.append( " <NAME value=\"Standard\" />\n" ); - tqlayout.append( " <FLOW align=\"" + mapAlign( align ) + "\" />\n" ); - tqlayout.append( " <LINESPACING value=\"" + mapLinespace( linespace) + "\" />\n" ); - tqlayout.append( " <LEFTBORDER width=\"0\" style=\"0\" />\n" ); - tqlayout.append( " <RIGHTBORDER width=\"0\" style=\"0\" />\n" ); - tqlayout.append( " <TOPBORDER width=\"0\" style=\"0\" />\n" ); - tqlayout.append( " <BOTTOMBORDER width=\"0\" style=\"0\" />\n" ); + layout = ""; + layout.append( "<LAYOUT>\n" ); + layout.append( " <NAME value=\"Standard\" />\n" ); + layout.append( " <FLOW align=\"" + mapAlign( align ) + "\" />\n" ); + layout.append( " <LINESPACING value=\"" + mapLinespace( linespace) + "\" />\n" ); + layout.append( " <LEFTBORDER width=\"0\" style=\"0\" />\n" ); + layout.append( " <RIGHTBORDER width=\"0\" style=\"0\" />\n" ); + layout.append( " <TOPBORDER width=\"0\" style=\"0\" />\n" ); + layout.append( " <BOTTOMBORDER width=\"0\" style=\"0\" />\n" ); lm = LeftMargin + LeftMarginAdjust - frameLeftMargin; rm = RightMargin + RightMarginAdjust - frameRightMargin; - tqlayout.append( " <INDENTS left=\"" + TQString::number( TQMAX( 0, lm ) ) + "\"" + + layout.append( " <INDENTS left=\"" + TQString::number( TQMAX( 0, lm ) ) + "\"" + " right=\"" + TQString::number( TQMAX( 0 , rm ) ) + "\"" + " first=\"0\" />\n" ); - tqlayout.append( " <OFFSETS />\n" ); - tqlayout.append( " <PAGEBREAKING />\n" ); - tqlayout.append( " <COUNTER />\n" ); - tqlayout.append( " <FORMAT id=\"1\">\n" ); - tqlayout.append( " <WEIGHT value=\"50\" />\n" ); - tqlayout.append( " <ITALIC value=\"0\" />\n" ); - tqlayout.append( " <UNDERLINE value=\"0\" />\n" ); - tqlayout.append( " <STRIKEOUT value=\"0\" />\n" ); - tqlayout.append( " <CHARSET value=\"0\" />\n" ); - tqlayout.append( " <VERTALIGN value=\"0\" />\n" ); - tqlayout.append( " </FORMAT>\n" ); - tqlayout.append( "</LAYOUT>\n" ); + layout.append( " <OFFSETS />\n" ); + layout.append( " <PAGEBREAKING />\n" ); + layout.append( " <COUNTER />\n" ); + layout.append( " <FORMAT id=\"1\">\n" ); + layout.append( " <WEIGHT value=\"50\" />\n" ); + layout.append( " <ITALIC value=\"0\" />\n" ); + layout.append( " <UNDERLINE value=\"0\" />\n" ); + layout.append( " <STRIKEOUT value=\"0\" />\n" ); + layout.append( " <CHARSET value=\"0\" />\n" ); + layout.append( " <VERTALIGN value=\"0\" />\n" ); + layout.append( " </FORMAT>\n" ); + layout.append( "</LAYOUT>\n" ); // encode text for XML-ness // FIXME could be faster without TQRegExp @@ -294,7 +294,7 @@ KWordFilter::parse (const TQString & filename) root.append( "<FORMATS>\n"); root.append( formats ); root.append( "</FORMATS>\n"); - root.append( tqlayout ); + root.append( layout ); root.append( "</PARAGRAPH>\n" ); // for the next paragraph diff --git a/filters/kword/wordperfect/import/parser.cpp b/filters/kword/wordperfect/import/parser.cpp index 7b87e5a6..96a2559c 100644 --- a/filters/kword/wordperfect/import/parser.cpp +++ b/filters/kword/wordperfect/import/parser.cpp @@ -1002,7 +1002,7 @@ Parser::handleTab (TQMemArray < TQ_UINT8 > data) } -// the following tables maps WP charset/charcode to tqunicode character +// the following tables maps WP charset/charcode to unicode character // WP multinational characters (charset 1) static unsigned multinational_map[] = { diff --git a/filters/kword/wordperfect/status_old.html b/filters/kword/wordperfect/status_old.html index 1db3dc09..5465048d 100644 --- a/filters/kword/wordperfect/status_old.html +++ b/filters/kword/wordperfect/status_old.html @@ -55,7 +55,7 @@ <li>font information: size, typeface, color</li> <li>WP extended character converted to Unicode</li> <li>character formatting: bold, italics, underline, double underline, strikeout, superscript, subscript</li> - <li>paragraph tqlayout: linespacing, justification</li> + <li>paragraph layout: linespacing, justification</li> <li>page settings: margins</li> <li>document summary: title, author, abstract</li> </ul> diff --git a/filters/libdialogfilter/exportsizedia.cpp b/filters/libdialogfilter/exportsizedia.cpp index f079e2a5..a5f76d32 100644 --- a/filters/libdialogfilter/exportsizedia.cpp +++ b/filters/libdialogfilter/exportsizedia.cpp @@ -107,7 +107,7 @@ void ExportSizeDia::setupGUI() mainLayout->addWidget( percentHeight, 4, 0 ); mainLayout->addWidget( m_percWidthEdit, 4, 1 ); - /* Display the main tqlayout */ + /* Display the main layout */ //mainLayout->addStretch( 5 ); mainLayout->activate(); } diff --git a/filters/liboofilter/ooutils.cc b/filters/liboofilter/ooutils.cc index 9c65ddd9..a04633fe 100644 --- a/filters/liboofilter/ooutils.cc +++ b/filters/liboofilter/ooutils.cc @@ -209,7 +209,7 @@ void OoUtils::importTabulators( TQDomElement& parentElement, const KoStyleStack& if ( !styleStack.hasChildNodeNS( ooNS::style, "tab-stops" ) ) // 3.11.10 return; TQDomElement tabStops = styleStack.childNodeNS( ooNS::style, "tab-stops" ); - //kdDebug(30519) << k_funcinfo << tabStops.childNodes().count() << " tab stops in tqlayout." << endl; + //kdDebug(30519) << k_funcinfo << tabStops.childNodes().count() << " tab stops in layout." << endl; for ( TQDomNode it = tabStops.firstChild(); !it.isNull(); it = it.nextSibling() ) { TQDomElement tabStop = it.toElement(); @@ -235,7 +235,7 @@ void OoUtils::importTabulators( TQDomElement& parentElement, const KoStyleStack& double pos = KoUnit::parseValue( tabStop.attributeNS( ooNS::style, "position", TQString() ) ); elem.setAttribute( "ptpos", pos ); - // TODO Convert leaderChar's tqunicode value to the KOffice enum + // TODO Convert leaderChar's unicode value to the KOffice enum // (blank/dots/line/dash/dash-dot/dash-dot-dot, 0 to 5) TQString leaderChar = tabStop.attributeNS( ooNS::style, "leader-char", TQString() ); // single character if ( !leaderChar.isEmpty() ) diff --git a/filters/olefilters/powerpoint97/powerpoint.cc b/filters/olefilters/powerpoint97/powerpoint.cc index bb85f84d..d28430dd 100644 --- a/filters/olefilters/powerpoint97/powerpoint.cc +++ b/filters/olefilters/powerpoint97/powerpoint.cc @@ -782,7 +782,7 @@ void Powerpoint::opSlideAtom( { struct { - TQ_UINT8 tqlayout[12]; // Slide tqlayout descriptor. + TQ_UINT8 layout[12]; // Slide layout descriptor. TQ_INT32 masterId; // Id of the master of the slide. Zero for a master slide. TQ_INT32 notesId; // Id for the corresponding notes slide. Zero if slide has no notes. TQ_UINT16 flags; @@ -790,7 +790,7 @@ void Powerpoint::opSlideAtom( Header tmp; tmp.type = 1015; - tmp.length = sizeof(data.tqlayout); + tmp.length = sizeof(data.layout); invokeHandler(tmp, tmp.length, operands); operands >> data.masterId >> data.notesId >> data.flags; diff --git a/filters/xsltfilter/export/xsl/kword/xslfo/main.xsl b/filters/xsltfilter/export/xsl/kword/xslfo/main.xsl index b8bb24de..e619bf21 100644 --- a/filters/xsltfilter/export/xsl/kword/xslfo/main.xsl +++ b/filters/xsltfilter/export/xsl/kword/xslfo/main.xsl @@ -39,7 +39,7 @@ <xsl:value-of select="@editor"/> </xsl:comment> <fo:root> - <fo:tqlayout-master-set> + <fo:layout-master-set> <fo:simple-page-master margin-right="0.5cm" margin-left="0.5cm" margin-bottom="0.5cm" margin-top="0.75cm" page-width="21cm" page-height="29.7cm" master-name="first"> @@ -61,7 +61,7 @@ <fo:conditional-page-master-reference master-name="rest" /> </fo:repeatable-page-master-alternatives> </fo:page-sequence-master> - </fo:tqlayout-master-set> + </fo:layout-master-set> <xsl:apply-templates select="FRAMESETS"/> </fo:root> </xsl:template> diff --git a/filters/xsltfilter/kword2xslfo.xsl b/filters/xsltfilter/kword2xslfo.xsl index ea36238b..4268afba 100644 --- a/filters/xsltfilter/kword2xslfo.xsl +++ b/filters/xsltfilter/kword2xslfo.xsl @@ -36,7 +36,7 @@ <xsl:value-of select="@editor"/> </xsl:comment> <fo:root> - <fo:tqlayout-master-set> + <fo:layout-master-set> <fo:simple-page-master margin-right="0.5cm" margin-left="0.5cm" margin-bottom="0.5cm" margin-top="0.75cm" page-width="21cm" page-height="29.7cm" master-name="first"> @@ -58,7 +58,7 @@ <fo:conditional-page-master-reference master-name="rest" /> </fo:repeatable-page-master-alternatives> </fo:page-sequence-master> - </fo:tqlayout-master-set> + </fo:layout-master-set> <xsl:apply-templates select="FRAMESETS"/> </fo:root> </xsl:template> diff --git a/karbon/core/vdocument.h b/karbon/core/vdocument.h index 45270d2e..aa35b834 100644 --- a/karbon/core/vdocument.h +++ b/karbon/core/vdocument.h @@ -83,7 +83,7 @@ public: * Draw the document frame to a painting device. * * @param painter abstraction that is used to render to a painting device. - * @param pl tqlayout describing the page to draw on (restricting the painter) + * @param pl layout describing the page to draw on (restricting the painter) * @param drawPageMargins if @c true, also draw the crop marks for the page margins, * otherwise, don't draw them. */ diff --git a/karbon/core/vtext.cc b/karbon/core/vtext.cc index e9888355..4c7d3989 100644 --- a/karbon/core/vtext.cc +++ b/karbon/core/vtext.cc @@ -473,7 +473,7 @@ VText::traceText() bool foundCharmap = false; - // Try to choose tqunicode charmap + // Try to choose unicode charmap for( int charmap = 0; charmap < fontFace->num_charmaps; charmap++ ) { if( fontFace->charmaps[charmap]->encoding == ft_encoding_unicode ) @@ -481,14 +481,14 @@ VText::traceText() FT_Error error = FT_Set_Charmap( fontFace, fontFace->charmaps[charmap] ); if( error ) { - kdDebug(38000) << "traceText(), unable to select tqunicode charmap." << endl; + kdDebug(38000) << "traceText(), unable to select unicode charmap." << endl; continue; } foundCharmap = true; } } - // Choose first charmap if no tqunicode charmap was found + // Choose first charmap if no unicode charmap was found if( ! foundCharmap ) { error = FT_Set_Charmap( fontFace, fontFace->charmaps[0] ); @@ -518,7 +518,7 @@ VText::traceText() { // get the glyph index for the current character TQChar character = m_text.at( i ); - glyphIndex = FT_Get_Char_Index( fontFace, character.tqunicode() ); + glyphIndex = FT_Get_Char_Index( fontFace, character.unicode() ); if( ! glyphIndex ) { kdDebug(38000) << "traceText(), unable get index of char : " << character << endl; diff --git a/karbon/dialogs/vconfiguredlg.cc b/karbon/dialogs/vconfiguredlg.cc index 141006dc..8c41704c 100644 --- a/karbon/dialogs/vconfiguredlg.cc +++ b/karbon/dialogs/vconfiguredlg.cc @@ -218,10 +218,10 @@ VConfigMiscPage::VConfigMiscPage( KarbonView* view, TQVBox* box, char* name ) KoUnit::Unit unit = view->part()->unit(); TQGroupBox* tmpTQGroupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Misc" ), box, "GroupBox" ); - tmpTQGroupBox->tqlayout()->setSpacing(KDialog::spacingHint()); - tmpTQGroupBox->tqlayout()->setMargin(KDialog::marginHint()); + tmpTQGroupBox->layout()->setSpacing(KDialog::spacingHint()); + tmpTQGroupBox->layout()->setMargin(KDialog::marginHint()); - TQGridLayout* grid = new TQGridLayout(tmpTQGroupBox->tqlayout(), 4, 2 ); + TQGridLayout* grid = new TQGridLayout(tmpTQGroupBox->layout(), 4, 2 ); m_oldUndoRedo = 30; diff --git a/karbon/dockers/vdocumentdocker.cc b/karbon/dockers/vdocumentdocker.cc index 3812c790..9a7329a0 100644 --- a/karbon/dockers/vdocumentdocker.cc +++ b/karbon/dockers/vdocumentdocker.cc @@ -224,28 +224,28 @@ VDocumentTab::VDocumentTab( KarbonView* view, TQWidget* parent ) : TQWidget( parent, "DocumentTab" ), m_view( view ) { TQFrame* frame; - TQGridLayout* tqlayout = new TQGridLayout( this ); - tqlayout->setMargin( 3 ); - tqlayout->setSpacing( 2 ); - tqlayout->addMultiCellWidget( m_documentPreview = new VDocumentPreview( m_view, this ), 0, 7, 2, 2 ); - tqlayout->addWidget( new TQLabel( i18n( "document width", "Width:" ), this ), 0, 0 ); - tqlayout->addWidget( new TQLabel( i18n( "Height:" ), this ), 1, 0 ); - tqlayout->addMultiCellWidget( frame = new TQFrame( this ), 2, 2, 0, 1 ); + TQGridLayout* layout = new TQGridLayout( this ); + layout->setMargin( 3 ); + layout->setSpacing( 2 ); + layout->addMultiCellWidget( m_documentPreview = new VDocumentPreview( m_view, this ), 0, 7, 2, 2 ); + layout->addWidget( new TQLabel( i18n( "document width", "Width:" ), this ), 0, 0 ); + layout->addWidget( new TQLabel( i18n( "Height:" ), this ), 1, 0 ); + layout->addMultiCellWidget( frame = new TQFrame( this ), 2, 2, 0, 1 ); frame->setFrameShape( TQFrame::HLine ); - tqlayout->addWidget( new TQLabel( i18n( "Layers:" ), this ), 3, 0 ); - tqlayout->addWidget( new TQLabel( i18n( "Format:" ), this ), 4, 0 ); - tqlayout->addMultiCellWidget( frame = new TQFrame( this ), 5, 5, 0, 1 ); + layout->addWidget( new TQLabel( i18n( "Layers:" ), this ), 3, 0 ); + layout->addWidget( new TQLabel( i18n( "Format:" ), this ), 4, 0 ); + layout->addMultiCellWidget( frame = new TQFrame( this ), 5, 5, 0, 1 ); frame->setFrameShape( TQFrame::HLine ); - //tqlayout->addMultiCellWidget( new TQLabel( i18n( "Zoom factor:" ), this ), 6, 6, 0, 1 ); - tqlayout->addWidget( m_width = new TQLabel( this ), 0, 1 ); - tqlayout->addWidget( m_height = new TQLabel( this ), 1, 1 ); - tqlayout->addWidget( m_layers = new TQLabel( this ), 3, 1 ); - tqlayout->addWidget( m_format = new TQLabel( this ), 4, 1 ); - tqlayout->setRowStretch( 7, 1 ); - tqlayout->setColStretch( 0, 0 ); - tqlayout->setColStretch( 1, 0 ); - tqlayout->setColStretch( 2, 2 ); - //tqlayout->addWidget( + //layout->addMultiCellWidget( new TQLabel( i18n( "Zoom factor:" ), this ), 6, 6, 0, 1 ); + layout->addWidget( m_width = new TQLabel( this ), 0, 1 ); + layout->addWidget( m_height = new TQLabel( this ), 1, 1 ); + layout->addWidget( m_layers = new TQLabel( this ), 3, 1 ); + layout->addWidget( m_format = new TQLabel( this ), 4, 1 ); + layout->setRowStretch( 7, 1 ); + layout->setColStretch( 0, 0 ); + layout->setColStretch( 1, 0 ); + layout->setColStretch( 2, 2 ); + //layout->addWidget( m_width->setAlignment( AlignRight ); m_height->setAlignment( AlignRight ); @@ -454,8 +454,8 @@ VLayersTab::VLayersTab( KarbonView* view, TQWidget* parent ) { TQToolButton* button; - TQVBoxLayout* tqlayout = new TQVBoxLayout( this, 1 ); - tqlayout->addWidget( m_layersListView = new TQListView( this ), 1 ); + TQVBoxLayout* layout = new TQVBoxLayout( this, 1 ); + layout->addWidget( m_layersListView = new TQListView( this ), 1 ); m_buttonGroup = new TQHButtonGroup( this ); m_buttonGroup->setInsideMargin( 3 ); button = new TQToolButton( m_buttonGroup ); @@ -474,9 +474,9 @@ VLayersTab::VLayersTab( KarbonView* view, TQWidget* parent ) button->setIconSet( SmallIcon( "14_layer_deletelayer" ) ); button->setTextLabel( i18n( "Delete" ) ); m_buttonGroup->insert( button ); - tqlayout->addWidget( m_buttonGroup, 0); - tqlayout->setSpacing( 0 ); - tqlayout->setMargin( 3 ); + layout->addWidget( m_buttonGroup, 0); + layout->setSpacing( 0 ); + layout->setMargin( 3 ); m_layersListView->setAllColumnsShowFocus( true ); m_layersListView->addColumn( i18n( "Item" ), 120 ); @@ -497,7 +497,7 @@ VLayersTab::VLayersTab( KarbonView* view, TQWidget* parent ) connect( m_buttonGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotButtonClicked( int ) ) ); connect( view->part()->commandHistory(), TQT_SIGNAL( commandExecuted( VCommand*) ), this, TQT_SLOT( slotCommandExecuted( VCommand* ) ) ); - tqlayout->activate(); + layout->activate(); updateLayers(); } // VLayersTab::VLayersTab @@ -1203,16 +1203,16 @@ VHistoryItem::paintFocus( TQPainter*, const TQColorGroup&, const TQRect& ) VHistoryTab::VHistoryTab( KarbonPart* part, TQWidget* parent ) : TQWidget( parent ), m_part( part ) { - TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); - tqlayout->setMargin( 3 ); - tqlayout->setSpacing( 2 ); - tqlayout->add( m_history = new TQListView( this ) ); + TQVBoxLayout* layout = new TQVBoxLayout( this ); + layout->setMargin( 3 ); + layout->setSpacing( 2 ); + layout->add( m_history = new TQListView( this ) ); m_history->setVScrollBarMode( TQListView::AlwaysOn ); m_history->setSelectionMode( TQListView::NoSelection ); m_history->addColumn( i18n( "Commands" ) ); m_history->setResizeMode( TQListView::AllColumns ); m_history->setRootIsDecorated( true ); - tqlayout->add( m_groupCommands = new TQCheckBox( i18n( "Group commands" ), this ) ); + layout->add( m_groupCommands = new TQCheckBox( i18n( "Group commands" ), this ) ); m_history->setSorting( 0, true ); VHistoryGroupItem* group = 0; diff --git a/karbon/dockers/vstyledocker.cc b/karbon/dockers/vstyledocker.cc index fd8cfb30..672000ae 100644 --- a/karbon/dockers/vstyledocker.cc +++ b/karbon/dockers/vstyledocker.cc @@ -128,9 +128,9 @@ ClipartWidget::ClipartWidget( TQPtrList<VClipartIconItem>* clipartItems, KarbonP { KIconLoader il; - TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); - tqlayout->addWidget( m_clipartChooser = new ClipartChooser( TQSize( 32, 32 ), this ) ); - tqlayout->addWidget( m_buttonGroup = new TQHButtonGroup( this ) ); + TQVBoxLayout* layout = new TQVBoxLayout( this ); + layout->addWidget( m_clipartChooser = new ClipartChooser( TQSize( 32, 32 ), this ) ); + layout->addWidget( m_buttonGroup = new TQHButtonGroup( this ) ); TQToolButton* m_addClipartButton; m_buttonGroup->insert( m_addClipartButton = new TQToolButton( m_buttonGroup ) ); m_buttonGroup->insert( m_importClipartButton = new TQToolButton( m_buttonGroup ) ); @@ -145,7 +145,7 @@ ClipartWidget::ClipartWidget( TQPtrList<VClipartIconItem>* clipartItems, KarbonP m_buttonGroup->setInsideMargin( 3 ); //setFrameStyle( Box | Sunken ); - tqlayout->setMargin( 3 ); + layout->setMargin( 3 ); connect( m_buttonGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotButtonClicked( int ) ) ); //connect( m_deleteClipartButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( deleteClipart() ) ); diff --git a/karbon/karbon_part.cc b/karbon/karbon_part.cc index 9355c961..955b21f5 100644 --- a/karbon/karbon_part.cc +++ b/karbon/karbon_part.cc @@ -109,9 +109,9 @@ DCOPObject* KarbonPart::dcopObject() } void -KarbonPart::setPageLayout( KoPageLayout& tqlayout, KoUnit::Unit _unit ) +KarbonPart::setPageLayout( KoPageLayout& layout, KoUnit::Unit _unit ) { - m_pageLayout = tqlayout; + m_pageLayout = layout; m_doc.setUnit( _unit ); m_doc.setWidth( m_pageLayout.ptWidth ); m_doc.setHeight( m_pageLayout.ptHeight ); @@ -308,7 +308,7 @@ KarbonPart::loadOasis( const TQDomDocument &doc, KoOasisStyles &styles, const TQ return false; } - TQString masterPageName = "Standard"; // use default tqlayout as fallback + TQString masterPageName = "Standard"; // use default layout as fallback TQDomElement *master = styles.masterPages()[ masterPageName ]; if ( !master ) //last test... master = styles.masterPages()[ "Default" ]; @@ -319,7 +319,7 @@ KarbonPart::loadOasis( const TQDomDocument &doc, KoOasisStyles &styles, const TQ master = it.current(); } Q_ASSERT( master ); - const TQDomElement *style = master ? styles.findStyle( master->attributeNS( KoXmlNS::style, "page-tqlayout-name", TQString() ) ) : 0; + const TQDomElement *style = master ? styles.findStyle( master->attributeNS( KoXmlNS::style, "page-layout-name", TQString() ) ) : 0; if( style ) { m_pageLayout.loadOasis( *style ); @@ -371,7 +371,7 @@ KarbonPart::saveOasis( KoStore *store, KoXmlWriter *manifestWriter ) KoGenStyle pageLayout = m_pageLayout.saveOasis(); TQString layoutName = mainStyles.lookup( pageLayout, "PL" ); KoGenStyle masterPage( KoGenStyle::STYLE_MASTER ); - masterPage.addAttribute( "style:page-tqlayout-name", layoutName ); + masterPage.addAttribute( "style:page-layout-name", layoutName ); mainStyles.lookup( masterPage, "Default", KoGenStyles::DontForceNumbering ); KTempFile contentTmpFile; @@ -435,7 +435,7 @@ KarbonPart::saveOasis( KoStore *store, KoXmlWriter *manifestWriter ) it = styleList.begin(); for( ; it != styleList.end(); ++it ) - (*it).style->writeStyle( styleWriter, mainStyles, "style:page-tqlayout", (*it).name, "style:page-tqlayout-properties" ); + (*it).style->writeStyle( styleWriter, mainStyles, "style:page-layout", (*it).name, "style:page-layout-properties" ); styleWriter->endElement(); // office:automatic-styles diff --git a/karbon/karbon_part.h b/karbon/karbon_part.h index 328eab89..9c9ae91a 100644 --- a/karbon/karbon_part.h +++ b/karbon/karbon_part.h @@ -102,7 +102,7 @@ public: void initConfig(); unsigned int maxRecentFiles() const { return m_maxRecentFiles; } - void setPageLayout( KoPageLayout& tqlayout, KoUnit::Unit _unit ); + void setPageLayout( KoPageLayout& layout, KoUnit::Unit _unit ); bool mergeNativeFormat( const TQString & file ); diff --git a/karbon/karbon_view.cc b/karbon/karbon_view.cc index 10df9e02..3ea792f2 100644 --- a/karbon/karbon_view.cc +++ b/karbon/karbon_view.cc @@ -494,7 +494,7 @@ KarbonView::addSelectionToClipboard() const KarbonDrag* kd = new KarbonDrag(); kd->setObjectList( part()->document().selection()->objects() ); - TQApplication::tqclipboard()->setData( kd ); + TQApplication::clipboard()->setData( kd ); } void @@ -503,7 +503,7 @@ KarbonView::editPaste() KarbonDrag kd; VObjectList objects; - if( !kd.decode( TQApplication::tqclipboard()->data(), objects, part()->document() ) ) + if( !kd.decode( TQApplication::clipboard()->data(), objects, part()->document() ) ) return; // Paste with a small offset. @@ -1310,11 +1310,11 @@ void KarbonView::pageLayout() { KoHeadFoot hf; - KoPageLayout tqlayout = part()->pageLayout(); + KoPageLayout layout = part()->pageLayout(); KoUnit::Unit unit = part()->unit(); - if( KoPageLayoutDia::pageLayout( tqlayout, hf, FORMAT_AND_BORDERS | DISABLE_UNIT, unit ) ) + if( KoPageLayoutDia::pageLayout( layout, hf, FORMAT_AND_BORDERS | DISABLE_UNIT, unit ) ) { - part()->setPageLayout( tqlayout, unit ); + part()->setPageLayout( layout, unit ); m_horizRuler->setUnit( unit ); m_vertRuler->setUnit( unit ); m_canvas->resizeContents( int( ( part()->pageLayout().ptWidth + 300 ) * zoom() ), diff --git a/karbon/tools/vpatterntool.cc b/karbon/tools/vpatterntool.cc index 893c8481..4abbb379 100644 --- a/karbon/tools/vpatterntool.cc +++ b/karbon/tools/vpatterntool.cc @@ -49,9 +49,9 @@ VPatternWidget::VPatternWidget( TQPtrList<KoIconItem>* patterns, VTool*, TQWidge : KDialogBase( parent, "", true, i18n( "Choose Pattern" ), Ok | Cancel ), m_pattern( 0 ) { TQWidget *base = new TQWidget( this ); - TQVBoxLayout* tqlayout = new TQVBoxLayout( base ); - tqlayout->addWidget( m_patternChooser = new KoIconChooser( TQSize( 32, 32 ), base ) ); - tqlayout->addWidget( m_buttonGroup = new TQHButtonGroup( base ) ); + TQVBoxLayout* layout = new TQVBoxLayout( base ); + layout->addWidget( m_patternChooser = new KoIconChooser( TQSize( 32, 32 ), base ) ); + layout->addWidget( m_buttonGroup = new TQHButtonGroup( base ) ); m_buttonGroup->insert( m_importPatternButton = new TQToolButton( m_buttonGroup ) ); m_buttonGroup->insert( m_deletePatternButton = new TQToolButton( m_buttonGroup ) ); m_patternChooser->setFixedSize( 180, 120 ); @@ -65,7 +65,7 @@ VPatternWidget::VPatternWidget( TQPtrList<KoIconItem>* patterns, VTool*, TQWidge m_deletePatternButton->setEnabled( false ); //setFrameStyle( Box | Sunken ); - tqlayout->setMargin( 3 ); + layout->setMargin( 3 ); connect( m_buttonGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotButtonClicked( int ) ) ); connect( m_patternChooser, TQT_SIGNAL( selected( KoIconItem* ) ), this, TQT_SLOT( patternSelected( KoIconItem* ) ) ); diff --git a/karbon/tools/vtexttool.cc b/karbon/tools/vtexttool.cc index ad74048f..cb2a9b3f 100644 --- a/karbon/tools/vtexttool.cc +++ b/karbon/tools/vtexttool.cc @@ -207,20 +207,20 @@ ShadowWidget::ShadowWidget( TQWidget* parent, const char* name, int angle, int d setTitle( i18n( "Shadow" ) ); setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); - TQGridLayout* tqlayout = new TQGridLayout( this ); - tqlayout->addRowSpacing( 0, 12 ); - tqlayout->setMargin( 3 ); - tqlayout->setSpacing( 2 ); - tqlayout->setColStretch( 0, 1 ); - tqlayout->setColStretch( 1, 0 ); - tqlayout->setColStretch( 2, 2 ); - tqlayout->addMultiCellWidget( m_preview = new ShadowPreview( this ), 1, 3, 0, 0 ); - tqlayout->addWidget( new TQLabel( i18n( "Angle:" ), this ), 1, 1 ); - tqlayout->addWidget( m_angle = new KIntNumInput( this ), 1, 2 ); - tqlayout->addWidget( new TQLabel( i18n( "Distance:" ), this ), 2, 1 ); - tqlayout->addWidget( m_distance = new KIntNumInput( this ), 2, 2 ); - tqlayout->addWidget( m_useShadow = new TQCheckBox( i18n( "Shadow" ), this ), 3, 1 ); - tqlayout->addWidget( m_translucent = new TQCheckBox( i18n( "Draw translucent shadow" ), this ), 3, 2 ); + TQGridLayout* layout = new TQGridLayout( this ); + layout->addRowSpacing( 0, 12 ); + layout->setMargin( 3 ); + layout->setSpacing( 2 ); + layout->setColStretch( 0, 1 ); + layout->setColStretch( 1, 0 ); + layout->setColStretch( 2, 2 ); + layout->addMultiCellWidget( m_preview = new ShadowPreview( this ), 1, 3, 0, 0 ); + layout->addWidget( new TQLabel( i18n( "Angle:" ), this ), 1, 1 ); + layout->addWidget( m_angle = new KIntNumInput( this ), 1, 2 ); + layout->addWidget( new TQLabel( i18n( "Distance:" ), this ), 2, 1 ); + layout->addWidget( m_distance = new KIntNumInput( this ), 2, 2 ); + layout->addWidget( m_useShadow = new TQCheckBox( i18n( "Shadow" ), this ), 3, 1 ); + layout->addWidget( m_translucent = new TQCheckBox( i18n( "Draw translucent shadow" ), this ), 3, 2 ); m_distance->setRange( 1, 37, 1, true ); m_angle->setRange( 0, 360, 10, true ); m_angle->setValue( angle ); diff --git a/karbon/widgets/vcolorslider.cc b/karbon/widgets/vcolorslider.cc index 3e2af4f0..25cb58e6 100644 --- a/karbon/widgets/vcolorslider.cc +++ b/karbon/widgets/vcolorslider.cc @@ -53,15 +53,15 @@ VColorSlider::~VColorSlider() void VColorSlider::init() { m_isDragging = false; - TQHBoxLayout *tqlayout = new TQHBoxLayout( this, 3 ); + TQHBoxLayout *layout = new TQHBoxLayout( this, 3 ); m_label = new TQLabel( this ); m_gradientSelect = new KGradientSelector( Qt::Horizontal, this ); m_spinBox = new KIntSpinBox( this ); - tqlayout->addWidget( m_label ); - tqlayout->addWidget( m_gradientSelect, 2 ); - tqlayout->addWidget( m_spinBox ); + layout->addWidget( m_label ); + layout->addWidget( m_gradientSelect, 2 ); + layout->addWidget( m_spinBox ); setValue( 0 ); setMinValue( 0 ); @@ -72,7 +72,7 @@ void VColorSlider::init() m_gradientSelect->installEventFilter( this ); - tqlayout->activate(); + layout->activate(); } void VColorSlider::setLabel( const TQString& label ) diff --git a/karbon/widgets/vreference.cc b/karbon/widgets/vreference.cc index f400fc13..c8580000 100644 --- a/karbon/widgets/vreference.cc +++ b/karbon/widgets/vreference.cc @@ -28,7 +28,7 @@ VReference::VReference( TQWidget *parent, const char *name ) : TQFrame ( parent, name ) { - TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); + TQVBoxLayout* layout = new TQVBoxLayout( this ); mButtonGroup = new TQButtonGroup (3,Qt::Vertical, this ); TQRadioButton* radio = new TQRadioButton ( mButtonGroup ); mButtonGroup->insert( radio, TopLeft ); @@ -54,8 +54,8 @@ VReference::VReference( TQWidget *parent, const char *name ) : TQFrame ( parent, this, TQT_SLOT( setReferencePoint( int ) ) ); mButtonGroup->setButton( Center ); - tqlayout->addWidget( mButtonGroup ); - tqlayout->activate(); + layout->addWidget( mButtonGroup ); + layout->activate(); setReferencePoint( Center ); } diff --git a/karbon/widgets/vsmallpreview.cc b/karbon/widgets/vsmallpreview.cc index 6e35d921..afd48d71 100644 --- a/karbon/widgets/vsmallpreview.cc +++ b/karbon/widgets/vsmallpreview.cc @@ -42,21 +42,21 @@ VSmallPreview::VSmallPreview( TQWidget* parent, const char* name ) : TQWidget( parent, name ) { - /* Create widget tqlayout */ - TQHBoxLayout *tqlayout = new TQHBoxLayout( this, 4 ); + /* Create widget layout */ + TQHBoxLayout *layout = new TQHBoxLayout( this, 4 ); m_strokeLabel = new TQLabel( i18n( "Stroke: None" ), this ); - tqlayout->addWidget( m_strokeLabel ); + layout->addWidget( m_strokeLabel ); m_strokeFrame = new TQFrame( this ); m_strokeFrame->setFixedWidth ( FRAMEWIDTH ); m_strokeFrame->setFrameStyle( TQFrame::GroupBoxPanel | TQFrame::Plain ); - tqlayout->addWidget( m_strokeFrame ); + layout->addWidget( m_strokeFrame ); m_fillLabel = new TQLabel( i18n( "Fill: None" ), this ); - tqlayout->addWidget( m_fillLabel ); + layout->addWidget( m_fillLabel ); m_fillFrame = new TQFrame( this ); m_fillFrame->setFixedWidth ( FRAMEWIDTH ); m_fillFrame->setFrameStyle( TQFrame::GroupBoxPanel | TQFrame::Plain ); - tqlayout->addWidget( m_fillFrame ); - tqlayout->activate(); + layout->addWidget( m_fillFrame ); + layout->activate(); m_fill = VFill(); m_stroke = VStroke(); diff --git a/karbon/widgets/vtranslate.cc b/karbon/widgets/vtranslate.cc index e13da689..d6b288ba 100644 --- a/karbon/widgets/vtranslate.cc +++ b/karbon/widgets/vtranslate.cc @@ -34,38 +34,38 @@ VTranslate::VTranslate( TQWidget* parent, const char* name ) { setCaption( i18n( "Translate" ) ); - TQVBoxLayout *maintqlayout = new TQVBoxLayout(this, 7); - maintqlayout->addSpacing(5); + TQVBoxLayout *mainlayout = new TQVBoxLayout(this, 7); + mainlayout->addSpacing(5); - TQGridLayout *inputtqlayout = new TQGridLayout(this, 5, 3); - maintqlayout->addLayout(inputtqlayout); + TQGridLayout *inputlayout = new TQGridLayout(this, 5, 3); + mainlayout->addLayout(inputlayout); m_labelX = new TQLabel(i18n("X:"), this); - inputtqlayout->addWidget(m_labelX, 0, 0); + inputlayout->addWidget(m_labelX, 0, 0); labely = new TQLabel(i18n("Y:"), this); - inputtqlayout->addWidget(labely, 1, 0); - inputtqlayout->addColSpacing(1, 1); - inputtqlayout->addColSpacing(3, 5); + inputlayout->addWidget(labely, 1, 0); + inputlayout->addColSpacing(1, 1); + inputlayout->addColSpacing(3, 5); m_inputX = new KDoubleNumInput( this ); m_inputX->setRange(-10000.00, 10000.00, 1.00, false); //range is just for example - for now :-) - inputtqlayout->addWidget(m_inputX, 0, 2); + inputlayout->addWidget(m_inputX, 0, 2); m_inputY = new KDoubleNumInput( this ); m_inputY->setRange(-10000.00, 10000.00, 1.00, false); - inputtqlayout->addWidget(m_inputY, 1, 2); + inputlayout->addWidget(m_inputY, 1, 2); m_labelUnit1 = new TQLabel("", this); - inputtqlayout->addWidget(m_labelUnit1, 0, 4); + inputlayout->addWidget(m_labelUnit1, 0, 4); m_labelUnit2 = new TQLabel("", this); - inputtqlayout->addWidget(m_labelUnit2, 1, 4); - maintqlayout->addSpacing(5); + inputlayout->addWidget(m_labelUnit2, 1, 4); + mainlayout->addSpacing(5); m_checkBoxPosition = new TQCheckBox(i18n("Relative &position"), this); - maintqlayout->addWidget(m_checkBoxPosition); - maintqlayout->addSpacing(5); + mainlayout->addWidget(m_checkBoxPosition); + mainlayout->addSpacing(5); m_buttonDuplicate = new TQPushButton(i18n("&Duplicate"), this); - maintqlayout->addWidget(m_buttonDuplicate); - maintqlayout->addSpacing(1); + mainlayout->addWidget(m_buttonDuplicate); + mainlayout->addSpacing(1); m_buttonApply = new KPushButton(KStdGuiItem::apply(), this); - maintqlayout->addWidget(m_buttonApply); + mainlayout->addWidget(m_buttonApply); - maintqlayout->activate(); + mainlayout->activate(); setFixedSize(baseSize()); //Set the size tp fixed values } diff --git a/kchart/csvimportdialogui.ui b/kchart/csvimportdialogui.ui index 8938631e..4e53b54d 100644 --- a/kchart/csvimportdialogui.ui +++ b/kchart/csvimportdialogui.ui @@ -68,7 +68,7 @@ </attribute> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <property name="geometry"> <rect> @@ -84,7 +84,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> diff --git a/kchart/kchartColorConfigPage.cc b/kchart/kchartColorConfigPage.cc index a0db1ce7..30f1b275 100644 --- a/kchart/kchartColorConfigPage.cc +++ b/kchart/kchartColorConfigPage.cc @@ -51,11 +51,11 @@ KChartColorConfigPage::KChartColorConfigPage( KChartParams* params, TQVBoxLayout* toplevel = new TQVBoxLayout( this, 14 ); TQButtonGroup* gb = new TQButtonGroup( 0, Qt::Vertical, i18n("Colors"), this ); - gb->tqlayout()->setSpacing(KDialog::spacingHint()); - gb->tqlayout()->setMargin(KDialog::marginHint()); + gb->layout()->setSpacing(KDialog::spacingHint()); + gb->layout()->setMargin(KDialog::marginHint()); toplevel->addWidget( gb); TQString wtstr; - TQGridLayout* grid = new TQGridLayout( gb->tqlayout(), 8, 3 ); + TQGridLayout* grid = new TQGridLayout( gb->layout(), 8, 3 ); const int labelAlign = AlignRight | AlignVCenter; int row = -1; diff --git a/kchart/kchartComboConfigPage.cc b/kchart/kchartComboConfigPage.cc index 4016e14c..2444998d 100644 --- a/kchart/kchartComboConfigPage.cc +++ b/kchart/kchartComboConfigPage.cc @@ -40,11 +40,11 @@ KChartComboPage::KChartComboPage( KChartParams* params, { //TQVBoxLayout* toplevel = new TQVBoxLayout( this, 10 ); - TQGridLayout* tqlayout = new TQGridLayout(this, 2, 2,KDialog::marginHint(), KDialog::spacingHint() ); - //toplevel->addLayout( tqlayout ); + TQGridLayout* layout = new TQGridLayout(this, 2, 2,KDialog::marginHint(), KDialog::spacingHint() ); + //toplevel->addLayout( layout ); TQButtonGroup* gb = new TQButtonGroup( i18n("HLC Style"), this ); TQGridLayout *grid1 = new TQGridLayout(gb,7,1,KDialog::marginHint(), KDialog::spacingHint()); - tqlayout->addWidget(gb,0,0); + layout->addWidget(gb,0,0); diamond=new TQRadioButton( i18n("Diamond"), gb ); ; grid1->addWidget(diamond,0,0); @@ -63,7 +63,7 @@ KChartComboPage::KChartComboPage( KChartParams* params, grid1->activate(); //it's not good but I don't know how //to reduce space - tqlayout->addColSpacing(1,300); + layout->addColSpacing(1,300); } void KChartComboPage::init() diff --git a/kchart/kchartDataEditor.cc b/kchart/kchartDataEditor.cc index d9ce6551..9c5de4f9 100644 --- a/kchart/kchartDataEditor.cc +++ b/kchart/kchartDataEditor.cc @@ -240,7 +240,7 @@ kchartDataEditor::kchartDataEditor(TQWidget* parent) : connect( m_removeColButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( removeCurrentColumn() ) ); - // Start the tqlayout. The buttons are at the top. + // Start the layout. The buttons are at the top. TQVBoxLayout *topLayout = new TQVBoxLayout( page ); TQHBoxLayout* insertRemoveLayout = new TQHBoxLayout( ); diff --git a/kchart/kchartHeaderFooterConfigPage.cc b/kchart/kchartHeaderFooterConfigPage.cc index c097c381..e6c6c99b 100644 --- a/kchart/kchartHeaderFooterConfigPage.cc +++ b/kchart/kchartHeaderFooterConfigPage.cc @@ -39,64 +39,64 @@ KChartHeaderFooterConfigPage::KChartHeaderFooterConfigPage( KChartParams* params TQWidget* parent ) : TQWidget( parent ),_params( params ) { - TQGridLayout* tqlayout = new TQGridLayout( this, 4, 3 ); - tqlayout->setSpacing( KDialog::spacingHint() ); - tqlayout->setMargin( KDialog::marginHint() ); + TQGridLayout* layout = new TQGridLayout( this, 4, 3 ); + layout->setSpacing( KDialog::spacingHint() ); + layout->setMargin( KDialog::marginHint() ); TQLabel *lab=new TQLabel(i18n("Title:"), this); TQWhatsThis::add(lab, i18n("Write here the title of your chart if you want one. The title will be centered on top above your chart.")); - tqlayout->addWidget(lab,0,0); + layout->addWidget(lab,0,0); titleEdit=new TQLineEdit(this); TQWhatsThis::add(titleEdit, i18n("Write here the title of your chart if you want one. The title will be centered on top above your chart.")); - tqlayout->addWidget(titleEdit,0,1); + layout->addWidget(titleEdit,0,1); titleColorButton=new KColorButton(this); TQWhatsThis::add(titleColorButton, i18n("Click on this button to choose the color for the title font.")); - tqlayout->addWidget(titleColorButton,0,2); + layout->addWidget(titleColorButton,0,2); titleFontButton=new TQPushButton(i18n("Font..."),this); TQWhatsThis::add(titleFontButton, i18n("Click on this button to choose the font family, style and size for the title.")); - tqlayout->addWidget(titleFontButton,0,3); + layout->addWidget(titleFontButton,0,3); connect( titleFontButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(changeTitleFont())); lab=new TQLabel(i18n("Subtitle:"),this); TQWhatsThis::add(lab, i18n("Write here the subtitle of your chart if you want one. The subtitle will be centered on top just below the title.")); - tqlayout->addWidget(lab,1,0); + layout->addWidget(lab,1,0); subtitleEdit=new TQLineEdit(this); TQWhatsThis::add(subtitleEdit, i18n("Write here the subtitle of your chart if you want one. The subtitle will be centered on top just below the title.")); - tqlayout->addWidget(subtitleEdit,1,1); + layout->addWidget(subtitleEdit,1,1); subtitleColorButton=new KColorButton(this); TQWhatsThis::add(subtitleColorButton, i18n("Click on this button to choose the color for the subtitle font.")); - tqlayout->addWidget(subtitleColorButton,1,2); + layout->addWidget(subtitleColorButton,1,2); subtitleFontButton=new TQPushButton(i18n("Font..."),this); TQWhatsThis::add(subtitleFontButton, i18n("Click on this button to choose the font family, style and size for the subtitle.")); - tqlayout->addWidget(subtitleFontButton,1,3); + layout->addWidget(subtitleFontButton,1,3); connect( subtitleFontButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(changeSubtitleFont())); lab=new TQLabel(i18n("Footer:"),this); TQWhatsThis::add(lab, i18n("Write here the footer of your chart if you want one. The footer will be centered at the bottom just below your chart.")); - tqlayout->addWidget(lab,2,0); + layout->addWidget(lab,2,0); footerEdit=new TQLineEdit(this); TQWhatsThis::add(footerEdit, i18n("Write here the subtitle of your chart if you want one. The subtitle will be centered on top just below the title.")); - tqlayout->addWidget(footerEdit,2,1); + layout->addWidget(footerEdit,2,1); footerColorButton=new KColorButton(this); TQWhatsThis::add(footerColorButton, i18n("Click on this button to choose the color for the footer font.")); - tqlayout->addWidget(footerColorButton,2,2); + layout->addWidget(footerColorButton,2,2); footerFontButton=new TQPushButton(i18n("Font..."),this); TQWhatsThis::add(footerFontButton, i18n("Click on this button to choose the font family, style and size for the footer.")); connect( footerFontButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(changeFooterFont())); - tqlayout->addWidget(footerFontButton,2,3); + layout->addWidget(footerFontButton,2,3); - tqlayout->addItem( new TQSpacerItem( 5, 5, TQSizePolicy::Minimum, TQSizePolicy::Expanding ), 3, 0 ); + layout->addItem( new TQSpacerItem( 5, 5, TQSizePolicy::Minimum, TQSizePolicy::Expanding ), 3, 0 ); - tqlayout->activate(); + layout->activate(); } void KChartHeaderFooterConfigPage::init() diff --git a/kchart/kchartLegendConfigPage.cc b/kchart/kchartLegendConfigPage.cc index d7583a35..2c027138 100644 --- a/kchart/kchartLegendConfigPage.cc +++ b/kchart/kchartLegendConfigPage.cc @@ -49,15 +49,15 @@ KChartLegendConfigPage::KChartLegendConfigPage( KChartParams* params, TQWidget( parent ),_params( params ) { //Layout for 4 blocks - TQGridLayout* tqlayout = new TQGridLayout( this, 3, 2, KDialog::marginHint(), KDialog::spacingHint() ); + TQGridLayout* layout = new TQGridLayout( this, 3, 2, KDialog::marginHint(), KDialog::spacingHint() ); //1. Block: General settings TQButtonGroup* gb = new TQButtonGroup( 0, Qt::Vertical, i18n("General"), this ); - gb->tqlayout()->setSpacing(KDialog::spacingHint()); - gb->tqlayout()->setMargin(KDialog::marginHint()); - tqlayout->addWidget( gb, 0, 0 ); + gb->layout()->setSpacing(KDialog::spacingHint()); + gb->layout()->setMargin(KDialog::marginHint()); + layout->addWidget( gb, 0, 0 ); - TQGridLayout *grid2 = new TQGridLayout( gb->tqlayout(), 4, 2 ); + TQGridLayout *grid2 = new TQGridLayout( gb->layout(), 4, 2 ); TQLabel* lab = new TQLabel( i18n("Title:"), gb ); TQWhatsThis::add(lab, i18n("Write here the title of the legend, which is displayed at the top of the legend box.")); @@ -70,11 +70,11 @@ KChartLegendConfigPage::KChartLegendConfigPage( KChartParams* params, gb = new TQButtonGroup( 0, Qt::Vertical, i18n("Legend Position"), this ); TQWhatsThis::add(gb, i18n("<qt>Choose the location of the legend on the chart by " "clicking a location button.\nUse the central button to <b>hide</b> the legend.</qt>")); - gb->tqlayout()->setSpacing(KDialog::spacingHint()); - gb->tqlayout()->setMargin(KDialog::marginHint()); + gb->layout()->setSpacing(KDialog::spacingHint()); + gb->layout()->setMargin(KDialog::marginHint()); gb->setExclusive( true ); - TQGridLayout *grid1 = new TQGridLayout( gb->tqlayout(), 5, 5 ); + TQGridLayout *grid1 = new TQGridLayout( gb->layout(), 5, 5 ); lTopLeft = addButton( grid1, gb, i18n("Top-Left"), "chart_legend_topleft", 0, 0 ); lTopLeftTop = addButton( grid1, gb, i18n("Top-Left-Top"), "chart_legend_toplefttop", 0, 1 ); @@ -99,16 +99,16 @@ KChartLegendConfigPage::KChartLegendConfigPage( KChartParams* params, lBottomRight = addButton( grid1, gb, i18n("Bottom-Right"), "chart_legend_bottomright", 4, 4 ); gb->setAlignment( TQt::AlignLeft ); - tqlayout->addMultiCellWidget( gb, 1,2, 0,0 ); + layout->addMultiCellWidget( gb, 1,2, 0,0 ); // 3. Block: Font gb = new TQButtonGroup( 0, Qt::Vertical, i18n("Font"), this ); TQWhatsThis::add(gb, i18n("This Font box can be used to set different fonts for the legend title and the individual entries.")); - gb->tqlayout()->setSpacing(KDialog::spacingHint()); - gb->tqlayout()->setMargin(KDialog::marginHint()); - tqlayout->addWidget( gb, 0, 1 ); + gb->layout()->setSpacing(KDialog::spacingHint()); + gb->layout()->setMargin(KDialog::marginHint()); + layout->addWidget( gb, 0, 1 ); - TQGridLayout *grid4 = new TQGridLayout( gb->tqlayout(), 4, 2 ); + TQGridLayout *grid4 = new TQGridLayout( gb->layout(), 4, 2 ); titleLegendFontButton = new TQPushButton( gb ); lab = new TQLabel( i18n("Legend title font:"), gb ); @@ -134,9 +134,9 @@ KChartLegendConfigPage::KChartLegendConfigPage( KChartParams* params, orientationGroup = new TQVButtonGroup( i18n("Orientation"), this ); TQWhatsThis::add(orientationGroup, i18n("Select, if the legend's items should be drawn next to each other, or below each other.")); orientationGroup->setRadioButtonExclusive(true); - orientationGroup->tqlayout()->setSpacing(KDialog::spacingHint()); - orientationGroup->tqlayout()->setMargin(KDialog::marginHint()); - tqlayout->addWidget( orientationGroup, 1, 1 ); + orientationGroup->layout()->setSpacing(KDialog::spacingHint()); + orientationGroup->layout()->setMargin(KDialog::marginHint()); + layout->addWidget( orientationGroup, 1, 1 ); TQRadioButton* orientation = new TQRadioButton( i18n("Vertically"), orientationGroup ); orientation = new TQRadioButton( i18n("Horizontally"), orientationGroup ); @@ -145,11 +145,11 @@ KChartLegendConfigPage::KChartLegendConfigPage( KChartParams* params, // 5. Block: Text Colors gb = new TQButtonGroup( 0, Qt::Vertical, i18n("Color"), this ); TQWhatsThis::add(gb, i18n("This Color box can be used to set different colors for the legend title and text.")); - gb->tqlayout()->setSpacing(KDialog::spacingHint()); - gb->tqlayout()->setMargin(KDialog::marginHint()); - tqlayout->addWidget( gb, 2, 1 ); + gb->layout()->setSpacing(KDialog::spacingHint()); + gb->layout()->setMargin(KDialog::marginHint()); + layout->addWidget( gb, 2, 1 ); - TQGridLayout *grid3 = new TQGridLayout( gb->tqlayout(), 6, 2 ); + TQGridLayout *grid3 = new TQGridLayout( gb->layout(), 6, 2 ); lab = new TQLabel( i18n("Legend title color:"), gb ); grid3->addWidget( lab, 0, 0 ); @@ -177,7 +177,7 @@ KChartLegendConfigPage::KChartLegendConfigPage( KChartParams* params, //it's not good but I don't know how //to reduce space - tqlayout->addColSpacing( 1, 300 ); + layout->addColSpacing( 1, 300 ); } void KChartLegendConfigPage::init() @@ -364,7 +364,7 @@ void KChartLegendConfigPage::apply() _params->setLegendFontRelSize(textLegend.pointSize()); } -TQPushButton* KChartLegendConfigPage::addButton( TQGridLayout* tqlayout, +TQPushButton* KChartLegendConfigPage::addButton( TQGridLayout* layout, TQButtonGroup* gb, const TQString &toolTipText, const TQString &icon, @@ -378,7 +378,7 @@ TQPushButton* KChartLegendConfigPage::addButton( TQGridLayout* tqlayout, KIcon::DefaultState, KChartFactory::global() ) ); TQToolTip::add( button, toolTipText ); - tqlayout->addWidget( button, posY, posX ); + layout->addWidget( button, posY, posX ); return button; } diff --git a/kchart/kchartLegendConfigPage.h b/kchart/kchartLegendConfigPage.h index 8419baa8..a67a6b12 100644 --- a/kchart/kchartLegendConfigPage.h +++ b/kchart/kchartLegendConfigPage.h @@ -64,7 +64,7 @@ private: TQPushButton *titleLegendFontButton, *textLegendFontButton; TQButton::ToggleState titleLegendIsRelative, textLegendIsRelative; - TQPushButton* addButton( TQGridLayout* tqlayout, TQButtonGroup* gb, + TQPushButton* addButton( TQGridLayout* layout, TQButtonGroup* gb, const TQString &toolTipText, const TQString &icon, int posY, int posX ); }; diff --git a/kchart/kchartLine3dConfigPage.cc b/kchart/kchartLine3dConfigPage.cc index 7b70ccfd..f486053b 100644 --- a/kchart/kchartLine3dConfigPage.cc +++ b/kchart/kchartLine3dConfigPage.cc @@ -101,7 +101,7 @@ KChartLine3dConfigPage::KChartLine3dConfigPage( KChartParams* params, grid1->activate(); //it's not good but I don't know how //to reduce space - //tqlayout->addColSpacing(1,300); + //layout->addColSpacing(1,300); } void KChartLine3dConfigPage::slotChange3DParameter(bool b) diff --git a/kchart/kchartPageLayout.cc b/kchart/kchartPageLayout.cc index 8fd9c9d0..9292f1f9 100644 --- a/kchart/kchartPageLayout.cc +++ b/kchart/kchartPageLayout.cc @@ -43,10 +43,10 @@ KChartPageLayout::KChartPageLayout( KChartParams* _params, TQWidget* parent, con setMainWidget(page); // FIXME: The following code is strange, since it is written to - // use a grid tqlayout with a standard TQWidget. However, with the + // use a grid layout with a standard TQWidget. However, with the // TQGroupBox, it looks better, and since it actually works, there // is no immediate need for rewriting. In the sake of clarity, it - // should be done though, and we should use the tqlayout + // should be done though, and we should use the layout // capabilities of the groupbox instead.. setButtonText( KDialogBase::User1, i18n("&Reset") ); diff --git a/kchart/kchartParameter3dConfigPage.cc b/kchart/kchartParameter3dConfigPage.cc index b1a0b199..9bce7b5f 100644 --- a/kchart/kchartParameter3dConfigPage.cc +++ b/kchart/kchartParameter3dConfigPage.cc @@ -38,17 +38,17 @@ KChartParameter3dConfigPage::KChartParameter3dConfigPage( KChartParams* params, TQWidget* parent ) : TQWidget( parent ),m_params( params ) { - TQGridLayout* tqlayout = new TQGridLayout(this, 2, 2,KDialog::marginHint(),KDialog::spacingHint()); + TQGridLayout* layout = new TQGridLayout(this, 2, 2,KDialog::marginHint(),KDialog::spacingHint()); TQButtonGroup* gb = new TQButtonGroup( 0, Qt::Vertical, i18n("3D Parameters"), this ); - gb->tqlayout()->setSpacing(KDialog::spacingHint()); - gb->tqlayout()->setMargin(KDialog::marginHint()); + gb->layout()->setSpacing(KDialog::spacingHint()); + gb->layout()->setMargin(KDialog::marginHint()); - // The grid tqlayout inside the buttongroup. - TQGridLayout *grid1 = new TQGridLayout(gb->tqlayout(), 5, 3); - tqlayout->addWidget(gb,0,0); + // The grid layout inside the buttongroup. + TQGridLayout *grid1 = new TQGridLayout(gb->layout(), 5, 3); + layout->addWidget(gb,0,0); // The main on/off checkbox. bar3d=new TQCheckBox(i18n("3D bar"),gb); @@ -90,7 +90,7 @@ KChartParameter3dConfigPage::KChartParameter3dConfigPage( KChartParams* params, //it's not good but I don't know how //to reduce space - //tqlayout->addColSpacing(1,300); + //layout->addColSpacing(1,300); } diff --git a/kchart/kchartParameterConfigPage.cc b/kchart/kchartParameterConfigPage.cc index bffa3099..2fc0b0af 100644 --- a/kchart/kchartParameterConfigPage.cc +++ b/kchart/kchartParameterConfigPage.cc @@ -44,17 +44,17 @@ KChartParameterConfigPage::KChartParameterConfigPage( KChartParams* params, TQWidget* parent ) : TQWidget( parent ),_params( params ) { - // toplevel tqlayout + // toplevel layout TQVBoxLayout* toplevel = new TQVBoxLayout( this, 10 ); - TQGridLayout* tqlayout = new TQGridLayout( 1, 3 ); - toplevel->addLayout( tqlayout ); + TQGridLayout* layout = new TQGridLayout( 1, 3 ); + toplevel->addLayout( layout ); // The "Parameters" button group TQButtonGroup* gb1 = new TQButtonGroup( 0, Qt::Vertical, i18n("Parameters"), this ); - gb1->tqlayout()->setSpacing(KDialog::spacingHint()); - gb1->tqlayout()->setMargin(KDialog::marginHint()); - TQGridLayout *grid1 = new TQGridLayout(gb1->tqlayout(),9,1); + gb1->layout()->setSpacing(KDialog::spacingHint()); + gb1->layout()->setMargin(KDialog::marginHint()); + TQGridLayout *grid1 = new TQGridLayout(gb1->layout(),9,1); grid = new TQCheckBox( i18n( "Grid" ), gb1 ); TQWhatsThis::add(grid, i18n("If this is checked, the grid is shown. If you uncheck this option, the grid will not be displayed anymore.")); @@ -93,9 +93,9 @@ KChartParameterConfigPage::KChartParameterConfigPage( KChartParams* params, // The "Settings" button group TQButtonGroup* gb2 = new TQButtonGroup( 0, Qt::Vertical, i18n("Settings"), this ); - gb2->tqlayout()->setSpacing(KDialog::spacingHint()); - gb2->tqlayout()->setMargin(KDialog::marginHint()); - TQGridLayout *grid2 = new TQGridLayout(gb2->tqlayout(),8,1); + gb2->layout()->setSpacing(KDialog::spacingHint()); + gb2->layout()->setMargin(KDialog::marginHint()); + TQGridLayout *grid2 = new TQGridLayout(gb2->layout(),8,1); TQBoxLayout * l = new TQVBoxLayout( grid2 ); @@ -160,8 +160,8 @@ KChartParameterConfigPage::KChartParameterConfigPage( KChartParams* params, ylabel2_fmt->setMaximumWidth(130); grid2->addWidget(ylabel2_fmt,5,1); #endif - tqlayout->addWidget(gb1,0,0); - tqlayout->addWidget(gb2,0,1); + layout->addWidget(gb1,0,0); + layout->addWidget(gb2,0,1); #if 0 grid1->activate(); diff --git a/kchart/kchartPrinterDlg.cc b/kchart/kchartPrinterDlg.cc index 9bd898d6..a7d0e88f 100644 --- a/kchart/kchartPrinterDlg.cc +++ b/kchart/kchartPrinterDlg.cc @@ -37,9 +37,9 @@ namespace KChart : KPrintDialogPage( parent, name ) { setTitle( i18n( "KChart Options" ) ); - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); - tqlayout->setMargin( KDialog::marginHint() ); - tqlayout->setSpacing( KDialog::spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); + layout->setMargin( KDialog::marginHint() ); + layout->setSpacing( KDialog::spacingHint() ); txtSizex = new KIntNumInput(this ); txtSizex->setSuffix("%"); txtSizex->setMinValue(1); @@ -51,12 +51,12 @@ namespace KChart txtSizey->setMaxValue(100); txtSizey->setValue(100); - tqlayout->addWidget( new TQLabel(i18n("Print Size"), this) ); - tqlayout->addWidget( new TQLabel(i18n("Width: "), this) ); - tqlayout->addWidget( txtSizex ); - tqlayout->addWidget( new TQLabel(i18n("Height: "), this) ); - tqlayout->addWidget( txtSizey ); - tqlayout->addStretch( 1 ); + layout->addWidget( new TQLabel(i18n("Print Size"), this) ); + layout->addWidget( new TQLabel(i18n("Width: "), this) ); + layout->addWidget( txtSizex ); + layout->addWidget( new TQLabel(i18n("Height: "), this) ); + layout->addWidget( txtSizey ); + layout->addStretch( 1 ); } void KChartPrinterDlg::getOptions( TQMap<TQString, TQString>& opts, bool ) diff --git a/kchart/kchartSubTypeChartPage.cc b/kchart/kchartSubTypeChartPage.cc index 0f7b4ca5..7f8da82f 100644 --- a/kchart/kchartSubTypeChartPage.cc +++ b/kchart/kchartSubTypeChartPage.cc @@ -226,7 +226,7 @@ KChartBarSubTypeChartPage::KChartBarSubTypeChartPage( KChartParams* params, //TQHBox *hbox = new TQHBox( this ); new TQLabel( i18n( "Number of lines: "), left ); m_numLines = new TQSpinBox( left ); - // FIXME: Use a grid tqlayout instead + // FIXME: Use a grid layout instead new TQLabel( "", left); left->setStretchFactor( left, 1 ); diff --git a/kchart/kchartWizardSelectChartSubTypePage.cc b/kchart/kchartWizardSelectChartSubTypePage.cc index 74804042..2aa08afe 100644 --- a/kchart/kchartWizardSelectChartSubTypePage.cc +++ b/kchart/kchartWizardSelectChartSubTypePage.cc @@ -44,7 +44,7 @@ KChartWizardSelectChartSubTypePage::KChartWizardSelectChartSubTypePage( TQWidget TQButtonGroup *grp = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Chart Sub Type" ), this ); grp->setRadioButtonExclusive( true ); - grp->tqlayout(); + grp->layout(); lay1->addWidget(grp); m_normal = new TQRadioButton( i18n( "Normal" ), grp ); m_stacked = new TQRadioButton( i18n( "Stacked" ), grp ); diff --git a/kchart/kdchart/KDChartAxisParams.cpp b/kchart/kdchart/KDChartAxisParams.cpp index a6e337f2..b24892b1 100644 --- a/kchart/kdchart/KDChartAxisParams.cpp +++ b/kchart/kdchart/KDChartAxisParams.cpp @@ -297,7 +297,7 @@ become wider or more narrow. Also the graphical representation of the date will be comparable since all your charts will use the same scale if you wish this. -- Let the program calculate the chart tqlayout based upon the kind +- Let the program calculate the chart layout based upon the kind of and width of the labels to be drawn at the axes. Also the program can calculate the labels for you and find the boundary values for start and end of the scale automatically. diff --git a/kchart/kdchart/KDChartDataIntern.h b/kchart/kdchart/KDChartDataIntern.h index a1d6562b..fe8cfc8f 100644 --- a/kchart/kdchart/KDChartDataIntern.h +++ b/kchart/kdchart/KDChartDataIntern.h @@ -231,7 +231,7 @@ public: } } // Note: We do *not* compare the _propSetID here since it contains - // no values but is used to handle some tqlayout information... + // no values but is used to handle some layout information... } return bRet; } @@ -289,7 +289,7 @@ public: /* NOOP */; } // Note: We do *not* copy the _propSetID here since it contains - // no values but is used to handle some tqlayout information... + // no values but is used to handle some layout information... } } diff --git a/kchart/kdchart/KDChartEnums.h b/kchart/kdchart/KDChartEnums.h index b3fe1632..71373d56 100644 --- a/kchart/kdchart/KDChartEnums.h +++ b/kchart/kdchart/KDChartEnums.h @@ -53,10 +53,10 @@ class KDCHART_EXPORT KDChartEnums :public TQObject public: /** - Text tqlayout policy: what to do if text that is to be drawn would + Text layout policy: what to do if text that is to be drawn would cover neighboring text or neighboring areas. - \li \c LayoutJustOverwrite Just ignore the tqlayout collision and write the text nevertheless. + \li \c LayoutJustOverwrite Just ignore the layout collision and write the text nevertheless. \li \c LayoutPolicyRotate Try counter-clockwise rotation to make the text fit into the space. \li \c LayoutPolicyShiftVertically Shift the text baseline upwards (or downwards, resp.) and draw a connector line between the text and its anchor. \li \c LayoutPolicyShiftHorizontally Shift the text baseline to the left (or to the right, resp.) and draw a connector line between the text and its anchor. @@ -71,11 +71,11 @@ public: LayoutPolicyShrinkFontSize }; /** - Converts the specified text tqlayout policy enum to a + Converts the specified text layout policy enum to a string representation. - \param type the text tqlayout policy to convert - \return the string representation of the text tqlayout policy enum + \param type the text layout policy to convert + \return the string representation of the text layout policy enum */ static TQString layoutPolicyToString( TextLayoutPolicy type ) { switch( type ) { @@ -90,7 +90,7 @@ public: case LayoutPolicyShrinkFontSize: return "ShrinkFontSize"; default: // should not happen - qDebug( "Unknown text tqlayout policy" ); + qDebug( "Unknown text layout policy" ); return "JustOverwrite"; } } @@ -150,10 +150,10 @@ public: /** - Converts the specified string to a text tqlayout policy enum value. + Converts the specified string to a text layout policy enum value. \param string the string to convert - \return the text tqlayout policy enum value + \return the text layout policy enum value */ static TextLayoutPolicy stringToLayoutPolicy( const TQString& string ) { if( string == "JustOverwrite" ) diff --git a/kchart/kdchart/KDChartPainter.cpp b/kchart/kdchart/KDChartPainter.cpp index 5ec61095..849d2b29 100644 --- a/kchart/kdchart/KDChartPainter.cpp +++ b/kchart/kdchart/KDChartPainter.cpp @@ -850,7 +850,7 @@ void KDChartPainter::paintDataValues( TQPainter* painter, /* NOTE: The following will be REMOVED again once -the tqlayout policy feature is implemented !!! +the layout policy feature is implemented !!! */ TQRect textRect( region->pTextRegion->boundingRect() ); diff --git a/kchart/kdchart/KDChartParams.cpp b/kchart/kdchart/KDChartParams.cpp index deedda9e..e59443fb 100644 --- a/kchart/kdchart/KDChartParams.cpp +++ b/kchart/kdchart/KDChartParams.cpp @@ -3807,9 +3807,9 @@ int KDChartParams::dataValuesRotation( uint chart, bool negative ) const a data text covers a neighboring data text (or a neighboring data area, resp.). - \note A tqlayout policy different from LayoutJustOverwrite from does + \note A layout policy different from LayoutJustOverwrite from does not mean that this policy is followed in any case. Rather than - giving up when the selected policy does not result in a good tqlayout + giving up when the selected policy does not result in a good layout the program will automatically try the next policy: if LayoutPolicyRotate did not succeed LayoutPolicyShiftVertically will be tried, if this did not succeed either diff --git a/kchart/kdchart/KDDrawText.h b/kchart/kdchart/KDDrawText.h index 5fb9dbfd..7842e9b5 100644 --- a/kchart/kdchart/KDDrawText.h +++ b/kchart/kdchart/KDDrawText.h @@ -53,7 +53,7 @@ class KDDrawText const TQString& text, const TQFont* font = 0, int align = TQt::AlignLeft | TQt::AlignTop, - // useful for debugging of your tqlayout: + // useful for debugging of your layout: bool showAnchor = false, const TQFontMetrics* fontMet = 0, bool noFirstrotate = false, @@ -81,7 +81,7 @@ class KDDrawText const TQString& text, const TQFont* font = 0, int align = TQt::AlignLeft | TQt::AlignTop, - // usefull for debugging of your tqlayout: + // usefull for debugging of your layout: bool showAnchor = false, // speed-up parameters // used internally by drawCircleText() diff --git a/kdgantt/KDGanttMinimizeSplitter.cpp b/kdgantt/KDGanttMinimizeSplitter.cpp index 70a22c70..66d71197 100644 --- a/kdgantt/KDGanttMinimizeSplitter.cpp +++ b/kdgantt/KDGanttMinimizeSplitter.cpp @@ -243,7 +243,7 @@ void KDGanttSplitterHandle::paintEvent( TQPaintEvent * ) p.setBrush( colorGroup().background() ); p.setPen( colorGroup().foreground() ); p.drawRect( rect() ); - parentWidget()->tqstyle().tqdrawPrimitive( TQStyle::PE_Panel, &p, rect(), + parentWidget()->style().tqdrawPrimitive( TQStyle::PE_Panel, &p, rect(), parentWidget()->colorGroup()); int sw = 8; // Hardcoded, given I didn't use styles anymore, I didn't like to use their size @@ -258,8 +258,8 @@ void KDGanttSplitterHandle::paintEvent( TQPaintEvent * ) for ( TQValueList<TQPointArray>::Iterator it = list.begin(); it != list.end(); ++it ) { if ( index == _activeButton ) { p.save(); - p.translate( parentWidget()->tqstyle().pixelMetric( TQStyle::PM_ButtonShiftHorizontal ), - parentWidget()->tqstyle().pixelMetric( TQStyle::PM_ButtonShiftVertical ) ); + p.translate( parentWidget()->style().pixelMetric( TQStyle::PM_ButtonShiftHorizontal ), + parentWidget()->style().pixelMetric( TQStyle::PM_ButtonShiftVertical ) ); p.drawPolygon( *it, true ); p.restore(); } @@ -563,7 +563,7 @@ void KDGanttMinimizeSplitter::setRubberband( int p ) paint.setRasterOp( XorROP ); TQRect r = contentsRect(); const int rBord = 3; //Themable???? - int sw = tqstyle().pixelMetric(TQStyle::PM_SplitterWidth, this); + int sw = style().pixelMetric(TQStyle::PM_SplitterWidth, this); if ( orient ==Qt::Horizontal ) { if ( opaqueOldPos >= 0 ) paint.drawRect( opaqueOldPos + sw/2 - rBord , r.y(), @@ -603,7 +603,7 @@ bool KDGanttMinimizeSplitter::event( TQEvent *e ) void KDGanttMinimizeSplitter::drawSplitter( TQPainter *p, TQCOORD x, TQCOORD y, TQCOORD w, TQCOORD h ) { - tqstyle().tqdrawPrimitive(TQStyle::PE_Splitter, p, TQRect(x, y, w, h), colorGroup(), + style().tqdrawPrimitive(TQStyle::PE_Splitter, p, TQRect(x, y, w, h), colorGroup(), (orientation() == Qt::Horizontal ? TQStyle::Style_Horizontal : 0)); } @@ -634,7 +634,7 @@ int KDGanttMinimizeSplitter::idAfter( TQWidget* w ) const close as possible to position \a p, which is the distance from the left (or top) edge of the widget. - For Arabic and Hebrew the tqlayout is reversed, and using this + For Arabic and Hebrew the layout is reversed, and using this function to set the position of the splitter might lead to unexpected results, since in Arabic and Hebrew the position of splitter one is to the left of the position of splitter zero. @@ -839,7 +839,7 @@ void KDGanttMinimizeSplitter::getRange( int id, int *min, int *max ) } TQRect r = contentsRect(); if ( orient ==Qt::Horizontal && TQApplication::reverseLayout() ) { - int splitterWidth = tqstyle().pixelMetric(TQStyle::PM_SplitterWidth, this); + int splitterWidth = style().pixelMetric(TQStyle::PM_SplitterWidth, this); if ( min ) *min = pick(r.topRight()) - TQMIN( maxB, pick(r.size())-minA ) - splitterWidth; if ( max ) @@ -1231,7 +1231,7 @@ bool KDGanttMinimizeSplitter::isHidden( TQWidget *w ) const splitter. Giving the values to another splitter's setSizes() function will - produce a splitter with the same tqlayout as this one. + produce a splitter with the same layout as this one. Note that if you want to iterate over the list, you should iterate over a copy, e.g. @@ -1311,7 +1311,7 @@ void KDGanttMinimizeSplitter::processChildEvents() void KDGanttMinimizeSplitter::styleChange( TQStyle& old ) { - int sw = tqstyle().pixelMetric(TQStyle::PM_SplitterWidth, this); + int sw = style().pixelMetric(TQStyle::PM_SplitterWidth, this); KDGanttSplitterLayoutStruct *s = data->list.first(); while ( s ) { if ( s->isSplitter ) diff --git a/kdgantt/KDGanttSemiSizingControl.cpp b/kdgantt/KDGanttSemiSizingControl.cpp index 8fa33775..b51507f9 100644 --- a/kdgantt/KDGanttSemiSizingControl.cpp +++ b/kdgantt/KDGanttSemiSizingControl.cpp @@ -258,7 +258,7 @@ void KDGanttSemiSizingControl::init() void KDGanttSemiSizingControl::setup() { - //-------------------------------------------------- Setup tqlayout + //-------------------------------------------------- Setup layout delete _layout; TQBoxLayout* butLayout; // _layout will delete me diff --git a/kdgantt/KDGanttView.cpp b/kdgantt/KDGanttView.cpp index a1499a84..4163fef1 100644 --- a/kdgantt/KDGanttView.cpp +++ b/kdgantt/KDGanttView.cpp @@ -4236,7 +4236,7 @@ TQColor KDGanttView::legendHeaderBackgroundColor () const may add as many widgets as you want. They are ordered horizontally from left to right. To remove a widget from the spacer widget, call widget->reparent(newParent,...) or delete the widget. Since the spacer - is a TQHBox, the tqlayout of the added widgets is managed by this + is a TQHBox, the layout of the added widgets is managed by this TQHBox. \param w A pointer to the widget to be added. diff --git a/kdgantt/KDGanttViewSubwidgets.cpp b/kdgantt/KDGanttViewSubwidgets.cpp index e1cedba6..2bcbe5ae 100644 --- a/kdgantt/KDGanttViewSubwidgets.cpp +++ b/kdgantt/KDGanttViewSubwidgets.cpp @@ -2664,7 +2664,7 @@ void KDLegendWidget::clearLegend ( ) myLegend->setFont( font() ); scroll->addChild( myLegend ); scroll->setResizePolicy( TQScrollView::AutoOneFit ); - myLegend->tqlayout()->setMargin( 11 ); + myLegend->layout()->setMargin( 11 ); myLegend->setFrameStyle( TQFrame::NoFrame ); if ( dock ) scroll->setMaximumHeight( 32000 ); @@ -2896,7 +2896,7 @@ void KDListView::drawAllContents(TQPainter * p, int cx, int cy, int cw, int ch) c = fc; // draw to last interesting column - const TQColorGroup &cg = ( tqpalette().inactive() ); + const TQColorGroup &cg = ( palette().inactive() ); while ( c < lc && !drawables.isEmpty() ) { int i = header()->mapToLogical( c ); diff --git a/kexi/3rdparty/kexisql/src/os.c b/kexi/3rdparty/kexisql/src/os.c index 79eb15e5..85872a5a 100644 --- a/kexi/3rdparty/kexisql/src/os.c +++ b/kexi/3rdparty/kexisql/src/os.c @@ -531,11 +531,11 @@ int sqliteOsOpenReadWrite( if( FSpMakeFSRef(&fsSpec, &fsRef) != noErr ) return SQLITE_CANTOPEN; FSGetDataForkName(&dfName); - if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode, + if( FSOpenFork(&fsRef, dfName.length, dfName.unicode, fsRdWrShPerm, &(id->refNum)) != noErr ){ - if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode, + if( FSOpenFork(&fsRef, dfName.length, dfName.unicode, fsRdWrPerm, &(id->refNum)) != noErr ){ - if (FSOpenFork(&fsRef, dfName.length, dfName.tqunicode, + if (FSOpenFork(&fsRef, dfName.length, dfName.unicode, fsRdPerm, &(id->refNum)) != noErr ) return SQLITE_CANTOPEN; else @@ -650,7 +650,7 @@ int sqliteOsOpenExclusive(const char *zFilename, OsFile *id, int delFlag){ if( FSpMakeFSRef(&fsSpec, &fsRef) != noErr ) return SQLITE_CANTOPEN; FSGetDataForkName(&dfName); - if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode, + if( FSOpenFork(&fsRef, dfName.length, dfName.unicode, fsRdWrPerm, &(id->refNum)) != noErr ) return SQLITE_CANTOPEN; # else @@ -724,7 +724,7 @@ int sqliteOsOpenReadOnly(const char *zFilename, OsFile *id){ if( FSpMakeFSRef(&fsSpec, &fsRef) != noErr ) return SQLITE_CANTOPEN; FSGetDataForkName(&dfName); - if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode, + if( FSOpenFork(&fsRef, dfName.length, dfName.unicode, fsRdPerm, &(id->refNum)) != noErr ) return SQLITE_CANTOPEN; # else diff --git a/kexi/3rdparty/kexisql3/src/main.c b/kexi/3rdparty/kexisql3/src/main.c index 1c1029f9..83356f43 100644 --- a/kexi/3rdparty/kexisql3/src/main.c +++ b/kexi/3rdparty/kexisql3/src/main.c @@ -667,7 +667,7 @@ const char *sqlite3_errmsg(sqlite3 *db){ ** error. */ const void *sqlite3_errmsg16(sqlite3 *db){ - /* Because all the characters in the string are in the tqunicode + /* Because all the characters in the string are in the unicode ** range 0x00-0xFF, if we pad the big-endian string with a ** zero byte, we can obtain the little-endian string with ** &big_endian[1]. diff --git a/kexi/3rdparty/kexisql3/src/os_mac.c b/kexi/3rdparty/kexisql3/src/os_mac.c index f393b423..285d0805 100644 --- a/kexi/3rdparty/kexisql3/src/os_mac.c +++ b/kexi/3rdparty/kexisql3/src/os_mac.c @@ -84,11 +84,11 @@ int sqlite3OsOpenReadWrite( if( FSpMakeFSRef(&fsSpec, &fsRef) != noErr ) return SQLITE_CANTOPEN; FSGetDataForkName(&dfName); - if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode, + if( FSOpenFork(&fsRef, dfName.length, dfName.unicode, fsRdWrShPerm, &(id->refNum)) != noErr ){ - if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode, + if( FSOpenFork(&fsRef, dfName.length, dfName.unicode, fsRdWrPerm, &(id->refNum)) != noErr ){ - if (FSOpenFork(&fsRef, dfName.length, dfName.tqunicode, + if (FSOpenFork(&fsRef, dfName.length, dfName.unicode, fsRdPerm, &(id->refNum)) != noErr ) return SQLITE_CANTOPEN; else @@ -149,7 +149,7 @@ int sqlite3OsOpenExclusive(const char *zFilename, OsFile *id, int delFlag){ if( FSpMakeFSRef(&fsSpec, &fsRef) != noErr ) return SQLITE_CANTOPEN; FSGetDataForkName(&dfName); - if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode, + if( FSOpenFork(&fsRef, dfName.length, dfName.unicode, fsRdWrPerm, &(id->refNum)) != noErr ) return SQLITE_CANTOPEN; # else @@ -185,7 +185,7 @@ int sqlite3OsOpenReadOnly(const char *zFilename, OsFile *id){ if( FSpMakeFSRef(&fsSpec, &fsRef) != noErr ) return SQLITE_CANTOPEN; FSGetDataForkName(&dfName); - if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode, + if( FSOpenFork(&fsRef, dfName.length, dfName.unicode, fsRdPerm, &(id->refNum)) != noErr ) return SQLITE_CANTOPEN; # else diff --git a/kexi/3rdparty/kexisql3/src/os_win.c b/kexi/3rdparty/kexisql3/src/os_win.c index 8c729136..2b0a00ec 100644 --- a/kexi/3rdparty/kexisql3/src/os_win.c +++ b/kexi/3rdparty/kexisql3/src/os_win.c @@ -104,7 +104,7 @@ static WCHAR *utf8ToUnicode(const char *zFilename){ ** Convert UTF-32 to UTF-8. Space to hold the returned string is ** obtained from sqliteMalloc(). */ -static char *tqunicodeToUtf8(const WCHAR *zWideFilename){ +static char *unicodeToUtf8(const WCHAR *zWideFilename){ int nByte; char *zFilename; @@ -449,7 +449,7 @@ int sqlite3OsTempFileName(char *zBuf){ char *zMulti; WCHAR zWidePath[SQLITE_TEMPNAME_SIZE]; GetTempPathW(SQLITE_TEMPNAME_SIZE-30, zWidePath); - zMulti = tqunicodeToUtf8(zWidePath); + zMulti = unicodeToUtf8(zWidePath); if( zMulti ){ strncpy(zTempPath, zMulti, SQLITE_TEMPNAME_SIZE-30); zTempPath[SQLITE_TEMPNAME_SIZE-30] = 0; @@ -881,7 +881,7 @@ char *sqlite3OsFullPathname(const char *zRelative){ if( zTemp==0 ) return 0; GetFullPathNameW(zWide, nByte, zTemp, &zNotUsedW); sqliteFree(zWide); - zFull = tqunicodeToUtf8(zTemp); + zFull = unicodeToUtf8(zTemp); sqliteFree(zTemp); }else{ nByte = GetFullPathNameA(zRelative, 0, 0, &zNotUsed) + 1; diff --git a/kexi/3rdparty/kexisql3/src/prepare.c b/kexi/3rdparty/kexisql3/src/prepare.c index 23bfa533..a0c7be87 100644 --- a/kexi/3rdparty/kexisql3/src/prepare.c +++ b/kexi/3rdparty/kexisql3/src/prepare.c @@ -527,7 +527,7 @@ int sqlite3_prepare16( if( zTail8 && pzTail ){ /* If sqlite3_prepare returns a tail pointer, we calculate the - ** equivalent pointer into the UTF-16 string by counting the tqunicode + ** equivalent pointer into the UTF-16 string by counting the unicode ** characters between zSql8 and zTail8, and then returning a pointer ** the same number of characters into the UTF-16 string. */ diff --git a/kexi/3rdparty/kexisql3/src/utf.c b/kexi/3rdparty/kexisql3/src/utf.c index 5efbfe78..d42ab759 100644 --- a/kexi/3rdparty/kexisql3/src/utf.c +++ b/kexi/3rdparty/kexisql3/src/utf.c @@ -43,11 +43,11 @@ ** ** When converting malformed UTF-8 strings to UTF-16, one instance of the ** replacement character U+FFFD for each byte that cannot be interpeted as -** part of a valid tqunicode character. +** part of a valid unicode character. ** ** When converting malformed UTF-16 strings to UTF-8, one instance of the ** replacement character U+FFFD for each pair of bytes that cannot be -** interpeted as part of a valid tqunicode character. +** interpeted as part of a valid unicode character. ** ** This file contains the following public routines: ** @@ -427,10 +427,10 @@ int sqlite3VdbeMemHandleBom(Mem *pMem){ #endif /* SQLITE_OMIT_UTF16 */ /* -** pZ is a UTF-8 encoded tqunicode string. If nByte is less than zero, -** return the number of tqunicode characters in pZ up to (but not including) +** pZ is a UTF-8 encoded unicode string. If nByte is less than zero, +** return the number of unicode characters in pZ up to (but not including) ** the first 0x00 byte. If nByte is not less than zero, return the -** number of tqunicode characters in the first nByte of pZ (or up to +** number of unicode characters in the first nByte of pZ (or up to ** the first 0x00, whichever comes first). */ int sqlite3utf8CharLen(const char *z, int nByte){ @@ -451,10 +451,10 @@ int sqlite3utf8CharLen(const char *z, int nByte){ #ifndef SQLITE_OMIT_UTF16 /* -** pZ is a UTF-16 encoded tqunicode string. If nChar is less than zero, +** pZ is a UTF-16 encoded unicode string. If nChar is less than zero, ** return the number of bytes up to (but not including), the first pair ** of consecutive 0x00 bytes in pZ. If nChar is not less than zero, -** then return the number of bytes in the first nChar tqunicode characters +** then return the number of bytes in the first nChar unicode characters ** in pZ (or up until the first pair of 0x00 bytes, whichever comes first). */ int sqlite3utf16ByteLen(const void *zIn, int nChar){ diff --git a/kexi/3rdparty/kexisql3/src/vdbeInt.h b/kexi/3rdparty/kexisql3/src/vdbeInt.h index 89174271..4c732b09 100644 --- a/kexi/3rdparty/kexisql3/src/vdbeInt.h +++ b/kexi/3rdparty/kexisql3/src/vdbeInt.h @@ -133,7 +133,7 @@ typedef struct Mem Mem; ** No other flags may be set in this case. ** ** If the MEM_Str flag is set then Mem.z points at a string representation. -** Usually this is encoded in the same tqunicode encoding as the main +** Usually this is encoded in the same unicode encoding as the main ** database (see below for exceptions). If the MEM_Term flag is also ** set, then the string is nul terminated. The MEM_Int and MEM_Real ** flags may coexist with the MEM_Str flag. diff --git a/kexi/3rdparty/kolibs/KoPageLayoutColumns.cpp b/kexi/3rdparty/kolibs/KoPageLayoutColumns.cpp index 8ea3b0b9..2d1e6b77 100644 --- a/kexi/3rdparty/kolibs/KoPageLayoutColumns.cpp +++ b/kexi/3rdparty/kolibs/KoPageLayoutColumns.cpp @@ -25,18 +25,18 @@ #include <tqlabel.h> #include <tqlayout.h> -KoPageLayoutColumns::KoPageLayoutColumns(TQWidget *parent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& tqlayout) +KoPageLayoutColumns::KoPageLayoutColumns(TQWidget *parent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& layout) : KoPageLayoutColumnsBase(parent) { m_columns = columns; TQHBoxLayout *lay = new TQHBoxLayout(previewPane); - m_preview = new KoPagePreview( previewPane, "Preview", tqlayout ); + m_preview = new KoPagePreview( previewPane, "Preview", layout ); lay->addWidget(m_preview); lay = new TQHBoxLayout(columnSpacingPane); m_spacing = new KoUnitDoubleSpinBox( columnSpacingPane ); m_spacing->setValue( m_columns.ptColumnSpacing ); m_spacing->setUnit( unit ); double dStep = KoUnit::fromUserValue( 0.2, unit ); - m_spacing->setMinMaxStep( 0, tqlayout.ptWidth/2, dStep ); + m_spacing->setMinMaxStep( 0, layout.ptWidth/2, dStep ); lay->addWidget(m_spacing); labelSpacing->setBuddy( m_spacing ); nColumns->setValue( m_columns.columns ); @@ -63,8 +63,8 @@ void KoPageLayoutColumns::nSpaceChanged( double spacing ) { emit propertyChange(m_columns); } -void KoPageLayoutColumns::setLayout(KoPageLayout &tqlayout) { - m_preview->setPageLayout( tqlayout ); +void KoPageLayoutColumns::setLayout(KoPageLayout &layout) { + m_preview->setPageLayout( layout ); } #include <KoPageLayoutColumns.moc> diff --git a/kexi/3rdparty/kolibs/KoPageLayoutColumns.h b/kexi/3rdparty/kolibs/KoPageLayoutColumns.h index 8ebac1b2..b9dcd6c2 100644 --- a/kexi/3rdparty/kolibs/KoPageLayoutColumns.h +++ b/kexi/3rdparty/kolibs/KoPageLayoutColumns.h @@ -43,15 +43,15 @@ public: * @param parent the parent widget * @param columns the KoColumns data structure that this dialog should be initialzed with * @param unit the unit-type (mm/cm/inch) that the dialog should show - * @param tqlayout the page tqlayout that the preview should be initialzed with. + * @param layout the page layout that the preview should be initialzed with. */ - KoPageLayoutColumns(TQWidget *parent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& tqlayout); + KoPageLayoutColumns(TQWidget *parent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& layout); /** - * Update the page preview widget with the param tqlayout. - * @param tqlayout the new tqlayout + * Update the page preview widget with the param layout. + * @param layout the new layout */ - void setLayout(KoPageLayout &tqlayout); + void setLayout(KoPageLayout &layout); public slots: /** diff --git a/kexi/3rdparty/kolibs/KoPageLayoutHeaderBase.ui b/kexi/3rdparty/kolibs/KoPageLayoutHeaderBase.ui index 41246d84..7f36378e 100644 --- a/kexi/3rdparty/kolibs/KoPageLayoutHeaderBase.ui +++ b/kexi/3rdparty/kolibs/KoPageLayoutHeaderBase.ui @@ -45,7 +45,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -120,7 +120,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> diff --git a/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp b/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp index a1f65a90..26960701 100644 --- a/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp +++ b/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp @@ -33,9 +33,9 @@ #include <tqvgroupbox.h> #include <tqhbuttongroup.h> -KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& tqlayout, KoUnit::Unit unit,const KoColumns& columns, bool unitChooser, bool enableBorders) +KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout, KoUnit::Unit unit,const KoColumns& columns, bool unitChooser, bool enableBorders) : TQWidget(parent) { - m_layout = tqlayout; + m_layout = layout; m_unit = unit; TQGridLayout *grid1 = new TQGridLayout( this, 5, 2, 0, KDialog::spacingHint() ); @@ -129,7 +129,7 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& tqlayou marginsFrame->setMargin( KDialog::marginHint() ); grid1->addWidget( marginsFrame, 3, 0 ); - TQGridLayout *marginsLayout = new TQGridLayout( marginsFrame->tqlayout(), 3, 3, + TQGridLayout *marginsLayout = new TQGridLayout( marginsFrame->layout(), 3, 3, KDialog::spacingHint() ); // left margin diff --git a/kexi/3rdparty/kolibs/KoPageLayoutSize.h b/kexi/3rdparty/kolibs/KoPageLayoutSize.h index 06c08517..8e503551 100644 --- a/kexi/3rdparty/kolibs/KoPageLayoutSize.h +++ b/kexi/3rdparty/kolibs/KoPageLayoutSize.h @@ -42,13 +42,13 @@ public: /** * Contructor * @param parent the parent widget - * @param tqlayout the page tqlayout that this widget should be initialzed with. + * @param layout the page layout that this widget should be initialzed with. * @param unit the unit-type (mm/cm/inch) that the dialog should show * @param columns the KoColumns (amout of columns) that the preview should be initialized with * @param unitChooser if true a combobox with the unit-type is shown for the user to change * @param enableBorders if true enable the user to change the margins (aka borders) of the page */ - KoPageLayoutSize(TQWidget *parent, const KoPageLayout& tqlayout, KoUnit::Unit unit, + KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout, KoUnit::Unit unit, const KoColumns& columns, bool unitChooser, bool enableBorders); /** @@ -76,11 +76,11 @@ public slots: signals: /** * Emitted whenever the user changed something in the dialog. - * @param tqlayout the update tqlayout structure with currently displayed info. + * @param layout the update layout structure with currently displayed info. * Note that the info may not be fully correct and physically possible (in which * case queryClose will return false) */ - void propertyChange(KoPageLayout &tqlayout); + void propertyChange(KoPageLayout &layout); protected: TQComboBox *cpgUnit; diff --git a/kexi/3rdparty/kolibs/koPageLayout.cpp b/kexi/3rdparty/kolibs/koPageLayout.cpp index 682a26d6..316eba19 100644 --- a/kexi/3rdparty/kolibs/koPageLayout.cpp +++ b/kexi/3rdparty/kolibs/koPageLayout.cpp @@ -62,7 +62,7 @@ KoGenStyle KoPageLayout::saveOasis() const void KoPageLayout::loadOasis(const TQDomElement &style) { - TQDomElement properties( KoDom::namedItemNS( style, KoXmlNS::style, "page-tqlayout-properties" ) ); + TQDomElement properties( KoDom::namedItemNS( style, KoXmlNS::style, "page-layout-properties" ) ); if ( !properties.isNull() ) { ptWidth = KoUnit::parseValue(properties.attributeNS( KoXmlNS::fo, "page-width", TQString() ) ); @@ -86,16 +86,16 @@ void KoPageLayout::loadOasis(const TQDomElement &style) KoPageLayout KoPageLayout::standardLayout() { - KoPageLayout tqlayout; - tqlayout.format = KoPageFormat::defaultFormat(); - tqlayout.orientation = PG_PORTRAIT; - tqlayout.ptWidth = MM_TO_POINT( KoPageFormat::width( tqlayout.format, tqlayout.orientation ) ); - tqlayout.ptHeight = MM_TO_POINT( KoPageFormat::height( tqlayout.format, tqlayout.orientation ) ); - tqlayout.ptLeft = MM_TO_POINT( 20.0 ); - tqlayout.ptRight = MM_TO_POINT( 20.0 ); - tqlayout.ptTop = MM_TO_POINT( 20.0 ); - tqlayout.ptBottom = MM_TO_POINT( 20.0 ); - return tqlayout; + KoPageLayout layout; + layout.format = KoPageFormat::defaultFormat(); + layout.orientation = PG_PORTRAIT; + layout.ptWidth = MM_TO_POINT( KoPageFormat::width( layout.format, layout.orientation ) ); + layout.ptHeight = MM_TO_POINT( KoPageFormat::height( layout.format, layout.orientation ) ); + layout.ptLeft = MM_TO_POINT( 20.0 ); + layout.ptRight = MM_TO_POINT( 20.0 ); + layout.ptTop = MM_TO_POINT( 20.0 ); + layout.ptBottom = MM_TO_POINT( 20.0 ); + return layout; } struct PageFormatInfo @@ -151,12 +151,12 @@ int KoPageFormat::printerPageSize( KoFormat format ) { if ( format == PG_SCREEN ) { - kdWarning() << "You use the page tqlayout SCREEN. Printing in DIN A4 LANDSCAPE." << endl; + kdWarning() << "You use the page layout SCREEN. Printing in DIN A4 LANDSCAPE." << endl; return KPrinter::A4; } else if ( format == PG_CUSTOM ) { - kdWarning() << "The used page tqlayout (CUSTOM) is not supported by KPrinter. Printing in A4." << endl; + kdWarning() << "The used page layout (CUSTOM) is not supported by KPrinter. Printing in A4." << endl; return KPrinter::A4; } else if ( format <= PG_LAST_FORMAT ) diff --git a/kexi/3rdparty/kolibs/koPageLayout.h b/kexi/3rdparty/kolibs/koPageLayout.h index 724f9275..eb922846 100644 --- a/kexi/3rdparty/kolibs/koPageLayout.h +++ b/kexi/3rdparty/kolibs/koPageLayout.h @@ -156,7 +156,7 @@ enum KoHFType { }; /** - * This structure defines the page tqlayout, including + * This structure defines the page layout, including * its size in pt, its format (e.g. A4), orientation, unit, margins etc. */ struct KoPageLayout @@ -193,18 +193,18 @@ struct KoPageLayout #ifndef SIMPLE_KOLIBS /** - * Save this page tqlayout to OASIS. + * Save this page layout to OASIS. */ KOFFICECORE_EXPORT KoGenStyle saveOasis() const; /** - * Load this page tqlayout from OASIS + * Load this page layout from OASIS */ KOFFICECORE_EXPORT void loadOasis(const TQDomElement &style); #endif /** - * @return a page tqlayout with the default page size depending on the locale settings, + * @return a page layout with the default page size depending on the locale settings, * default margins (2 cm), and portrait orientation. * @since 1.4 */ diff --git a/kexi/3rdparty/kolibs/koPageLayoutDia.cc b/kexi/3rdparty/kolibs/koPageLayoutDia.cc index 5bc7f3b3..99d5e01d 100644 --- a/kexi/3rdparty/kolibs/koPageLayoutDia.cc +++ b/kexi/3rdparty/kolibs/koPageLayoutDia.cc @@ -49,10 +49,10 @@ /******************************************************************/ /*===================== constrcutor ==============================*/ -KoPagePreview::KoPagePreview( TQWidget* parent, const char *name, const KoPageLayout& tqlayout ) +KoPagePreview::KoPagePreview( TQWidget* parent, const char *name, const KoPageLayout& layout ) : TQGroupBox( i18n( "Page Preview" ), parent, name ) { - setPageLayout( tqlayout ); + setPageLayout( layout ); columns = 1; setMinimumSize( 150, 150 ); } @@ -62,15 +62,15 @@ KoPagePreview::~KoPagePreview() { } -/*=================== set tqlayout =================================*/ -void KoPagePreview::setPageLayout( const KoPageLayout &tqlayout ) +/*=================== set layout =================================*/ +void KoPagePreview::setPageLayout( const KoPageLayout &layout ) { // resolution[XY] is in pixel per pt double resolutionX = POINT_TO_INCH( static_cast<double>(KoGlobal::dpiX()) ); double resolutionY = POINT_TO_INCH( static_cast<double>(KoGlobal::dpiY()) ); - m_pageWidth = tqlayout.ptWidth * resolutionX; - m_pageHeight = tqlayout.ptHeight * resolutionY; + m_pageWidth = layout.ptWidth * resolutionX; + m_pageHeight = layout.ptHeight * resolutionY; double zh = 110.0 / m_pageHeight; double zw = 110.0 / m_pageWidth; @@ -79,15 +79,15 @@ void KoPagePreview::setPageLayout( const KoPageLayout &tqlayout ) m_pageWidth *= z; m_pageHeight *= z; - m_textFrameX = tqlayout.ptLeft * resolutionX * z; - m_textFrameY = tqlayout.ptTop * resolutionY * z; - m_textFrameWidth = m_pageWidth - ( tqlayout.ptLeft + tqlayout.ptRight ) * resolutionX * z; - m_textFrameHeight = m_pageHeight - ( tqlayout.ptTop + tqlayout.ptBottom ) * resolutionY * z; + m_textFrameX = layout.ptLeft * resolutionX * z; + m_textFrameY = layout.ptTop * resolutionY * z; + m_textFrameWidth = m_pageWidth - ( layout.ptLeft + layout.ptRight ) * resolutionX * z; + m_textFrameHeight = m_pageHeight - ( layout.ptTop + layout.ptBottom ) * resolutionY * z; repaint( true ); } -/*=================== set tqlayout =================================*/ +/*=================== set layout =================================*/ void KoPagePreview::setPageColumns( const KoColumns &_columns ) { columns = _columns.columns; @@ -129,7 +129,7 @@ void KoPagePreview::drawContents( TQPainter *painter ) /*==================== constructor ===============================*/ KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name, - const KoPageLayout& tqlayout, + const KoPageLayout& layout, const KoHeadFoot& hf, int tabs, KoUnit::Unit unit, bool modal ) : KDialogBase( KDialogBase::Tabbed, i18n("Page Layout"), KDialogBase::Ok | KDialogBase::Cancel, @@ -137,7 +137,7 @@ KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name, { flags = tabs; - m_layout = tqlayout; + m_layout = layout; m_unit = unit; m_pageSizeTab = 0; m_columnsTab = 0; @@ -154,7 +154,7 @@ KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name, /*==================== constructor ===============================*/ KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name, - const KoPageLayout& tqlayout, + const KoPageLayout& layout, const KoHeadFoot& hf, const KoColumns& columns, const KoKWHeaderFooter& kwhf, @@ -164,7 +164,7 @@ KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name, { flags = tabs; - m_layout = tqlayout; + m_layout = layout; m_column = columns; m_unit = unit; m_pageSizeTab = 0; @@ -186,14 +186,14 @@ KoPageLayoutDia::~KoPageLayoutDia() } /*======================= show dialog ============================*/ -bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, int tabs, KoUnit::Unit& unit, TQWidget* parent ) +bool KoPageLayoutDia::pageLayout( KoPageLayout& layout, KoHeadFoot& hf, int tabs, KoUnit::Unit& unit, TQWidget* parent ) { bool res = false; - KoPageLayoutDia *dlg = new KoPageLayoutDia( parent, "PageLayout", tqlayout, hf, tabs, unit ); + KoPageLayoutDia *dlg = new KoPageLayoutDia( parent, "PageLayout", layout, hf, tabs, unit ); if ( dlg->exec() == TQDialog::Accepted ) { res = true; - if ( tabs & FORMAT_AND_BORDERS ) tqlayout = dlg->tqlayout(); + if ( tabs & FORMAT_AND_BORDERS ) layout = dlg->layout(); if ( tabs & HEADER_AND_FOOTER ) hf = dlg->headFoot(); unit = dlg->unit(); } @@ -204,15 +204,15 @@ bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, int ta } /*======================= show dialog ============================*/ -bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, KoColumns& columns, +bool KoPageLayoutDia::pageLayout( KoPageLayout& layout, KoHeadFoot& hf, KoColumns& columns, KoKWHeaderFooter &_kwhf, int tabs, KoUnit::Unit& unit, TQWidget* parent ) { bool res = false; - KoPageLayoutDia *dlg = new KoPageLayoutDia( parent, "PageLayout", tqlayout, hf, columns, _kwhf, tabs, unit ); + KoPageLayoutDia *dlg = new KoPageLayoutDia( parent, "PageLayout", layout, hf, columns, _kwhf, tabs, unit ); if ( dlg->exec() == TQDialog::Accepted ) { res = true; - if ( tabs & FORMAT_AND_BORDERS ) tqlayout = dlg->tqlayout(); + if ( tabs & FORMAT_AND_BORDERS ) layout = dlg->layout(); if ( tabs & HEADER_AND_FOOTER ) hf = dlg->headFoot(); if ( tabs & COLUMNS ) columns = dlg->columns(); if ( tabs & KW_HEADER_AND_FOOTER ) _kwhf = dlg->headerFooter(); @@ -224,7 +224,7 @@ bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, KoColu return res; } -/*===================== get a standard page tqlayout ===============*/ +/*===================== get a standard page layout ===============*/ KoPageLayout KoPageLayoutDia::standardLayout() { return KoPageLayout::standardLayout(); @@ -261,17 +261,17 @@ void KoPageLayoutDia::setupTab1( bool enableBorders ) this, TQT_SLOT (sizeUpdated( KoPageLayout&))); } -void KoPageLayoutDia::sizeUpdated(KoPageLayout &tqlayout) { - m_layout.ptWidth = tqlayout.ptWidth; - m_layout.ptHeight = tqlayout.ptHeight; - m_layout.ptLeft = tqlayout.ptLeft; - m_layout.ptRight = tqlayout.ptRight; - m_layout.ptTop = tqlayout.ptTop; - m_layout.ptBottom = tqlayout.ptBottom; - m_layout.format = tqlayout.format; - m_layout.orientation = tqlayout.orientation; +void KoPageLayoutDia::sizeUpdated(KoPageLayout &layout) { + m_layout.ptWidth = layout.ptWidth; + m_layout.ptHeight = layout.ptHeight; + m_layout.ptLeft = layout.ptLeft; + m_layout.ptRight = layout.ptRight; + m_layout.ptTop = layout.ptTop; + m_layout.ptBottom = layout.ptBottom; + m_layout.format = layout.format; + m_layout.orientation = layout.orientation; if(m_columnsTab) - m_columnsTab->setLayout(tqlayout); + m_columnsTab->setLayout(layout); } /*================ setup header and footer tab ===================*/ @@ -282,9 +282,9 @@ void KoPageLayoutDia::setupTab2( const KoHeadFoot& hf ) // ------------- header --------------- TQGroupBox *gHead = new TQGroupBox( 0, Qt::Vertical, i18n( "Head Line" ), tab2 ); - gHead->tqlayout()->setSpacing(KDialog::spacingHint()); - gHead->tqlayout()->setMargin(KDialog::marginHint()); - TQGridLayout *headGrid = new TQGridLayout( gHead->tqlayout(), 2, 3 ); + gHead->layout()->setSpacing(KDialog::spacingHint()); + gHead->layout()->setMargin(KDialog::marginHint()); + TQGridLayout *headGrid = new TQGridLayout( gHead->layout(), 2, 3 ); TQLabel *lHeadLeft = new TQLabel( i18n( "Left:" ), gHead ); headGrid->addWidget( lHeadLeft, 0, 0 ); @@ -311,9 +311,9 @@ void KoPageLayoutDia::setupTab2( const KoHeadFoot& hf ) // ------------- footer --------------- TQGroupBox *gFoot = new TQGroupBox( 0, Qt::Vertical, i18n( "Foot Line" ), tab2 ); - gFoot->tqlayout()->setSpacing(KDialog::spacingHint()); - gFoot->tqlayout()->setMargin(KDialog::marginHint()); - TQGridLayout *footGrid = new TQGridLayout( gFoot->tqlayout(), 2, 3 ); + gFoot->layout()->setSpacing(KDialog::spacingHint()); + gFoot->layout()->setMargin(KDialog::marginHint()); + TQGridLayout *footGrid = new TQGridLayout( gFoot->layout(), 2, 3 ); TQLabel *lFootLeft = new TQLabel( i18n( "Left:" ), gFoot ); footGrid->addWidget( lFootLeft, 0, 0 ); @@ -362,7 +362,7 @@ void KoPageLayoutDia::setupTab3() TQWidget *tab3 = addPage(i18n( "Col&umns" )); TQHBoxLayout *lay = new TQHBoxLayout(tab3); m_columnsTab = new KoPageLayoutColumns(tab3, m_column, m_unit, m_layout); - m_columnsTab->tqlayout()->setMargin(0); + m_columnsTab->layout()->setMargin(0); lay->addWidget(m_columnsTab); m_columnsTab->show(); connect (m_columnsTab, TQT_SIGNAL( propertyChange(KoColumns&)), @@ -382,7 +382,7 @@ void KoPageLayoutDia::setupTab4(const KoKWHeaderFooter kwhf ) TQWidget *tab4 = addPage(i18n( "H&eader && Footer" )); TQHBoxLayout *lay = new TQHBoxLayout(tab4); m_headerTab = new KoPageLayoutHeader(tab4, m_unit, kwhf); - m_headerTab->tqlayout()->setMargin(0); + m_headerTab->layout()->setMargin(0); lay->addWidget(m_headerTab); m_headerTab->show(); diff --git a/kexi/3rdparty/kolibs/koPageLayoutDia.h b/kexi/3rdparty/kolibs/koPageLayoutDia.h index 21fe7df3..1ed23ec5 100644 --- a/kexi/3rdparty/kolibs/koPageLayoutDia.h +++ b/kexi/3rdparty/kolibs/koPageLayoutDia.h @@ -61,7 +61,7 @@ public: ~KoPagePreview(); /** - * set page tqlayout + * set page layout */ void setPageLayout( const KoPageLayout& ); void setPageColumns( const KoColumns& ); @@ -78,7 +78,7 @@ protected: class KoPageLayoutDiaPrivate; /** - * With this dialog the user can specify the tqlayout of the paper during printing. + * With this dialog the user can specify the layout of the paper during printing. */ class KOFFICEUI_EXPORT KoPageLayoutDia : public KDialogBase { @@ -92,14 +92,14 @@ public: * * @param parent The parent of the dialog. * @param name The name of the dialog. - * @param tqlayout The tqlayout. + * @param layout The layout. * @param headfoot The header and the footer. * @param flags a variable with all features this dialog should show. * @param unit The unit to use for displaying the values to the user. * @param modal Whether the dialog is modal or not. */ KoPageLayoutDia( TQWidget* parent, const char* name, - const KoPageLayout& tqlayout, + const KoPageLayout& layout, const KoHeadFoot& headfoot, int flags, KoUnit::Unit unit, bool modal=true ); @@ -108,7 +108,7 @@ public: * * @param parent The parent of the dialog. * @param name The name of the dialog. - * @param tqlayout The tqlayout. + * @param layout The layout. * @param headfoot The header and the footer. * @param columns The number of columns on the page. * @param kwheadfoot The KWord header and footer. @@ -116,7 +116,7 @@ public: * @param unit The unit to use for displaying the values to the user */ KoPageLayoutDia( TQWidget* parent, const char* name, - const KoPageLayout& tqlayout, + const KoPageLayout& layout, const KoHeadFoot& headfoot, const KoColumns& columns, const KoKWHeaderFooter& kwheadfoot, @@ -128,26 +128,26 @@ public: ~KoPageLayoutDia(); /** - * Show page tqlayout dialog. + * Show page layout dialog. * See constructor for documentation on the parameters */ static bool pageLayout( KoPageLayout&, KoHeadFoot&, int tabs, KoUnit::Unit& unit, TQWidget* parent = 0 ); /** - * Show page tqlayout dialog. + * Show page layout dialog. * See constructor for documentation on the parameters */ static bool pageLayout( KoPageLayout&, KoHeadFoot&, KoColumns&, KoKWHeaderFooter&, int tabs, KoUnit::Unit& unit, TQWidget* parent = 0 ); /** - * Retrieves a standard page tqlayout. + * Retrieves a standard page layout. * Deprecated: better use KoPageLayout::standardLayout() */ static KDE_DEPRECATED KoPageLayout standardLayout(); /** - * Returns the tqlayout + * Returns the layout */ - const KoPageLayout& tqlayout() const { return m_layout; } + const KoPageLayout& layout() const { return m_layout; } /** * Returns the header and footer information @@ -177,7 +177,7 @@ private: TQLineEdit *eFootMid; TQLineEdit *eFootRight; - // tqlayout + // layout KoPageLayout m_layout; KoColumns m_column; @@ -189,7 +189,7 @@ protected slots: virtual void slotOk(); private slots: - void sizeUpdated(KoPageLayout &tqlayout); + void sizeUpdated(KoPageLayout &layout); void columnsUpdated(KoColumns &columns); private: diff --git a/kexi/3rdparty/kolibs/koUnitWidgets.cc b/kexi/3rdparty/kolibs/koUnitWidgets.cc index 731c38bd..73a55822 100644 --- a/kexi/3rdparty/kolibs/koUnitWidgets.cc +++ b/kexi/3rdparty/kolibs/koUnitWidgets.cc @@ -378,48 +378,48 @@ double KoUnitDoubleComboBox::value( void ) const KoUnitDoubleSpinComboBox::KoUnitDoubleSpinComboBox( TQWidget *parent, const char *name ) : TQWidget( parent ), m_step( 1.0 ) { - TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3 ); - //tqlayout->setMargin( 2 ); + TQGridLayout *layout = new TQGridLayout( this, 2, 3 ); + //layout->setMargin( 2 ); TQPushButton *up = new TQPushButton( "+", this ); //up->setFlat( true ); up->setMaximumHeight( 15 ); up->setMaximumWidth( 15 ); - tqlayout->addWidget( up, 0, 0 ); + layout->addWidget( up, 0, 0 ); connect( up, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotUpClicked() ) ); TQPushButton *down = new TQPushButton( "-", this ); down->setMaximumHeight( 15 ); down->setMaximumWidth( 15 ); - tqlayout->addWidget( down, 1, 0 ); + layout->addWidget( down, 1, 0 ); connect( down, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotDownClicked() ) ); m_combo = new KoUnitDoubleComboBox( this, KoUnit::ptToUnit( 0.0, KoUnit::U_PT ), KoUnit::ptToUnit( 9999.99, KoUnit::U_PT ), 0.0, KoUnit::U_PT, 2, name ); connect( m_combo, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SIGNAL( valueChanged( double ) ) ); - tqlayout->addMultiCellWidget( m_combo, 0, 1, 2, 2 ); + layout->addMultiCellWidget( m_combo, 0, 1, 2, 2 ); } KoUnitDoubleSpinComboBox::KoUnitDoubleSpinComboBox( TQWidget *parent, double lower, double upper, double step, double value, KoUnit::Unit unit, unsigned int precision, const char *name ) : TQWidget( parent ), m_step( step )//, m_lowerInPoints( lower ), m_upperInPoints( upper ) { - TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3 ); - //tqlayout->setMargin( 2 ); + TQGridLayout *layout = new TQGridLayout( this, 2, 3 ); + //layout->setMargin( 2 ); TQPushButton *up = new TQPushButton( "+", this ); //up->setFlat( true ); up->setMaximumHeight( 15 ); up->setMaximumWidth( 15 ); - tqlayout->addWidget( up, 0, 0 ); + layout->addWidget( up, 0, 0 ); connect( up, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotUpClicked() ) ); TQPushButton *down = new TQPushButton( "-", this ); down->setMaximumHeight( 15 ); down->setMaximumWidth( 15 ); - tqlayout->addWidget( down, 1, 0 ); + layout->addWidget( down, 1, 0 ); connect( down, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotDownClicked() ) ); m_combo = new KoUnitDoubleComboBox( this, KoUnit::ptToUnit( lower, unit ), KoUnit::ptToUnit( upper, unit ), value, unit, precision, name ); connect( m_combo, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SIGNAL( valueChanged( double ) ) ); - tqlayout->addMultiCellWidget( m_combo, 0, 1, 2, 2 ); + layout->addMultiCellWidget( m_combo, 0, 1, 2, 2 ); } void diff --git a/kexi/doc/common/kde-default.css b/kexi/doc/common/kde-default.css index 59366d38..032a00db 100644 --- a/kexi/doc/common/kde-default.css +++ b/kexi/doc/common/kde-default.css @@ -90,7 +90,7 @@ DIV.INFORMALEXAMPLE { border-style: dotted; TABLE.programlisting TABLE.screen { border-style: none; background-color: rgb(224,224,224); - table-tqlayout: auto; /* 100%? */ + table-layout: auto; /* 100%? */ color: rgb(0,0,0); /* should be inherit */ } @@ -99,7 +99,7 @@ TABLE.screen { border-style: none; TABLE[class~=programlisting] TABLE[class~=screen] { border-style: none; background-color: rgb(224,224,224); - table-tqlayout: auto; + table-layout: auto; color: inherit; } */ diff --git a/kexi/doc/common/kde-web.css b/kexi/doc/common/kde-web.css index dfd98e8b..e61fa32a 100644 --- a/kexi/doc/common/kde-web.css +++ b/kexi/doc/common/kde-web.css @@ -85,7 +85,7 @@ DIV.INFORMALEXAMPLE { border-style: dotted; TABLE.programlisting TABLE.screen { border-style: none; background-color: rgb(224,224,224); - table-tqlayout: auto; /* 100%? */ + table-layout: auto; /* 100%? */ color: rgb(0,0,0); /* should be inherit */ } @@ -94,7 +94,7 @@ TABLE.screen { border-style: none; TABLE[class~=programlisting] TABLE[class~=screen] { border-style: none; background-color: rgb(224,224,224); - table-tqlayout: auto; + table-layout: auto; color: inherit; } */ diff --git a/kexi/doc/dev/kexi_guidelines.txt b/kexi/doc/dev/kexi_guidelines.txt index ab713e34..7c2dfaba 100644 --- a/kexi/doc/dev/kexi_guidelines.txt +++ b/kexi/doc/dev/kexi_guidelines.txt @@ -19,7 +19,7 @@ Focus on: convert to QString only on data displaying) Idea 3 -Directories tqlayout: +Directories layout: dialogs/ +-altertable/ +-datatable/ diff --git a/kexi/doc/handbook/html.tmp/01_02_00_db_spreadsheet.html b/kexi/doc/handbook/html.tmp/01_02_00_db_spreadsheet.html index b7b62ab9..e7959df7 100644 --- a/kexi/doc/handbook/html.tmp/01_02_00_db_spreadsheet.html +++ b/kexi/doc/handbook/html.tmp/01_02_00_db_spreadsheet.html @@ -168,7 +168,7 @@ In this case the very way the spreadsheet works is problematic. Fields for data <a name="reports"></a> <h4>Reports</h4> <p> -Databases enable grouping, limiting and summing up data in a form of a <em>report</em>. Spreadsheets are usually printed in a form of small tables without fully automatic control over page divisions and the tqlayout of fields. +Databases enable grouping, limiting and summing up data in a form of a <em>report</em>. Spreadsheets are usually printed in a form of small tables without fully automatic control over page divisions and the layout of fields. </p> <a name="programming"></a> diff --git a/kexi/doc/handbook/html.tmp/05_04_00_form_designing.html b/kexi/doc/handbook/html.tmp/05_04_00_form_designing.html index 0de7a77a..5df680c8 100644 --- a/kexi/doc/handbook/html.tmp/05_04_00_form_designing.html +++ b/kexi/doc/handbook/html.tmp/05_04_00_form_designing.html @@ -256,16 +256,16 @@ The following example presents a form where text fields and labels were placed b <br>An example form with widgets that cannot not fit in the window<br><br> </p> <p> -Using special tool called <em>widget layouts</em> can help to automatically lay out the form widgets. Widget tqlayout is an action of grouping two or more widgets so these are well positioned and have appropriate sizes. +Using special tool called <em>widget layouts</em> can help to automatically lay out the form widgets. Widget layout is an action of grouping two or more widgets so these are well positioned and have appropriate sizes. </p> <p> -Using tqlayout in this form improves alignment. Moreover, its space is better developed. Text fields are closer each other, spacing is constant. +Using layout in this form improves alignment. Moreover, its space is better developed. Text fields are closer each other, spacing is constant. <br> <br><img src="img/05_04_08_form_well_fit.png"> - <br>Example form with tqlayout used<br><br> + <br>Example form with layout used<br><br> </p> <p> -There are two methods to create widget tqlayout. +There are two methods to create widget layout. <ul> <li>Select two or more widgets that should be placed in a common tqlayout, and select one of the tqlayout types from the context menu item <a href="aa_00_00_menu.html#menu_format_layout">Layout Widgets</a>.</li> <li>Click a <a hrf="widget_containers">container widget</a> (or a form surface itself), where widgets are inserted and select one of the tqlayout types from the context menu item <a href="aa_00_00_menu.html#menu_format_layout">Layout Widgets</a>. All widgets existing within the container or within the form, being on the same level will be put into a single common tqlayout.</li> @@ -274,32 +274,32 @@ In each of these cases you can also use <em>Format -> Layout Widgets</em> men </p> <p> <img src="img/05_04_08_form_layout_selecting.png"> - <br>Selecting widgets that will be put into a tqlayout<br> + <br>Selecting widgets that will be put into a layout<br> <br><img src="img/05_04_08_form_layout_selected.png"> <br>Four widgets are selected<br><br> <br><img src="img/05_04_08_form_layout_popup.png"><br> - <br>Using the context menu for putting the widgets into a grid tqlayout<br><br> + <br>Using the context menu for putting the widgets into a grid layout<br><br> </p> <p> -Widget tqlayout is presented in the design view using a blue, green or red box drawn with broken line. This line is displayed only in the form's design view. +Widget layout is presented in the design view using a blue, green or red box drawn with broken line. This line is displayed only in the form's design view. </p> <p> <br> <br><img src="img/05_04_08_form_layout_grid.png"> - <br>Widgets within a grid tqlayout<br><br> + <br>Widgets within a grid layout<br><br> </p> <p> -Besides the grid type, there are other widget tqlayout types. +Besides the grid type, there are other widget layout types. <ul> <li>vertical <br> <br><img src="img/05_04_08_form_layout_vertical.png"> - <br>Vertical widget tqlayout<br><br> + <br>Vertical widget layout<br><br> </li> <li>horizontal <br> <br><img src="img/05_04_08_form_layout_horizontal.png"> - <br>Horizontal widget tqlayout<br><br> + <br>Horizontal widget layout<br><br> </li> <!-- TODO podzia³ poziomy / pionowy <br><img src="img/05_04_08_form_layout_vertical_splitter.png"> @@ -322,12 +322,12 @@ A <em>spring</em> in widget layouts is a special, invisible element allowing to </ol> </p> <p> -For the following example, the spring has been inserted on the left hand of the text label "Persons". The label is thus displayed on the right hand of the form. To make the spring work, it has been put into a common horizontal tqlayout with the label. +For the following example, the spring has been inserted on the left hand of the text label "Persons". The label is thus displayed on the right hand of the form. To make the spring work, it has been put into a common horizontal layout with the label. <br><img src="img/05_04_08_form_spring.png"> - <br>Horizontal tqlayout containing a spring and a text label<br><br> + <br>Horizontal layout containing a spring and a text label<br><br> </p> <p> -To make springs work you need to create a global widget tqlayout i.e. a tqlayout for the form itself. Then, springs can use edges of the form as a boundary for expanding. +To make springs work you need to create a global widget layout i.e. a layout for the form itself. Then, springs can use edges of the form as a boundary for expanding. </p> <a name="advanced_form_layouts"></a> @@ -337,21 +337,21 @@ Widget layouts can be combined (or nested). On the following example you can ide </p> <p> <ol> -<li>horizontal tqlayout with a spring, aligning the "Persons" text label to the right</li> -<li>grid tqlayout grouping widgets on the whole form</li> +<li>horizontal layout with a spring, aligning the "Persons" text label to the right</li> +<li>grid layout grouping widgets on the whole form</li> </ol> </p> <p> <img src="img/05_04_08_form_advanced_layout.png"> - <br>Two widget layouts combined: horizontal tqlayout inside of a grid tqlayout<br><br> + <br>Two widget layouts combined: horizontal layout inside of a grid layout<br><br> </p> <p> -The horizontal tqlayout is treat in the example as a single widget by the grid tqlayout - it takes exactly one "cell" of the grid. +The horizontal layout is treat in the example as a single widget by the grid layout - it takes exactly one "cell" of the grid. After opening a form designed this way in the data view, you can notice (by resizing the form) that: </p> <ul> <li>"Persons" text label thanks to the spring used is constantly aligned to the to the right side of the form</li> -<li>text fields take all of the available width thanks to putting them into the grid tqlayout</li> +<li>text fields take all of the available width thanks to putting them into the grid layout</li> <li>all the form's widgets are pushed to the top thanks to the spring used at the bottom of the form</li> </ul> <p> @@ -362,24 +362,24 @@ After opening a form designed this way in the data view, you can notice (by resi <a name="layout_breaking"></a> <H4>Removing widget layouts</H4> <p> -To remove widget tqlayout without removing widgets, perform one of these actions: +To remove widget layout without removing widgets, perform one of these actions: <ul> -<li>click with the &RMB; on the tqlayout's border and select <em>Break Layout</em> command from the context menu</li> -<li>click with the &LMB; on the tqlayout's border and select <em>Format -> Break Layout</em> menu command</li> +<li>click with the &RMB; on the layout's border and select <em>Break Layout</em> command from the context menu</li> +<li>click with the &LMB; on the layout's border and select <em>Format -> Break Layout</em> menu command</li> </ul> </p> <H4>Notes</H4> -<p>Removing widget tqlayout using the <em>Break Layout</em> command will not remove widgets contained in the tqlayout. If you want to remove the widgets as well, just select the tqlayout by clicking on its border and press <kbd>Delete</kbd> key or use <nobr><em>Edit -> <img src="icons/editdelete.png" class="icon"> Delete</em></nobr> menu command or context menu command. +<p>Removing widget layout using the <em>Break Layout</em> command will not remove widgets contained in the layout. If you want to remove the widgets as well, just select the layout by clicking on its border and press <kbd>Delete</kbd> key or use <nobr><em>Edit -> <img src="icons/editdelete.png" class="icon"> Delete</em></nobr> menu command or context menu command. </p> <a name="layout_size_types"></a> -<H4>Size policies for widgets within a tqlayout</H4> +<H4>Size policies for widgets within a layout</H4> <p> Instead of setting a fixed size for your widgets, in &kexi; you can choose between various widget's <em>size policies</em>. A size policy is a flexible strategy for controlling how a widget is stretched (or shrunk) depending on other neighbouring widgets and space available within the form. </p> <p> -After putting widgets into a <em>tqlayout</em>, typically each widget gets a proportional (<em>Preferred</em>) size policy. These widgets will be automatically resized with preferred settings, depending on their type and size of the entire tqlayout itself. For example, three buttons put into the horizontal tqlayout will be resized to fit their visible text. +After putting widgets into a <em>layout</em>, typically each widget gets a proportional (<em>Preferred</em>) size policy. These widgets will be automatically resized with preferred settings, depending on their type and size of the entire layout itself. For example, three buttons put into the horizontal layout will be resized to fit their visible text. </p> <p> For each widget inserted into the form, there are settings for size policy available in the <em>Property Editor</em>. The settings are presented as a group of properties called <em>Size Policy</em>. @@ -403,12 +403,12 @@ There are following values available on the drop down list for <em>Horizontal Si <li><b>Fixed</b> value means that the widget cannot be automatically resized; it should maintain the constant size defined on design time (width or height),</li> <li><p><b>Minimum</b> value means that the original size of the widget is set as minimal allowed, it is sufficient and there is no need for expanding the widget, but the widget will be expanded if needed. This type of policy can be used to force widget to be expanded to the whole width or height, especially if you set a <em>stretch</em> value greater than 0. <br><img src="img/05_04_09_size_policy_minimum.png"> - <br>Text field and two buttons within a grid tqlayout (<em>Minimum</em> horizontal size policy is set for both buttons, so these are slightly wider than needed)<br><br> + <br>Text field and two buttons within a grid layout (<em>Minimum</em> horizontal size policy is set for both buttons, so these are slightly wider than needed)<br><br> </p></li> <li><b>Maximum</b> value means that the original size of the widget is set as maximum allowed and can be decreased without breaking the widget's usability and readability if other widgets need more space,</li> <li><p><b>Preferred</b> value means that the original size of the widget is the best and preferred; the widget can be shrunk or expanded however and it will stay readable, <br><img src="img/05_04_09_size_policy_preferred.png"> - <br>Text field and two buttons within a grid tqlayout (<em>Preferred</em> horizontal size policy is set for both buttons)<br><br> + <br>Text field and two buttons within a grid layout (<em>Preferred</em> horizontal size policy is set for both buttons)<br><br> </p></li> <li><b>Expanding</b> value means that the original size of the widget is reasonable but the widget can be also shrunk; it can be expanded as well to take as much space as possible,</li> <li><b>Minimum Expanding</b> value means that the original size of the widget is allowed; it can be expanded to take as much space as possible,</li> @@ -432,7 +432,7 @@ The most frequently used size policies are <em>Preferred</em>, <em>Minimum</em> <a name="widget_adjusting"></a> <H3>5.4.10. Setting widgets size and position by hand</H3> <p> -In case when your form has no main tqlayout set for auto-positioning and auto-resizing its widgets, you will probably want to align widget's position and size so the form can look cleaner and be easier to use. The &kexi; form designer simplifies this task by offering the following groups of commands: +In case when your form has no main layout set for auto-positioning and auto-resizing its widgets, you will probably want to align widget's position and size so the form can look cleaner and be easier to use. The &kexi; form designer simplifies this task by offering the following groups of commands: </p> <ul> <li><p>Adjusting sizes of selected widgets. The commands are available in the <em>Format -> Adjust Widgets Size</em> submenu of the Menubar and in the <em>Adjust Widgets Size</em> submenu of the context menu. Toolbar's drop down button <nobr><img src="icons/aogrid.png" class="icon"> <em>Adjust Widgets Size</em></nobr> is also available. @@ -497,7 +497,7 @@ To change tab order, either: <li>Click a selected widget name on the widgets list and drag it to a desired position (up or down) using the mouse. </li> <li>Click a selected widget name on the widgets list and use <em>Move Up</em> or <em>Move Down</em> buttons, to move the widgets to a desired position.</li> -<li>Click the <em>Handle tab stops automatically</em> check box to set the automatic tab order for the form. If this option has been switched on, any changes made to the list of widgets by hand are not taken into account - &kexi; will be handling the tab orders on its own. The automatic ordering means that the top-left widget will be focused first (or the top-right if your operating system uses right-to-left tqlayout), and the order comes from the left to right (from the right to left, appropriately) and from the top to bottom. +<li>Click the <em>Handle tab stops automatically</em> check box to set the automatic tab order for the form. If this option has been switched on, any changes made to the list of widgets by hand are not taken into account - &kexi; will be handling the tab orders on its own. The automatic ordering means that the top-left widget will be focused first (or the top-right if your operating system uses right-to-left layout), and the order comes from the left to right (from the right to left, appropriately) and from the top to bottom. <br><img src="img/05_04_11_auto_tab_stop.png"> <br>Automatic tab order for a form<br><br> </li> diff --git a/kexi/doc/handbook/translation-status.txt b/kexi/doc/handbook/translation-status.txt index 65aa6008..acc00d00 100644 --- a/kexi/doc/handbook/translation-status.txt +++ b/kexi/doc/handbook/translation-status.txt @@ -72,7 +72,7 @@ DONE 5.4.9. Widget layouts DONE * Springs in widget layouts DONE * Advanced widget layouts DONE * Removing widget layouts -DONE * Size policies for widgets within a tqlayout +DONE * Size policies for widgets within a layout DONE 5.4.10. Setting widgets size and position by hand DONE 5.4.11. Setting the tab order DONE 5.5. Entering data using forms diff --git a/kexi/formeditor/commands.cpp b/kexi/formeditor/commands.cpp index a2cddd89..1d782a20 100644 --- a/kexi/formeditor/commands.cpp +++ b/kexi/formeditor/commands.cpp @@ -437,7 +437,7 @@ AdjustSizeCommand::execute() ObjectTreeItem *item = m_form->objectTree()->lookup(w->name()); if(item && !item->children()->isEmpty()) { // container TQSize s; - if(item->container() && item->container()->tqlayout()) + if(item->container() && item->container()->layout()) s = w->sizeHint(); else s = getSizeFromChildren(item); @@ -614,7 +614,7 @@ AdjustSizeCommand::debug() LayoutPropertyCommand::LayoutPropertyCommand(WidgetPropertySet *buf, const TQCString &wname, const TQVariant &oldValue, const TQVariant &value) - : PropertyCommand(buf, wname, oldValue, value, "tqlayout") + : PropertyCommand(buf, wname, oldValue, value, "layout") { m_form = FormManager::self()->activeForm(); ObjectTreeItem* titem = m_form->objectTree()->lookup(wname); @@ -655,7 +655,7 @@ LayoutPropertyCommand::unexecute() TQString LayoutPropertyCommand::name() const { - return i18n("Change tqlayout of widget \"%1\"").arg(TQString(m_oldvalues.begin().key())); + return i18n("Change layout of widget \"%1\"").arg(TQString(m_oldvalues.begin().key())); } void @@ -775,7 +775,7 @@ InsertWidgetCommand::execute() } w->move(m_insertRect.x(), m_insertRect.y()); w->resize(m_insertRect.width()-1, m_insertRect.height()-1); // -1 is not to hide dots - w->setStyle(&(m_container->widget()->tqstyle())); + w->setStyle(&(m_container->widget()->style())); w->setBackgroundOrigin(TQWidget::ParentOrigin); w->show(); @@ -802,7 +802,7 @@ InsertWidgetCommand::execute() for(TQValueList<TQCString>::ConstIterator it = list.constBegin(); it != endIt; ++it) item->addModifiedProperty(*it, w->property(*it)); - m_container->reloadLayout(); // reload the tqlayout to take the new wigdet into account + m_container->reloadLayout(); // reload the layout to take the new wigdet into account m_container->setSelectedWidget(w, false); if (m_container->form()->library()->internalProperty(w->className(), @@ -864,7 +864,7 @@ CreateLayoutCommand::CreateLayoutCommand(int layoutType, WidgetList &list, Form } for(TQWidget *w = list.first(); w; w = list.next()) m_list->append(w); - m_list->sort(); // we sort them now, before creating the tqlayout + m_list->sort(); // we sort them now, before creating the layout for(TQWidget *w = m_list->first(); w; w = m_list->next()) m_pos.insert(w->name(), w->geometry()); @@ -911,7 +911,7 @@ CreateLayoutCommand::execute() return; container->setSelectedWidget(0, false); - w->move(m_pos.begin().data().topLeft()); // we move the tqlayout at the position of the topleft widget + w->move(m_pos.begin().data().topLeft()); // we move the layout at the position of the topleft widget // sizeHint of these widgets depends on geometry, so give them appropriate geometry if(m_type == Container::HFlow) w->resize( TQSize(700, 20) ); @@ -938,7 +938,7 @@ CreateLayoutCommand::execute() ((TQSplitter*)w)->setOrientation(Qt::Vertical); else if(tree->container()) { tree->container()->setLayout((Container::LayoutType)m_type); - w->resize(tree->container()->tqlayout()->sizeHint()); // the tqlayout doesn't have its own size + w->resize(tree->container()->layout()->sizeHint()); // the layout doesn't have its own size } container->setSelectedWidget(w, false); @@ -952,7 +952,7 @@ CreateLayoutCommand::unexecute() if(!parent) parent = m_form->objectTree(); - // We reparent every widget to the Container and take them out of the tqlayout + // We reparent every widget to the Container and take them out of the layout TQMap<TQCString,TQRect>::ConstIterator endIt = m_pos.constEnd(); for(TQMap<TQCString,TQRect>::ConstIterator it = m_pos.constBegin(); it != endIt; ++it) { @@ -973,7 +973,7 @@ CreateLayoutCommand::unexecute() if (!titem) return; //better this than a crash TQWidget *w = titem->widget(); - parent->container()->deleteWidget(w); // delete the tqlayout widget + parent->container()->deleteWidget(w); // delete the layout widget FormManager::self()->windowChanged(m_form->widget()); // to reload ObjectTreeView } diff --git a/kexi/formeditor/commands.h b/kexi/formeditor/commands.h index ad468261..41da4b60 100644 --- a/kexi/formeditor/commands.h +++ b/kexi/formeditor/commands.h @@ -150,7 +150,7 @@ class KFORMEDITOR_EXPORT AdjustSizeCommand : public Command TQMap<TQCString, TQSize> m_sizes; }; -/*! This command is used when switching the tqlayout of a Container. It remembers the old pos +/*! This command is used when switching the layout of a Container. It remembers the old pos of every widget inside the Container. */ class KFORMEDITOR_EXPORT LayoutPropertyCommand : public PropertyCommand { @@ -203,7 +203,7 @@ class KFORMEDITOR_EXPORT InsertWidgetCommand : public Command TQRect m_insertRect; }; -/*! This command is used when creating a tqlayout from some widgets using "Lay out in..." menu item. +/*! This command is used when creating a layout from some widgets using "Lay out in..." menu item. It remembers the old pos of every widget, and takes care of updating ObjectTree too. You need to supply a WidgetList of the selected widgets. */ class KFORMEDITOR_EXPORT CreateLayoutCommand : public Command diff --git a/kexi/formeditor/connectiondialog.cpp b/kexi/formeditor/connectiondialog.cpp index e1dcf1be..5bbbde38 100644 --- a/kexi/formeditor/connectiondialog.cpp +++ b/kexi/formeditor/connectiondialog.cpp @@ -51,7 +51,7 @@ ConnectionDialog::ConnectionDialog(TQWidget *parent) , m_buffer(0) { TQFrame *frame = makeMainWidget(); - TQHBoxLayout *tqlayout = new TQHBoxLayout(frame, 0, 6); + TQHBoxLayout *layout = new TQHBoxLayout(frame, 0, 6); // Setup the details widget ///////// TQHBox *details = new TQHBox(frame); @@ -74,21 +74,21 @@ ConnectionDialog::ConnectionDialog(TQWidget *parent) initTable(); m_table->setData(m_data, false); m_table->adjustColumnWidthToContents(0); - tqlayout->addWidget(m_table); + layout->addWidget(m_table); //// Setup the icon toolbar ///////////////// - TQVBoxLayout *vtqlayout = new TQVBoxLayout(tqlayout, 3); + TQVBoxLayout *vlayout = new TQVBoxLayout(layout, 3); KPushButton *newItem = new KPushButton(SmallIconSet("filenew"), i18n("&New Connection"), frame); - vtqlayout->addWidget(newItem); + vlayout->addWidget(newItem); m_buttons.insert(BAdd, newItem); connect(newItem, TQT_SIGNAL(clicked()), this, TQT_SLOT(newItem())); KPushButton *delItem = new KPushButton(SmallIconSet("editdelete"), i18n("&Remove Connection"), frame); - vtqlayout->addWidget(delItem); + vlayout->addWidget(delItem); m_buttons.insert(BRemove, delItem); connect(delItem, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeItem())); - vtqlayout->addStretch(); + vlayout->addStretch(); setInitialSize(TQSize(600, 300)); //setWFlags(WDestructiveClose); diff --git a/kexi/formeditor/container.cpp b/kexi/formeditor/container.cpp index 706ef69b..246940c7 100644 --- a/kexi/formeditor/container.cpp +++ b/kexi/formeditor/container.cpp @@ -333,7 +333,7 @@ Container::eventFilter(TQObject *s, TQEvent *e) return false; } - case TQEvent::Resize: // we are resizing a widget, so we set m_move to true -> the tqlayout will be reloaded when releasing mouse + case TQEvent::Resize: // we are resizing a widget, so we set m_move to true -> the layout will be reloaded when releasing mouse { if(m_form->interactiveMode()) m_state = MovingWidget; @@ -525,7 +525,7 @@ Container::handleMouseReleaseEvent(TQObject *s, TQMouseEvent *mev) //m_initialPos = TQPoint(); } - else if(m_state == MovingWidget) // one widget has been moved, so we need to update the tqlayout + else if(m_state == MovingWidget) // one widget has been moved, so we need to update the layout reloadLayout(); // cancel copying as user released Ctrl before releasing mouse button @@ -639,7 +639,7 @@ Container::setLayout(LayoutType type) return; } } - m_container->setGeometry(m_container->geometry()); // just update tqlayout + m_container->setGeometry(m_container->geometry()); // just update layout m_layout->activate(); } @@ -654,14 +654,14 @@ Container::reloadLayout() void Container::createBoxLayout(WidgetList *list) { - TQBoxLayout *tqlayout = static_cast<TQBoxLayout*>(m_layout); + TQBoxLayout *layout = static_cast<TQBoxLayout*>(m_layout); for(ObjectTreeItem *tree = m_tree->children()->first(); tree; tree = m_tree->children()->next()) list->append( tree->widget()); list->sort(); for(TQWidget *obj = list->first(); obj; obj = list->next()) - tqlayout->addWidget(obj); + layout->addWidget(obj); delete list; } @@ -776,7 +776,7 @@ Container::createGridLayout(bool testOnly) } } - // Then we count the number of rows in the tqlayout, and set their beginnings + // Then we count the number of rows in the layout, and set their beginnings for(WidgetListIterator it(*vlist); it.current() != 0; ++it) { TQWidget *w = it.current(); @@ -830,11 +830,11 @@ Container::createGridLayout(bool testOnly) } kdDebug() << "the new grid will have n columns: n == " << cols.size() << endl; - // We create the tqlayout .. - TQGridLayout *tqlayout=0; + // We create the layout .. + TQGridLayout *layout=0; if(!testOnly) { - tqlayout = new TQGridLayout(m_container, rows.size(), cols.size(), m_margin, m_spacing, "grid"); - m_layout = (TQLayout*)tqlayout; + layout = new TQGridLayout(m_container, rows.size(), cols.size(), m_margin, m_spacing, "grid"); + m_layout = (TQLayout*)layout; } // .. and we fill it with widgets @@ -901,14 +901,14 @@ Container::createGridLayout(bool testOnly) ObjectTreeItem *item = m_form->objectTree()->lookup(w->name()); if(!endrow && !endcol) { if(!testOnly) - tqlayout->addWidget(w, wrow, wcol); + layout->addWidget(w, wrow, wcol); item->setGridPos(wrow, wcol, 0, 0); } else { if(!endcol) endcol = wcol; if(!endrow) endrow = wrow; if(!testOnly) - tqlayout->addMultiCellWidget(w, wrow, endrow, wcol, endcol); + layout->addMultiCellWidget(w, wrow, endrow, wcol, endcol); item->setGridPos(wrow, wcol, endrow-wrow+1, endcol-wcol+1); } } diff --git a/kexi/formeditor/container.h b/kexi/formeditor/container.h index 36f35e82..bd46c7a1 100644 --- a/kexi/formeditor/container.h +++ b/kexi/formeditor/container.h @@ -104,9 +104,9 @@ class KFORMEDITOR_EXPORT Container : public TQObject void setObjectTree(ObjectTreeItem *t) { m_tree = t; } //! \return a pointer to the TQLayout of this Container, or 0 if there is not. - TQLayout* tqlayout() const { return m_layout; } + TQLayout* layout() const { return m_layout; } - //! \return the type of the tqlayout associated to this Container's widget (see LayoutType enum). + //! \return the type of the layout associated to this Container's widget (see LayoutType enum). LayoutType layoutType() const { return m_layType; } //! \return the margin of this Container. @@ -115,8 +115,8 @@ class KFORMEDITOR_EXPORT Container : public TQObject //! \return the spacing of this Container. int layoutSpacing() { return m_spacing; } - /*! Sets this Container to use \a type of tqlayout. The widget are inserted - automatically in the tqlayout following their positions. + /*! Sets this Container to use \a type of layout. The widget are inserted + automatically in the layout following their positions. \sa createBoxLayout(), createGridLayout() */ void setLayout(LayoutType type); @@ -129,7 +129,7 @@ class KFORMEDITOR_EXPORT Container : public TQObject //! \return the string representing the layoutType \a type. static TQString layoutTypeToString(int type); - //! \return the LayoutType (an int) for a given tqlayout name. + //! \return the LayoutType (an int) for a given layout name. static LayoutType stringToLayoutType(const TQString &name); /*! Stops the inline editing of the current widget (as when you click @@ -161,8 +161,8 @@ class KFORMEDITOR_EXPORT Container : public TQObject to Container's widget. */ void deleteWidget(TQWidget *w); - /*! Recreates the Container tqlayout. Calls this when a widget has been moved - or added to update the tqlayout. */ + /*! Recreates the Container layout. Calls this when a widget has been moved + or added to update the layout. */ void reloadLayout(); protected slots: @@ -178,7 +178,7 @@ class KFORMEDITOR_EXPORT Container : public TQObject /*! Internal function to create a KexiFlowLayout. */ void createFlowLayout(); - /*! Internal function to create a GridLayout. if \a testOnly is true, the tqlayout + /*! Internal function to create a GridLayout. if \a testOnly is true, the layout is simulated, and only the widget's grid info aris filled. */ void createGridLayout(bool testOnly=false); diff --git a/kexi/formeditor/editlistviewdialog.cpp b/kexi/formeditor/editlistviewdialog.cpp index d073b43d..281e5604 100644 --- a/kexi/formeditor/editlistviewdialog.cpp +++ b/kexi/formeditor/editlistviewdialog.cpp @@ -46,45 +46,45 @@ EditListViewDialog::EditListViewDialog(TQWidget *parent) m_contents = addPage(i18n("Contents")); ///////// Setup the "Contents" page ///////////////////////////// - TQHBoxLayout *tqlayout = new TQHBoxLayout(m_contents, 0, 6); + TQHBoxLayout *layout = new TQHBoxLayout(m_contents, 0, 6); //// Setup the icon toolbar ///////////////// - TQVBoxLayout *vtqlayout = new TQVBoxLayout(tqlayout, 3); + TQVBoxLayout *vlayout = new TQVBoxLayout(layout, 3); TQToolButton *newRow = new TQToolButton(m_contents); newRow->setIconSet(BarIconSet("edit_add")); newRow->setTextLabel(i18n("&Add Item"), true); - vtqlayout->addWidget(newRow); + vlayout->addWidget(newRow); m_buttons.insert(BNewRow, newRow); connect(newRow, TQT_SIGNAL(clicked()), this, TQT_SLOT(newRow())); TQToolButton *newChild = new TQToolButton(m_contents); newChild->setIconSet(BarIconSet("1rightarrow")); newChild->setTextLabel(i18n("New &Subitem"), true); - vtqlayout->addWidget(newChild); + vlayout->addWidget(newChild); m_buttons.insert(BNewChild, newChild); connect(newChild, TQT_SIGNAL(clicked()), this, TQT_SLOT(newChildRow())); TQToolButton *delRow = new TQToolButton(m_contents); delRow->setIconSet(BarIconSet("edit_remove")); delRow->setTextLabel(i18n("&Remove Item"), true); - vtqlayout->addWidget(delRow); + vlayout->addWidget(delRow); m_buttons.insert(BRemRow, delRow); connect(delRow, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeRow())); TQToolButton *rowUp = new TQToolButton(m_contents); rowUp->setIconSet(BarIconSet("1uparrow")); rowUp->setTextLabel(i18n("Move Item &Up"), true); - vtqlayout->addWidget(rowUp); + vlayout->addWidget(rowUp); m_buttons.insert(BRowUp, rowUp); connect(rowUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(MoveRowUp())); TQToolButton *rowDown = new TQToolButton(m_contents); rowDown->setIconSet(BarIconSet("1downarrow")); rowDown->setTextLabel(i18n("Move Item &Down"), true); - vtqlayout->addWidget(rowDown); + vlayout->addWidget(rowDown); m_buttons.insert(BRowDown, rowDown); connect(rowDown, TQT_SIGNAL(clicked()), this, TQT_SLOT(MoveRowDown())); - vtqlayout->addStretch(); + vlayout->addStretch(); //// The listview /////////// m_listview = new KListView(m_contents, "editlistview_listview"); @@ -96,7 +96,7 @@ EditListViewDialog::EditListViewDialog(TQWidget *parent) m_listview->setDropVisualizer(true); m_listview->setAcceptDrops(true); m_listview->setSorting(-1); - tqlayout->addWidget(m_listview); + layout->addWidget(m_listview); m_listview->setFocus(); connect(m_listview, TQT_SIGNAL(currentChanged(TQListViewItem*)), this, TQT_SLOT(updateButtons(TQListViewItem*))); connect(m_listview, TQT_SIGNAL(moved(TQListViewItem*, TQListViewItem*, TQListViewItem*)), this, TQT_SLOT(updateButtons(TQListViewItem*))); diff --git a/kexi/formeditor/factories/containerfactory.cpp b/kexi/formeditor/factories/containerfactory.cpp index e41e5613..e87c300e 100644 --- a/kexi/formeditor/factories/containerfactory.cpp +++ b/kexi/formeditor/factories/containerfactory.cpp @@ -150,7 +150,7 @@ void KFDTabWidget::dropEvent( TQDropEvent *e ) emit handleDropEvent(e); } -/// Various tqlayout widgets /////////////////: +/// Various layout widgets /////////////////: HBox::HBox(TQWidget *parent, const char *name) : TQFrame(parent, name), m_preview(false) @@ -220,8 +220,8 @@ VFlow::paintEvent(TQPaintEvent *) TQSize VFlow::sizeHint() const { - if(tqlayout()) - return tqlayout()->sizeHint(); + if(layout()) + return layout()->sizeHint(); else return TQSize(700, 50); // default } diff --git a/kexi/formeditor/factories/stdwidgetfactory.cpp b/kexi/formeditor/factories/stdwidgetfactory.cpp index 2607fcca..e6b13f0e 100644 --- a/kexi/formeditor/factories/stdwidgetfactory.cpp +++ b/kexi/formeditor/factories/stdwidgetfactory.cpp @@ -511,7 +511,7 @@ StdWidgetFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDes else if(classname == "KPushButton") { KPushButton *push = static_cast<KPushButton*>(w); - TQRect r = w->tqstyle().subRect(TQStyle::SR_PushButtonContents, w); + TQRect r = w->style().subRect(TQStyle::SR_PushButtonContents, w); TQRect editorRect = TQRect(push->x() + r.x(), push->y() + r.y(), r.width(), r.height()); //r.setX(r.x() + 5); //r.setY(r.y() + 5); @@ -523,7 +523,7 @@ StdWidgetFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDes else if(classname == TQRADIOBUTTON_OBJECT_NAME_STRING) { TQRadioButton *radio = static_cast<TQRadioButton*>(w); - TQRect r = w->tqstyle().subRect(TQStyle::SR_RadioButtonContents, w); + TQRect r = w->style().subRect(TQStyle::SR_RadioButtonContents, w); TQRect editorRect = TQRect(radio->x() + r.x(), radio->y() + r.y(), r.width(), r.height()); createEditor(classname, radio->text(), radio, container, editorRect, TQt::AlignAuto); return true; @@ -533,7 +533,7 @@ StdWidgetFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDes TQCheckBox *check = static_cast<TQCheckBox*>(w); //TQRect r(check->geometry()); //r.setX(r.x() + 20); - TQRect r = w->tqstyle().subRect(TQStyle::SR_CheckBoxContents, w); + TQRect r = w->style().subRect(TQStyle::SR_CheckBoxContents, w); TQRect editorRect = TQRect(check->x() + r.x(), check->y() + r.y(), r.width(), r.height()); createEditor(classname, check->text(), check, container, editorRect, TQt::AlignAuto); return true; @@ -645,19 +645,19 @@ StdWidgetFactory::resizeEditor(TQWidget *editor, TQWidget *widget, const TQCStri if(classname == TQRADIOBUTTON_OBJECT_NAME_STRING) { - r = widget->tqstyle().subRect(TQStyle::SR_RadioButtonContents, widget); + r = widget->style().subRect(TQStyle::SR_RadioButtonContents, widget); p += r.topLeft(); s.setWidth(r.width()); } else if(classname == TQCHECKBOX_OBJECT_NAME_STRING) { - r = widget->tqstyle().subRect(TQStyle::SR_CheckBoxContents, widget); + r = widget->style().subRect(TQStyle::SR_CheckBoxContents, widget); p += r.topLeft(); s.setWidth(r.width()); } else if(classname == "KPushButton") { - r = widget->tqstyle().subRect(TQStyle::SR_PushButtonContents, widget); + r = widget->style().subRect(TQStyle::SR_PushButtonContents, widget); p += r.topLeft(); s = r.size(); } diff --git a/kexi/formeditor/form.cpp b/kexi/formeditor/form.cpp index 6ed3e570..52d44966 100644 --- a/kexi/formeditor/form.cpp +++ b/kexi/formeditor/form.cpp @@ -528,7 +528,7 @@ Form::autoAssignTabStops() d->tabstops.clear(); /// We automatically sort widget from the top-left to bottom-right corner - //! \todo Handle RTL tqlayout (ie from top-right to bottom-left) + //! \todo Handle RTL layout (ie from top-right to bottom-left) foreach_list(WidgetListIterator, it, list) { TQWidget *w = it.current(); hlist.append(w); diff --git a/kexi/formeditor/form.h b/kexi/formeditor/form.h index 9bb68925..a8bd6dc0 100644 --- a/kexi/formeditor/form.h +++ b/kexi/formeditor/form.h @@ -231,10 +231,10 @@ class KFORMEDITOR_EXPORT Form : public TQObject //! @todo make gridSize configurable at global level int gridSize() { return 10; } - //! \return the default margin for all the tqlayout inside this Form. + //! \return the default margin for all the layout inside this Form. int defaultMargin() { return 11;} - //! \return the default spacing for all the tqlayout inside this Form. + //! \return the default spacing for all the layout inside this Form. int defaultSpacing() { return 6;} /*! This function is used by ObjectTree to emit childAdded() signal (as it is not a TQObject). */ @@ -285,7 +285,7 @@ class KFORMEDITOR_EXPORT Form : public TQObject (which are by default in order of creation).*/ void setAutoTabStops(bool autoTab) { d->autoTabstops = autoTab;} - /*! Tells the Form to reassign the tab stops because the widget tqlayout has changed + /*! Tells the Form to reassign the tab stops because the widget layout has changed (called for example before saving or displaying the tab order dialog). Automatically sorts widget from the top-left to bottom-right corner. Widget can be grouped with containers. In paticular, for tab widgets, diff --git a/kexi/formeditor/formIO.cpp b/kexi/formeditor/formIO.cpp index 9161049d..bf3b9d08 100644 --- a/kexi/formeditor/formIO.cpp +++ b/kexi/formeditor/formIO.cpp @@ -66,7 +66,7 @@ void CustomWidget::paintEvent(TQPaintEvent *) { TQPainter p(this); - p.setPen(tqpalette().active().text()); + p.setPen(palette().active().text()); TQRect r(rect()); r.setX(r.x()+2); p.drawText(r, TQt::AlignTop, m_className); @@ -971,7 +971,7 @@ FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &parent, TQDomDocument &do // if (-1 != item->widget()->metaObject()->findProperty("dataSource")) // savePropertyValue(tclass, domDoc, "dataSource", item->widget()->property("dataSource"), item->widget()); - // We don't want to save the geometry if the widget is inside a tqlayout (so parent.tagName() == "grid" for example) + // We don't want to save the geometry if the widget is inside a layout (so parent.tagName() == "grid" for example) if(item && !item->parent()) { // save form widget size, but not its position savePropertyValue(tclass, domDoc, "geometry", @@ -999,7 +999,7 @@ FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &parent, TQDomDocument &do savedAlignment = true; } } - else if(name == "name" || name == "geometry" || name == "tqlayout") { + else if(name == "name" || name == "geometry" || name == "layout") { // these have already been saved } else { @@ -1017,42 +1017,42 @@ FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &parent, TQDomDocument &do } } - // Saving container 's tqlayout if there is one - TQDomElement tqlayout; + // Saving container 's layout if there is one + TQDomElement layout; if(item->container() && item->container()->layoutType() != Container::NoLayout) { - if(item->container()->tqlayout()) // there is a tqlayout + if(item->container()->layout()) // there is a layout { - tqlayout = domDoc.createElement("temp"); - savePropertyValue(tqlayout, domDoc, "name", "unnamed", item->widget()); + layout = domDoc.createElement("temp"); + savePropertyValue(layout, domDoc, "name", "unnamed", item->widget()); if(item->modifiedProperties()->contains("layoutMargin")) - savePropertyElement(tqlayout, domDoc, "property", "margin", item->container()->layoutMargin()); + savePropertyElement(layout, domDoc, "property", "margin", item->container()->layoutMargin()); if(item->modifiedProperties()->contains("layoutSpacing")) - savePropertyElement(tqlayout, domDoc, "property", "spacing", item->container()->layoutSpacing()); - tclass.appendChild(tqlayout); + savePropertyElement(layout, domDoc, "property", "spacing", item->container()->layoutSpacing()); + tclass.appendChild(layout); } } int layoutType = item->container() ? item->container()->layoutType() : Container::NoLayout; switch(layoutType) { - case Container::Grid: // grid tqlayout + case Container::Grid: // grid layout { - tqlayout.setTagName("grid"); + layout.setTagName("grid"); for(ObjectTreeItem *objIt = item->children()->first(); objIt; objIt = item->children()->next()) - saveWidget(objIt, tqlayout, domDoc, true); + saveWidget(objIt, layout, domDoc, true); break; } case Container::HBox: case Container::VBox: { // as we don't save geometry, we need to sort widgets in the right order, not creation order WidgetList *list; - if(tqlayout.tagName() == "hbox") { + if(layout.tagName() == "hbox") { list = new HorWidgetList(item->container()->form()->toplevelContainer()->widget()); - tqlayout.setTagName("hbox"); + layout.setTagName("hbox"); } else { list = new VerWidgetList(item->container()->form()->toplevelContainer()->widget()); - tqlayout.setTagName("vbox"); + layout.setTagName("vbox"); } for(ObjectTreeItem *objTree = item->children()->first(); objTree; objTree = item->children()->next()) @@ -1062,28 +1062,28 @@ FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &parent, TQDomDocument &do for(TQWidget *obj = list->first(); obj; obj = list->next()) { ObjectTreeItem *titem = item->container()->form()->objectTree()->lookup(obj->name()); if(item) - saveWidget(titem, tqlayout, domDoc); + saveWidget(titem, layout, domDoc); } delete list; break; } case Container::HFlow: case Container::VFlow: { - tqlayout.setTagName("grid"); - KexiFlowLayout *flow = static_cast<KexiFlowLayout*>(item->container()->tqlayout()); + layout.setTagName("grid"); + KexiFlowLayout *flow = static_cast<KexiFlowLayout*>(item->container()->layout()); if(!flow) break; WidgetList *list = (WidgetList*)flow->widgetList(); // save some special properties - savePropertyElement(tqlayout, domDoc, "property", "customLayout", Container::layoutTypeToString(item->container()->layoutType()) ); - savePropertyElement(tqlayout, domDoc, "property", "justify", TQVariant(static_cast<KexiFlowLayout*>(item->container()->tqlayout())->isJustified(), 3) ); + savePropertyElement(layout, domDoc, "property", "customLayout", Container::layoutTypeToString(item->container()->layoutType()) ); + savePropertyElement(layout, domDoc, "property", "justify", TQVariant(static_cast<KexiFlowLayout*>(item->container()->layout())->isJustified(), 3) ); - // fill the widget's grid info, ie just simulate grid tqlayout + // fill the widget's grid info, ie just simulate grid layout item->container()->createGridLayout(true); for(TQWidget *obj = list->first(); obj; obj = list->next()) { ObjectTreeItem *titem = item->container()->form()->objectTree()->lookup(obj->name()); if(item) - saveWidget(titem, tqlayout, domDoc, true); // save grid info for compatibility with TQtDesigner + saveWidget(titem, layout, domDoc, true); // save grid info for compatibility with TQtDesigner } delete list; break; @@ -1153,7 +1153,7 @@ FormIO::loadWidget(Container *container, const TQDomElement &el, TQWidget *paren else if(tagName == "vbox") classname = "VBox"; else if(tagName == "grid") { - // first, see if it is flow tqlayout + // first, see if it is flow layout for(TQDomNode child = n.firstChild(); !child.isNull(); child = child.nextSibling()) { if((child.toElement().tagName() == "property") && (child.toElement().attribute("name") == "customLayout")) @@ -1204,7 +1204,7 @@ FormIO::loadWidget(Container *container, const TQDomElement &el, TQWidget *paren KAcceleratorManager::setNoAccel(w); } #endif - w->setStyle(&(container->widget()->tqstyle())); + w->setStyle(&(container->widget()->style())); w->show(); // We create and insert the ObjectTreeItem at the good place in the ObjectTree @@ -1232,27 +1232,27 @@ FormIO::loadWidget(Container *container, const TQDomElement &el, TQWidget *paren m_currentItem = item; // if we are inside a Grid, we need to insert the widget in the good cell if(container->layoutType() == Container::Grid) { - TQGridLayout *tqlayout = (TQGridLayout*)container->tqlayout(); + TQGridLayout *layout = (TQGridLayout*)container->layout(); if(el.hasAttribute("rowspan")) { // widget spans multiple cells - if(tqlayout) - tqlayout->addMultiCellWidget(w, el.attribute("row").toInt(), el.attribute("row").toInt() + el.attribute("rowspan").toInt()-1, + if(layout) + layout->addMultiCellWidget(w, el.attribute("row").toInt(), el.attribute("row").toInt() + el.attribute("rowspan").toInt()-1, el.attribute("column").toInt(), el.attribute("column").toInt() + el.attribute("colspan").toInt()-1); item->setGridPos(el.attribute("row").toInt(), el.attribute("column").toInt(), el.attribute("rowspan").toInt(), el.attribute("colspan").toInt()); } else { - if(tqlayout) - tqlayout->addWidget(w, el.attribute("row").toInt(), el.attribute("column").toInt()); + if(layout) + layout->addWidget(w, el.attribute("row").toInt(), el.attribute("column").toInt()); item->setGridPos(el.attribute("row").toInt(), el.attribute("column").toInt(), 0, 0); } } - else if(container->tqlayout()) - container->tqlayout()->add(w); + else if(container->layout()) + container->layout()->add(w); readChildNodes(item, container, el, w); - if(item->container() && item->container()->tqlayout()) - item->container()->tqlayout()->activate(); + if(item->container() && item->container()->layout()) + item->container()->layout()->activate(); // We add the autoSaveProperties in the modifProp list of the ObjectTreeItem, so that they are saved later TQValueList<TQCString> list(container->form()->library()->autoSaveProperties(w->className())); @@ -1337,7 +1337,7 @@ FormIO::readChildNodes(ObjectTreeItem *item, Container *container, const TQDomEl //if(name == "geometry") // hasGeometryProp = true; if( ((eltag == "grid") || (eltag == "hbox") || (eltag == "vbox")) && - (name == "name")) // we don't care about tqlayout names + (name == "name")) // we don't care about layout names continue; if (node.attribute("subwidget")=="true") { @@ -1355,22 +1355,22 @@ FormIO::readChildNodes(ObjectTreeItem *item, Container *container, const TQDomEl if(name == "buddy") m_buddies->insert(readPropertyValue(node.firstChild(), TQT_TQOBJECT(w), name).toString(), (TQLabel*)w); else if(((eltag == "grid") || (eltag == "hbox") || (eltag == "vbox")) && - item->container() && item->container()->tqlayout()) { + item->container() && item->container()->layout()) { // We load the margin of a Layout if(name == "margin") { int margin = readPropertyValue(node.firstChild(), TQT_TQOBJECT(w), name).toInt(); item->container()->setLayoutMargin(margin); - item->container()->tqlayout()->setMargin(margin); + item->container()->layout()->setMargin(margin); } // We load the spacing of a Layout else if(name == "spacing") { int spacing = readPropertyValue(node.firstChild(), TQT_TQOBJECT(w), name).toInt(); item->container()->setLayoutSpacing(spacing); - item->container()->tqlayout()->setSpacing(spacing); + item->container()->layout()->setSpacing(spacing); } else if((name == "justify")){ bool justify = readPropertyValue(node.firstChild(), TQT_TQOBJECT(w), name).toBool(); - KexiFlowLayout *flow = static_cast<KexiFlowLayout*>(item->container()->tqlayout()); + KexiFlowLayout *flow = static_cast<KexiFlowLayout*>(item->container()->layout()); if(flow) flow->setJustified(justify); } @@ -1419,7 +1419,7 @@ FormIO::readChildNodes(ObjectTreeItem *item, Container *container, const TQDomEl loadWidget(container, node, w); } else if(tag == "grid") { - // first, see if it is flow tqlayout + // first, see if it is flow layout TQString layoutName; for(TQDomNode child = node.firstChild(); !child.isNull(); child = child.nextSibling()) { if((child.toElement().tagName() == "property") && (child.toElement().attribute("name") == "customLayout")) { @@ -1430,33 +1430,33 @@ FormIO::readChildNodes(ObjectTreeItem *item, Container *container, const TQDomEl if(layoutName == "HFlow") { item->container()->m_layType = Container::HFlow; - KexiFlowLayout *tqlayout = new KexiFlowLayout(item->widget()); - tqlayout->setOrientation(Qt::Horizontal); - item->container()->m_layout = (TQLayout*)tqlayout; + KexiFlowLayout *layout = new KexiFlowLayout(item->widget()); + layout->setOrientation(Qt::Horizontal); + item->container()->m_layout = (TQLayout*)layout; } else if(layoutName == "VFlow") { item->container()->m_layType = Container::VFlow; - KexiFlowLayout *tqlayout = new KexiFlowLayout(item->widget()); - tqlayout->setOrientation(Qt::Vertical); - item->container()->m_layout = (TQLayout*)tqlayout; + KexiFlowLayout *layout = new KexiFlowLayout(item->widget()); + layout->setOrientation(Qt::Vertical); + item->container()->m_layout = (TQLayout*)layout; } - else { // grid tqlayout + else { // grid layout item->container()->m_layType = Container::Grid; - TQGridLayout *tqlayout = new TQGridLayout(item->widget(), 1, 1); - item->container()->m_layout = (TQLayout*)tqlayout; + TQGridLayout *layout = new TQGridLayout(item->widget(), 1, 1); + item->container()->m_layout = (TQLayout*)layout; } readChildNodes(item, container, node, w); } else if(tag == "vbox") { item->container()->m_layType = Container::VBox; - TQVBoxLayout *tqlayout = new TQVBoxLayout(item->widget()); - item->container()->m_layout = (TQLayout*)tqlayout; + TQVBoxLayout *layout = new TQVBoxLayout(item->widget()); + item->container()->m_layout = (TQLayout*)layout; readChildNodes(item, container, node, w); } else if(tag == "hbox") { item->container()->m_layType = Container::HBox; - TQHBoxLayout *tqlayout = new TQHBoxLayout(item->widget()); - item->container()->m_layout = (TQLayout*)tqlayout; + TQHBoxLayout *layout = new TQHBoxLayout(item->widget()); + item->container()->m_layout = (TQLayout*)layout; readChildNodes(item, container, node, w); } else {// unknown tag, we let the Factory handle it diff --git a/kexi/formeditor/formmanager.cpp b/kexi/formeditor/formmanager.cpp index f75a4232..b212f00e 100644 --- a/kexi/formeditor/formmanager.cpp +++ b/kexi/formeditor/formmanager.cpp @@ -227,7 +227,7 @@ FormManager::createActions(WidgetLibrary *lib, KActionCollection* collection, KX m_style->setEditable(false); KGlobal::config()->setGroup("General"); - TQString currentStyle = TQString::fromLatin1(kapp->tqstyle().name()).lower(); + TQString currentStyle = TQString::fromLatin1(kapp->style().name()).lower(); const TQStringList styles = TQStyleFactory::keys(); m_style->setItems(styles); m_style->setCurrentItem(0); @@ -660,7 +660,7 @@ FormManager::previewForm(Form *form, TQWidget *container, Form *toForm) else myform = toForm; myform->createToplevel(container); - container->setStyle( &(form->widget()->tqstyle()) ); + container->setStyle( &(form->widget()->style()) ); if (!FormIO::loadFormFromDom(myform, container, domDoc)) { delete myform; @@ -845,7 +845,7 @@ FormManager::createContextMenu(TQWidget *w, Container *container, bool popupAtCu const uint widgetsCount = container->form()->selectedWidgets()->count(); const bool multiple = widgetsCount > 1; //const bool enableRemove = w != m_active->widget(); - // We only enabletqlayout creation if more than one widget with the same parent are selected + // We only enablelayout creation if more than one widget with the same parent are selected const bool enableLayout = multiple || w == container->widget(); m_menuWidget = w; @@ -1095,7 +1095,7 @@ void FormManager::createLayout(int layoutType) { WidgetList *list = m_active->selectedWidgets(); - // if only one widget is selected (a container), we modify its tqlayout + // if only one widget is selected (a container), we modify its layout if (list->isEmpty()) {//sanity check kdWarning() << "FormManager::createLayout(): list is empty!" << endl; return; @@ -1103,9 +1103,9 @@ FormManager::createLayout(int layoutType) if(list->count() == 1) { ObjectTreeItem *item = m_active->objectTree()->lookup(list->first()->name()); - if(!item || !item->container() || !m_propSet->contains("tqlayout")) + if(!item || !item->container() || !m_propSet->contains("layout")) return; - (*m_propSet)["tqlayout"] = Container::layoutTypeToString(layoutType); + (*m_propSet)["layout"] = Container::layoutTypeToString(layoutType); return; } @@ -1115,7 +1115,7 @@ FormManager::createLayout(int layoutType) kdDebug() << "comparing widget " << w->name() << " whose parent is " << w->parentWidget()->name() << " insteaed of " << parent->name() << endl; if(w->parentWidget() != parent) { - KMessageBox::sorry(m_active->widget()->topLevelWidget(), i18n("<b>Cannot create the tqlayout.</b>\n" + KMessageBox::sorry(m_active->widget()->topLevelWidget(), i18n("<b>Cannot create the layout.</b>\n" "All selected widgets must have the same parent.")); kdDebug() << "FormManager::createLayout() widgets don't have the same parent widget" << endl; return; @@ -1143,7 +1143,7 @@ FormManager::breakLayout() else // normal container { if(activeForm()->selectedWidgets()->count() == 1) - (*m_propSet)["tqlayout"] = "NoLayout"; + (*m_propSet)["layout"] = "NoLayout"; else container->setLayout(Container::NoLayout); } @@ -1500,7 +1500,7 @@ FormManager::emitWidgetSelected( KFormDesigner::Form* form, bool multiple ) } enableAction("format_font", fontEnabled); - // If the widgets selected is a container, we enable tqlayout actions + // If the widgets selected is a container, we enable layout actions bool containerSelected = false; if(!multiple) { diff --git a/kexi/formeditor/formmanager.h b/kexi/formeditor/formmanager.h index f5c72d73..677a3e7b 100644 --- a/kexi/formeditor/formmanager.h +++ b/kexi/formeditor/formmanager.h @@ -258,22 +258,22 @@ class KFORMEDITOR_EXPORT FormManager : public TQObject /*! Creates a dialog to edit the Connection of \ref activeForm(). */ void editConnections(); - //! Lay out selected widgets using HBox tqlayout (calls \ref CreateLayoutCommand). + //! Lay out selected widgets using HBox layout (calls \ref CreateLayoutCommand). void layoutHBox(); - //! Lay out selected widgets using VBox tqlayout. + //! Lay out selected widgets using VBox layout. void layoutVBox(); - //! Lay out selected widgets using Grid tqlayout. + //! Lay out selected widgets using Grid layout. void layoutGrid(); //! Lay out selected widgets in an horizontal splitter void layoutHSplitter(); //! Lay out selected widgets in a verticak splitter void layoutVSplitter(); - //! Lay out selected widgets using HFlow tqlayout + //! Lay out selected widgets using HFlow layout void layoutHFlow(); - //! Lay out selected widgets using VFlow tqlayout. + //! Lay out selected widgets using VFlow layout. void layoutVFlow(); - //! Breaks selected tqlayout(calls \ref BreakLayoutCommand). + //! Breaks selected layout(calls \ref BreakLayoutCommand). void breakLayout(); void alignWidgetsToLeft(); @@ -418,7 +418,7 @@ class KFORMEDITOR_EXPORT FormManager : public TQObject Change this if you need to handle, eg. custom UI XML tags, as in Kexi's Form Designer. */ virtual bool saveFormToStringInternal(Form *form, TQString &dest, int indent = 0); #endif - /*! Function called by the "Lay out in..." menu items. It creates a tqlayout from the + /*! Function called by the "Lay out in..." menu items. It creates a layout from the currently selected widgets (that must have the same parent). Calls \ref CreateLayoutCommand. */ void createLayout(int layoutType); diff --git a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp index 1a7b7dda..79f1b05f 100644 --- a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp +++ b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp @@ -397,7 +397,7 @@ KFormDesignerKDevPart::slotWidgetSelected(Form *form, bool multiple) ENABLE_ACTION("format_raise", true); ENABLE_ACTION("format_lower", true); - // If the widgets selected is a container, we enable tqlayout actions + // If the widgets selected is a container, we enable layout actions if(!multiple) { KFormDesigner::ObjectTreeItem *item = form->objectTree()->lookup( form->selectedWidgets()->first()->name() ); diff --git a/kexi/formeditor/test/kfd_part.cpp b/kexi/formeditor/test/kfd_part.cpp index 07e7edfd..02996580 100644 --- a/kexi/formeditor/test/kfd_part.cpp +++ b/kexi/formeditor/test/kfd_part.cpp @@ -423,7 +423,7 @@ KFormDesignerPart::slotWidgetSelected(Form *form, bool multiple) ENABLE_ACTION("format_raise", true); ENABLE_ACTION("format_lower", true); - // If the widgets selected is a container, we enable tqlayout actions + // If the widgets selected is a container, we enable layout actions bool containerSelected = false; if(!multiple) { diff --git a/kexi/formeditor/widgetlibrary.cpp b/kexi/formeditor/widgetlibrary.cpp index 953b220b..55f8cde6 100644 --- a/kexi/formeditor/widgetlibrary.cpp +++ b/kexi/formeditor/widgetlibrary.cpp @@ -79,7 +79,7 @@ class WidgetLibraryPrivate /*! @todo: reenable */ advancedProperties.insert("palette", (char*)1); advancedProperties.insert("backgroundOrigin", (char*)1); advancedProperties.insert("backgroundMode", (char*)1);//this is rather useless - advancedProperties.insert("tqlayout", (char*)1);// too large risk to break things + advancedProperties.insert("layout", (char*)1);// too large risk to break things // by providing this in propeditor advancedProperties.insert("minimumSize", (char*)1); advancedProperties.insert("maximumSize", (char*)1); diff --git a/kexi/formeditor/widgetpropertyset.cpp b/kexi/formeditor/widgetpropertyset.cpp index 8d7d7daf..73c79c30 100644 --- a/kexi/formeditor/widgetpropertyset.cpp +++ b/kexi/formeditor/widgetpropertyset.cpp @@ -403,7 +403,7 @@ WidgetPropertySet::createPropertiesForWidget(TQWidget *w) )); }*/ - if(KFormDesigner::FormManager::self()->activeForm() && tree->container()) // we are a container -> tqlayout property + if(KFormDesigner::FormManager::self()->activeForm() && tree->container()) // we are a container -> layout property createLayoutProperty(tree); } @@ -507,7 +507,7 @@ WidgetPropertySet::slotPropertyChanged(KoProperty::Set& set, KoProperty::Propert saveAlignProperty(property); return; } - else if((property == "tqlayout") || (property == "layoutMargin") || (property == "layoutSpacing")) { + else if((property == "layout") || (property == "layoutMargin") || (property == "layoutSpacing")) { saveLayoutProperty(property, value); return; } @@ -895,7 +895,7 @@ WidgetPropertySet::createLayoutProperty(ObjectTreeItem *item) if (!container || !KFormDesigner::FormManager::self()->activeForm() || !KFormDesigner::FormManager::self()->activeForm()->objectTree() || !container->widget()) return; - // special containers have no 'tqlayout' property, as it should not be changed + // special containers have no 'layout' property, as it should not be changed TQCString className = container->widget()->className(); if((className == "HBox") || (className == "VBox") || (className == "Grid")) return; @@ -905,12 +905,12 @@ WidgetPropertySet::createLayoutProperty(ObjectTreeItem *item) list << "NoLayout" << "HBox" << "VBox" << "Grid" << "HFlow" << "VFlow"; - KoProperty::Property *p = new KoProperty::Property("tqlayout", createValueList(0, list), value, + KoProperty::Property *p = new KoProperty::Property("layout", createValueList(0, list), value, i18n("Container's Layout"), i18n("Container's Layout")); p->setVisible( container->form()->library()->advancedPropertiesVisible() ); d->set.addProperty(p); - updatePropertyValue(item, "tqlayout"); + updatePropertyValue(item, "layout"); p = new KoProperty::Property("layoutMargin", container->layoutMargin(), i18n("Layout Margin"), i18n("Layout Margin")); d->set.addProperty(p); @@ -938,14 +938,14 @@ WidgetPropertySet::saveLayoutProperty(const TQString &prop, const TQVariant &val return; container = item->container(); - if(prop == "tqlayout") { + if(prop == "layout") { Container::LayoutType type = Container::stringToLayoutType(value.toString()); - if(d->lastCommand && d->lastCommand->property() == "tqlayout" && !d->isUndoing) + if(d->lastCommand && d->lastCommand->property() == "layout" && !d->isUndoing) d->lastCommand->setValue(value); else if(!d->isUndoing) { d->lastCommand = new LayoutPropertyCommand(this, d->widgets.first()->name(), - d->set["tqlayout"].oldValue(), value); + d->set["layout"].oldValue(), value); KFormDesigner::FormManager::self()->activeForm()->addCommand(d->lastCommand, false); } @@ -959,13 +959,13 @@ WidgetPropertySet::saveLayoutProperty(const TQString &prop, const TQVariant &val return; } - if(prop == "layoutMargin" && container->tqlayout()) { + if(prop == "layoutMargin" && container->layout()) { container->setLayoutMargin(value.toInt()); - container->tqlayout()->setMargin(value.toInt()); + container->layout()->setMargin(value.toInt()); } - else if(prop == "layoutSpacing" && container->tqlayout()) { + else if(prop == "layoutSpacing" && container->layout()) { container->setLayoutSpacing(value.toInt()); - container->tqlayout()->setSpacing(value.toInt()); + container->layout()->setSpacing(value.toInt()); } ObjectTreeItem *tree = KFormDesigner::FormManager::self()->activeForm()->objectTree()->lookup(d->widgets.first()->name()); diff --git a/kexi/formeditor/widgetpropertyset.h b/kexi/formeditor/widgetpropertyset.h index f1f96a99..896d309c 100644 --- a/kexi/formeditor/widgetpropertyset.h +++ b/kexi/formeditor/widgetpropertyset.h @@ -168,10 +168,10 @@ class KFORMEDITOR_EXPORT WidgetPropertySet : public TQObject and modifies the "alignment" property of the widget.*/ void saveAlignProperty(const TQString &property); - /*! Creates the "tqlayout" property, for the Container representing \a item. */ + /*! Creates the "layout" property, for the Container representing \a item. */ void createLayoutProperty(ObjectTreeItem *item); - /*! Saves the "tqlayout" property and changes the Container 's tqlayout ( + /*! Saves the "layout" property and changes the Container 's layout ( using Container::setLayout() ).*/ void saveLayoutProperty(const TQString &property, const TQVariant &value); diff --git a/kexi/kexidb/drivers/mySQL/mysqldriver.cpp b/kexi/kexidb/drivers/mySQL/mysqldriver.cpp index 10654e7e..0f2bcf9b 100644 --- a/kexi/kexidb/drivers/mySQL/mysqldriver.cpp +++ b/kexi/kexidb/drivers/mySQL/mysqldriver.cpp @@ -120,7 +120,7 @@ TQString MySqlDriver::escapeString(const TQString& str) const const int old_length = str.length(); int i; for ( i = 0; i < old_length; i++ ) { //anything to escape? - const unsigned int ch = str[i].tqunicode(); + const unsigned int ch = str[i].unicode(); if (ch == '\\' || ch == '\'' || ch == '"' || ch == '\n' || ch == '\r' || ch == '\t' || ch == '\b' || ch == '\0') break; } @@ -133,7 +133,7 @@ TQString MySqlDriver::escapeString(const TQString& str) const int new_length = 0; new_string[new_length++] = '\''; //prepend ' for ( i = 0; i < old_length; i++, new_length++ ) { - const unsigned int ch = str[i].tqunicode(); + const unsigned int ch = str[i].unicode(); if (ch == '\\') { new_string[new_length++] = '\\'; new_string[new_length] = '\\'; diff --git a/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp b/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp index 08d639ba..cf478b94 100644 --- a/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp +++ b/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp @@ -188,7 +188,7 @@ bool SQLiteConnection::drv_useDatabase( const TQString &dbName, bool *cancelled, d->res = sqlite3_open( //TQFile::encodeName( data()->fileName() ), - data()->fileName().utf8(), /* tqunicode expected since SQLite 3.1 */ + data()->fileName().utf8(), /* unicode expected since SQLite 3.1 */ &d->data, exclusiveFlag, allowReadonly /* If 1 and locking fails, try opening in read-only mode */ diff --git a/kexi/kexiutils/identifier.cpp b/kexi/kexiutils/identifier.cpp index 55fc4560..ed1afdcb 100644 --- a/kexi/kexiutils/identifier.cpp +++ b/kexi/kexiutils/identifier.cpp @@ -45,9 +45,9 @@ TQString KexiUtils::string2FileName(const TQString &s) inline TQString char2Identifier(const TQChar& c) { - if (c.tqunicode() >= TRANSLITERATION_TABLE_SIZE) + if (c.unicode() >= TRANSLITERATION_TABLE_SIZE) return TQString(TQChar('_')); - const char *const s = transliteration_table[c.tqunicode()]; + const char *const s = transliteration_table[c.unicode()]; return s ? TQString::fromLatin1(s) : TQString(TQChar('_')); } diff --git a/kexi/kexiutils/transliteration_table.h b/kexi/kexiutils/transliteration_table.h index 0eece11c..5be7dadc 100644 --- a/kexi/kexiutils/transliteration_table.h +++ b/kexi/kexiutils/transliteration_table.h @@ -1,4 +1,4 @@ -/* Transliteration table of 65535 tqunicode characters +/* Transliteration table of 65535 unicode characters Do not edit this file, it is generated by ./generate_transliteration_table.sh script. */ diff --git a/kexi/kexiutils/utils.cpp b/kexi/kexiutils/utils.cpp index fd6c4e87..dca4998b 100644 --- a/kexi/kexiutils/utils.cpp +++ b/kexi/kexiutils/utils.cpp @@ -226,7 +226,7 @@ TQMap<TQString,TQString> KexiUtils::deserializeMap(const TQString& string) TQCString cstr(string.latin1()); TQByteArray array( size ); for (uint i=0; i<size; i++) { - array[i] = char(string[i].tqunicode()-1); + array[i] = char(string[i].unicode()-1); } TQMap<TQString,TQString> map; TQDataStream ds(array, IO_ReadOnly); @@ -244,13 +244,13 @@ TQString KexiUtils::stringToFileName(const TQString& string) void KexiUtils::simpleCrypt(TQString& string) { for (uint i=0; i<string.length(); i++) - string[i] = TQChar( string[i].tqunicode() + 47 + i ); + string[i] = TQChar( string[i].unicode() + 47 + i ); } void KexiUtils::simpleDecrypt(TQString& string) { for (uint i=0; i<string.length(); i++) - string[i] = TQChar( string[i].tqunicode() - 47 - i ); + string[i] = TQChar( string[i].unicode() - 47 - i ); } void KexiUtils::drawPixmap( TQPainter& p, int lineWidth, const TQRect& rect, diff --git a/kexi/kexiutils/utils.h b/kexi/kexiutils/utils.h index ffa2a85d..81e4f41e 100644 --- a/kexi/kexiutils/utils.h +++ b/kexi/kexiutils/utils.h @@ -184,7 +184,7 @@ namespace KexiUtils KEXIUTILS_EXPORT TQString stringToFileName(const TQString& string); /*! Performs a simple \a string encryption using rot47-like algorithm. - Each character's tqunicode value is increased by 47 + i (where i is index of the character). + Each character's unicode value is increased by 47 + i (where i is index of the character). The resulting string still contains redable characters. Do not use this for data that can be accessed by attackers! */ KEXIUTILS_EXPORT void simpleCrypt(TQString& string); diff --git a/kexi/main/kexifinddialog.cpp b/kexi/main/kexifinddialog.cpp index b46eb20d..80f3c83e 100644 --- a/kexi/main/kexifinddialog.cpp +++ b/kexi/main/kexifinddialog.cpp @@ -82,8 +82,8 @@ KexiFindDialog::KexiFindDialog( TQWidget* parent ) , d( new Private() ) { m_search->setCurrentItem((int)KexiSearchAndReplaceViewInterface::Options::SearchDown); - tqlayout()->setMargin( KDialog::marginHint() ); - tqlayout()->setSpacing( KDialog::spacingHint() ); + layout()->setMargin( KDialog::marginHint() ); + layout()->setSpacing( KDialog::spacingHint() ); KAction *a = KStdAction::findNext(0, 0, 0); m_btnFind->setText(a->text()); m_btnFind->setIconSet(a->iconSet()); diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp index dc7fc428..5e39ab13 100644 --- a/kexi/main/keximainwindowimpl.cpp +++ b/kexi/main/keximainwindowimpl.cpp @@ -127,7 +127,7 @@ //! width changes will be removed in KMDI //#define PROPEDITOR_VISIBILITY_CHANGES -//temporary fix to manage tqlayout +//temporary fix to manage layout #include "ksplitter.h" #define KDOCKWIDGET_P 1 @@ -360,7 +360,7 @@ KexiMainWindowImpl::KexiMainWindowImpl() TQToolButton *closeButton = new TQToolButton( tabWidget() ); closeButton->setAutoRaise( true ); closeButton->setPixmap( TQPixmap( kde2_closebutton ) ); - closeButton->setPaletteBackgroundColor(closeButton->tqpalette().active().background()); + closeButton->setPaletteBackgroundColor(closeButton->palette().active().background()); // closeButton->setIconSet(SmallIconSet("tab_remove")); tabWidget()->setCornerWidget( closeButton, TQt::TopRight ); closeButton->hide(); // hide until it's needed to avoid problems in "user mode" @@ -1788,7 +1788,7 @@ void KexiMainWindowImpl::slotLastActions() } #endif #ifdef TQ_WS_WIN - showMaximized();//js: workaround for not yet completed tqlayout settings storage on win32 + showMaximized();//js: workaround for not yet completed layout settings storage on win32 #endif } diff --git a/kexi/main/printing/kexisimpleprintingpagesetupbase.ui b/kexi/main/printing/kexisimpleprintingpagesetupbase.ui index 4bf6deec..ff46ee7a 100644 --- a/kexi/main/printing/kexisimpleprintingpagesetupbase.ui +++ b/kexi/main/printing/kexisimpleprintingpagesetupbase.ui @@ -24,7 +24,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="6"> <property name="name"> - <cstring>tqlayout15</cstring> + <cstring>layout15</cstring> </property> <hbox> <property name="name"> @@ -115,7 +115,7 @@ </widget> <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="6"> <property name="name"> - <cstring>tqlayout19</cstring> + <cstring>layout19</cstring> </property> <hbox> <property name="name"> @@ -222,7 +222,7 @@ </widget> <widget class="TQLayoutWidget" row="12" column="0" rowspan="1" colspan="6"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <grid> <property name="name"> diff --git a/kexi/main/startup/KexiConnSelector.cpp b/kexi/main/startup/KexiConnSelector.cpp index 60e98852..6e104659 100644 --- a/kexi/main/startup/KexiConnSelector.cpp +++ b/kexi/main/startup/KexiConnSelector.cpp @@ -149,8 +149,8 @@ KexiConnSelectorWidget::KexiConnSelectorWidget( KexiDBConnectionSet& conn_set, TQToolTip::add(m_remote->btn_edit, i18n("Edit selected database connection")); TQToolTip::add(m_remote->btn_remove, i18n("Remove selected database connections")); d->stack->addWidget(m_remote); - if (m_remote->tqlayout()) - m_remote->tqlayout()->setMargin(0); + if (m_remote->layout()) + m_remote->layout()->setMargin(0); // connect(m_remote->btn_back,TQT_SIGNAL(clicked()),this,TQT_SLOT(showSimpleConn())); connect(m_remote->list,TQT_SIGNAL(doubleClicked(TQListViewItem*)), this,TQT_SLOT(slotConnectionItemExecuted(TQListViewItem*))); @@ -197,8 +197,8 @@ void KexiConnSelectorWidget::slotPrjTypeSelected(int id) if (m_remote->list->firstChild()) { m_remote->list->setSelected(m_remote->list->firstChild(),true); } - m_remote->descriptionEdit->setPaletteBackgroundColor(tqpalette().active().background()); - m_remote->descGroupBox->tqlayout()->setMargin(2); + m_remote->descriptionEdit->setPaletteBackgroundColor(palette().active().background()); + m_remote->descGroupBox->layout()->setMargin(2); m_remote->list->setFocus(); slotConnectionSelectionChanged(); } @@ -222,7 +222,7 @@ void KexiConnSelectorWidget::showSimpleConn() m_fileDlg = new KexiStartupFileDialog( d->startDirOrVariable, KexiStartupFileDialog::Opening, d->stack, "openExistingFileDlg"); m_fileDlg->setConfirmOverwrites( d->confirmOverwrites ); -// static_cast<TQVBoxLayout*>(m_file->tqlayout())->insertWidget( 2, m_fileDlg ); +// static_cast<TQVBoxLayout*>(m_file->layout())->insertWidget( 2, m_fileDlg ); d->stack->addWidget(m_fileDlg); for (TQWidget *w = parentWidget(true);w;w=w->parentWidget(true)) { diff --git a/kexi/main/startup/KexiDBTitlePage.h b/kexi/main/startup/KexiDBTitlePage.h index 4ac59bc0..0ee1e4dd 100644 --- a/kexi/main/startup/KexiDBTitlePage.h +++ b/kexi/main/startup/KexiDBTitlePage.h @@ -22,7 +22,7 @@ #include "KexiDBTitlePageBase.h" -//! @short A helper widget used to displaying a line edit with a label and tqlayout +//! @short A helper widget used to displaying a line edit with a label and layout class KEXIMAIN_EXPORT KexiDBTitlePage : public KexiDBTitlePageBase { Q_OBJECT diff --git a/kexi/main/startup/KexiNewProjectWizard.cpp b/kexi/main/startup/KexiNewProjectWizard.cpp index 0e7f872a..c8d36aab 100644 --- a/kexi/main/startup/KexiNewProjectWizard.cpp +++ b/kexi/main/startup/KexiNewProjectWizard.cpp @@ -127,8 +127,8 @@ KexiNewProjectWizard::KexiNewProjectWizard(KexiDBConnectionSet& conn_set, connect(m_prjtype_sel->lv_types,TQT_SIGNAL(returnPressed(TQListViewItem*)),this,TQT_SLOT(slotLvTypesExecuted(TQListViewItem*))); connect(m_prjtype_sel->lv_types,TQT_SIGNAL(selectionChanged( TQListViewItem*)),this,TQT_SLOT(slotLvTypesSelected(TQListViewItem*))); -// static_cast<TQVBoxLayout*>(m_prjtype_sel->tqlayout())->insertWidget(1,d->m_prjtype_sel->lv_types); -// static_cast<TQVBoxLayout*>(m_prjtype_sel->tqlayout())->insertStretch(3,1); +// static_cast<TQVBoxLayout*>(m_prjtype_sel->layout())->insertWidget(1,d->m_prjtype_sel->lv_types); +// static_cast<TQVBoxLayout*>(m_prjtype_sel->layout())->insertStretch(3,1); // updateGeometry(); addPage(m_prjtype_sel, i18n("Select Storage Method")); diff --git a/kexi/main/startup/KexiOpenExistingFile.ui b/kexi/main/startup/KexiOpenExistingFile.ui index 2f778429..b74936dd 100644 --- a/kexi/main/startup/KexiOpenExistingFile.ui +++ b/kexi/main/startup/KexiOpenExistingFile.ui @@ -75,7 +75,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> diff --git a/kexi/main/startup/KexiStartupFileDialog.cpp b/kexi/main/startup/KexiStartupFileDialog.cpp index 72db4af2..71e4a317 100644 --- a/kexi/main/startup/KexiStartupFileDialog.cpp +++ b/kexi/main/startup/KexiStartupFileDialog.cpp @@ -48,8 +48,8 @@ KexiStartupFileDialog::KexiStartupFileDialog( TQPoint point( 0, 0 ); reparent( parentWidget(), point ); - if (tqlayout()) - tqlayout()->setMargin(0); + if (layout()) + layout()->setMargin(0); setMinimumHeight(100); setSizeGripEnabled ( false ); diff --git a/kexi/migration/importwizard.cpp b/kexi/migration/importwizard.cpp index 6d42da24..3592557c 100644 --- a/kexi/migration/importwizard.cpp +++ b/kexi/migration/importwizard.cpp @@ -274,7 +274,7 @@ void ImportWizard::setupDstTitle() { m_dstTitlePage = new KexiDBTitlePage(i18n("Destination project's caption:"), this, "KexiDBTitlePage"); - m_dstTitlePage->tqlayout()->setMargin( KDialog::marginHint() ); + m_dstTitlePage->layout()->setMargin( KDialog::marginHint() ); m_dstTitlePage->updateGeometry(); m_dstNewDBNameLineEdit = m_dstTitlePage->le_caption; addPage(m_dstTitlePage, i18n("Select Destination Database Project's Caption")); @@ -555,7 +555,7 @@ void ImportWizard::arriveImportingPage() { KexiMigrate* sourceDriver = prepareImport(result); if (sourceDriver) { showOptions = !result.error() - && sourceDriver->propertyValue( "source_database_has_nontqunicode_encoding" ).toBool(); + && sourceDriver->propertyValue( "source_database_has_nonunicode_encoding" ).toBool(); KexiMigration::Data *data = sourceDriver->data(); sourceDriver->setData( 0 ); delete data; @@ -802,7 +802,7 @@ tristate ImportWizard::import() if (sourceDriver && !result.error()) { if (!m_sourceDBEncoding.isEmpty()) { - sourceDriver->setPropertyValue( "source_database_nontqunicode_encoding", + sourceDriver->setPropertyValue( "source_database_nonunicode_encoding", TQVariant(m_sourceDBEncoding.upper().replace(' ',"")) // "CP1250", not "cp 1250" ); } diff --git a/kexi/plugins/forms/kexiactionselectiondialog.cpp b/kexi/plugins/forms/kexiactionselectiondialog.cpp index a20dbe21..bec4de7d 100644 --- a/kexi/plugins/forms/kexiactionselectiondialog.cpp +++ b/kexi/plugins/forms/kexiactionselectiondialog.cpp @@ -581,7 +581,7 @@ void KexiActionSelectionDialog::slotActionCategorySelected(TQListViewItem* item) i18n("&Select action to be executed after clicking \"%1\" button:")); // msg for a label if (simpleItem->data == "kaction") { if (!d->kactionPageWidget) { - //create lbl+list view with a vtqlayout + //create lbl+list view with a vlayout d->kactionPageWidget = new TQWidget(); d->kactionPageWidget->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); TQVBoxLayout *vlyr = new TQVBoxLayout(d->kactionPageWidget, 0, KDialog::spacingHint()); @@ -605,7 +605,7 @@ void KexiActionSelectionDialog::slotActionCategorySelected(TQListViewItem* item) } else if (simpleItem->data == "currentForm") { if (!d->currentFormActionsPageWidget) { - //create lbl+list view with a vtqlayout + //create lbl+list view with a vlayout d->currentFormActionsPageWidget = new TQWidget(); d->currentFormActionsPageWidget->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); TQVBoxLayout *vlyr = new TQVBoxLayout(d->currentFormActionsPageWidget, 0, KDialog::spacingHint()); diff --git a/kexi/plugins/forms/kexidbfactory.cpp b/kexi/plugins/forms/kexidbfactory.cpp index d87b31c5..c46b04de 100644 --- a/kexi/plugins/forms/kexidbfactory.cpp +++ b/kexi/plugins/forms/kexidbfactory.cpp @@ -535,7 +535,7 @@ KexiDBFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDesign else if (classname == "KexiDBCheckBox") { KexiDBCheckBox *cb = static_cast<KexiDBCheckBox*>(w); TQRect r( cb->geometry() ); - r.setLeft( r.left() + 2 + cb->tqstyle().subRect( TQStyle::SR_CheckBoxIndicator, cb ).width() ); + r.setLeft( r.left() + 2 + cb->style().subRect( TQStyle::SR_CheckBoxIndicator, cb ).width() ); createEditor(classname, cb->text(), cb, container, r, TQt::AlignAuto); return true; } diff --git a/kexi/plugins/forms/kexidbtextwidgetinterface.cpp b/kexi/plugins/forms/kexidbtextwidgetinterface.cpp index 68dea85f..e8da5ad5 100644 --- a/kexi/plugins/forms/kexidbtextwidgetinterface.cpp +++ b/kexi/plugins/forms/kexidbtextwidgetinterface.cpp @@ -53,7 +53,7 @@ void KexiDBTextWidgetInterface::paint( TQFrame *w, TQPainter* p, bool textIsEmpt if (w->hasFocus()) { p->setPen( KexiUtils::blendedColors( - m_autonumberDisplayParameters->textColor, w->tqpalette().active().base(), 1, 3)); + m_autonumberDisplayParameters->textColor, w->palette().active().base(), 1, 3)); } KexiDisplayUtils::paintAutonumberSign(*m_autonumberDisplayParameters, p, 2 + margin + w->margin(), margin, w->width() - margin*2 -2-2, diff --git a/kexi/plugins/forms/kexiformview.cpp b/kexi/plugins/forms/kexiformview.cpp index 36a64db7..c6d689f7 100644 --- a/kexi/plugins/forms/kexiformview.cpp +++ b/kexi/plugins/forms/kexiformview.cpp @@ -90,7 +90,7 @@ KexiFormView::KexiFormView(KexiMainWindow *mainWin, TQWidget *parent, if (viewMode()==Kexi::DataViewMode) { m_scrollView->recordNavigator()->setRecordHandler( m_scrollView ); - m_scrollView->viewport()->setPaletteBackgroundColor(m_dbform->tqpalette().active().background()); + m_scrollView->viewport()->setPaletteBackgroundColor(m_dbform->palette().active().background()); //moved to formmanager connect(formPart()->manager(), TQT_SIGNAL(noFormSelected()), TQT_SLOT(slotNoFormSelected())); } else @@ -860,7 +860,7 @@ KexiFormView::slotWidgetSelected(KFormDesigner::Form *f, bool multiple) setAvailable("formpart_format_raise", true); setAvailable("formpart_format_lower", true); - // If the widgets selected is a container, we enable tqlayout actions + // If the widgets selected is a container, we enable layout actions if(!multiple) { KFormDesigner::ObjectTreeItem *item = f->objectTree()->lookup( f->selectedWidgets()->first()->name() ); diff --git a/kexi/plugins/forms/widgets/kexidbautofield.cpp b/kexi/plugins/forms/widgets/kexidbautofield.cpp index 3a8e8453..9437faca 100644 --- a/kexi/plugins/forms/widgets/kexidbautofield.cpp +++ b/kexi/plugins/forms/widgets/kexidbautofield.cpp @@ -57,7 +57,7 @@ class KexiDBAutoField::Private //!< of widgetTypeForFieldType() if widgetTypeForFieldType is Auto WidgetType widgetType_property; //!< provides widget type or Auto LabelPosition lblPosition; - TQBoxLayout *tqlayout; + TQBoxLayout *layout; TQLabel *label; TQString caption; KexiDB::Field::Type fieldTypeInternal; @@ -104,7 +104,7 @@ void KexiDBAutoField::init(const TQString &text, WidgetType type, LabelPosition pos) { d->fieldTypeInternal = KexiDB::Field::InvalidType; - d->tqlayout = 0; + d->layout = 0; m_subwidget = 0; d->label = new TQLabel(text, this); d->label->installEventFilter( this ); @@ -116,8 +116,8 @@ KexiDBAutoField::init(const TQString &text, WidgetType type, LabelPosition pos) d->widgetType_property = (type==Auto ? Text : type); //to force "differ" to be true in setWidgetType() setLabelPosition(pos); setWidgetType(type); - d->baseColor = tqpalette().active().base(); - d->textColor = tqpalette().active().text(); + d->baseColor = palette().active().base(); + d->textColor = palette().active().text(); } void @@ -222,25 +222,25 @@ void KexiDBAutoField::setLabelPosition(LabelPosition position) { d->lblPosition = position; - if(d->tqlayout) { - TQBoxLayout *lyr = d->tqlayout; - d->tqlayout = 0; + if(d->layout) { + TQBoxLayout *lyr = d->layout; + d->layout = 0; delete lyr; } if(m_subwidget) m_subwidget->show(); - //! \todo support right-to-left tqlayout where positions are inverted + //! \todo support right-to-left layout where positions are inverted if (position==Top || position==Left) { int align = d->label->alignment(); if(position == Top) { - d->tqlayout = (TQBoxLayout*) new TQVBoxLayout(this); + d->layout = (TQBoxLayout*) new TQVBoxLayout(this); align |= AlignVertical_Mask; align ^= AlignVertical_Mask; align |= AlignTop; } else { - d->tqlayout = (TQBoxLayout*) new TQHBoxLayout(this); + d->layout = (TQBoxLayout*) new TQHBoxLayout(this); align |= AlignVertical_Mask; align ^= AlignVertical_Mask; align |= AlignVCenter; @@ -254,14 +254,14 @@ KexiDBAutoField::setLabelPosition(LabelPosition position) else { d->label->show(); } - d->tqlayout->addWidget(d->label, 0, position == Top ? int(TQt::AlignLeft) : 0); + d->layout->addWidget(d->label, 0, position == Top ? int(TQt::AlignLeft) : 0); if(position == Left && d->widgetType != Boolean) - d->tqlayout->addSpacing(KexiDBAutoField_SPACING); - d->tqlayout->addWidget(m_subwidget, 1); + d->layout->addSpacing(KexiDBAutoField_SPACING); + d->layout->addWidget(m_subwidget, 1); KexiSubwidgetInterface *subwidgetInterface = dynamic_cast<KexiSubwidgetInterface*>((TQWidget*)m_subwidget); if (subwidgetInterface) { if (subwidgetInterface->appendStretchRequired(this)) - d->tqlayout->addStretch(0); + d->layout->addStretch(0); if (subwidgetInterface->subwidgetStretchRequired(this)) { TQSizePolicy sizePolicy( m_subwidget->sizePolicy() ); if(position == Left) { @@ -279,11 +279,11 @@ KexiDBAutoField::setLabelPosition(LabelPosition position) // m_subwidget->setSizePolicy(...); } else { - d->tqlayout = (TQBoxLayout*) new TQHBoxLayout(this); + d->layout = (TQBoxLayout*) new TQHBoxLayout(this); d->label->hide(); - d->tqlayout->addWidget(m_subwidget); + d->layout->addWidget(m_subwidget); } - //a hack to force tqlayout to be refreshed (any better idea for this?) + //a hack to force layout to be refreshed (any better idea for this?) resize(size()+TQSize(1,0)); resize(size()-TQSize(1,0)); if (dynamic_cast<KexiDBAutoField*>((TQWidget*)m_subwidget)) { @@ -584,7 +584,7 @@ KexiDBAutoField::changeText(const TQString &text, bool beautify) realText = text[0].upper() + text.mid(1); if (d->widgetType!=Boolean) { //! @todo ":" suffix looks weird for checkbox; remove this condition when [x] is displayed _after_ label -//! @todo support right-to-left tqlayout where position of ":" is inverted +//! @todo support right-to-left layout where position of ":" is inverted realText += ": "; } } diff --git a/kexi/plugins/forms/widgets/kexidbcombobox.cpp b/kexi/plugins/forms/widgets/kexidbcombobox.cpp index db56b550..5d2a24fd 100644 --- a/kexi/plugins/forms/widgets/kexidbcombobox.cpp +++ b/kexi/plugins/forms/widgets/kexidbcombobox.cpp @@ -124,7 +124,7 @@ bool KexiDBComboBox::isEditable() const void KexiDBComboBox::paintEvent( TQPaintEvent * ) { TQPainter p( this ); - TQColorGroup cg( tqpalette().active() ); + TQColorGroup cg( palette().active() ); // if ( hasFocus() ) // cg.setColor(TQColorGroup::Base, cg.highlight()); // else @@ -144,9 +144,9 @@ void KexiDBComboBox::paintEvent( TQPaintEvent * ) return; } -//! @todo support reverse tqlayout +//! @todo support reverse layout //bool reverse = TQApplication::reverseLayout(); - tqstyle().drawComplexControl( TQStyle::CC_ComboBox, &p, d->paintedCombo /*this*/, rect(), cg, + style().drawComplexControl( TQStyle::CC_ComboBox, &p, d->paintedCombo /*this*/, rect(), cg, flags, (uint)TQStyle::SC_All, (d->buttonPressed ? TQStyle::SC_ComboBoxArrow : TQStyle::SC_None ) ); @@ -157,11 +157,11 @@ void KexiDBComboBox::paintEvent( TQPaintEvent * ) else { //not editable: we need to paint the current item TQRect editorGeometry( this->editorGeometry() ); if ( hasFocus() ) { - if (0==qstrcmp(tqstyle().name(), "windows")) //a hack + if (0==qstrcmp(style().name(), "windows")) //a hack p.fillRect( editorGeometry, cg.brush( TQColorGroup::Highlight ) ); - TQRect r( TQStyle::visualRect( tqstyle().subRect( TQStyle::SR_ComboBoxFocusRect, d->paintedCombo ), this ) ); + TQRect r( TQStyle::visualRect( style().subRect( TQStyle::SR_ComboBoxFocusRect, d->paintedCombo ), this ) ); r = TQRect(r.left()-1, r.top()-1, r.width()+2, r.height()+2); //enlare by 1 pixel each side to avoid covering by the subwidget - tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, + style().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, r, cg, flags | TQStyle::Style_FocusAtBorder, TQStyleOption(cg.highlight())); } //todo @@ -171,7 +171,7 @@ void KexiDBComboBox::paintEvent( TQPaintEvent * ) TQRect KexiDBComboBox::editorGeometry() const { TQRect r( TQStyle::visualRect( - tqstyle().querySubControlMetrics(TQStyle::CC_ComboBox, d->paintedCombo, + style().querySubControlMetrics(TQStyle::CC_ComboBox, d->paintedCombo, TQStyle::SC_ComboBoxEditField), d->paintedCombo ) ); //if ((height()-r.bottom())<6) @@ -232,7 +232,7 @@ void KexiDBComboBox::setLabelPosition(LabelPosition position) TQRect KexiDBComboBox::buttonGeometry() const { TQRect arrowRect( - tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, d->paintedCombo, TQStyle::SC_ComboBoxArrow) ); + style().querySubControlMetrics( TQStyle::CC_ComboBox, d->paintedCombo, TQStyle::SC_ComboBoxArrow) ); arrowRect = TQStyle::visualRect(arrowRect, d->paintedCombo); arrowRect.setHeight( TQMAX( height() - (2 * arrowRect.y()), arrowRect.height() ) ); // a fix for Motif style return arrowRect; @@ -509,7 +509,7 @@ TQSize KexiDBComboBox::sizeHint() const const int maxWidth = 7 * fontMetrics().width(TQChar('x')) + 18; const int maxHeight = TQMAX( fontMetrics().lineSpacing(), 14 ) + 2; - d->sizeHint = (tqstyle().tqsizeFromContents(TQStyle::CT_ComboBox, d->paintedCombo, + d->sizeHint = (style().tqsizeFromContents(TQStyle::CT_ComboBox, d->paintedCombo, TQSize(maxWidth, maxHeight)).expandedTo(TQApplication::globalStrut())); return d->sizeHint; diff --git a/kexi/plugins/forms/widgets/kexidbdateedit.cpp b/kexi/plugins/forms/widgets/kexidbdateedit.cpp index 3058f02c..daff9ef9 100644 --- a/kexi/plugins/forms/widgets/kexidbdateedit.cpp +++ b/kexi/plugins/forms/widgets/kexidbdateedit.cpp @@ -64,9 +64,9 @@ KexiDBDateEdit::KexiDBDateEdit(const TQDate &date, TQWidget *parent, const char m_datePickerPopupMenu->insertItem(m_datePicker); btn->setPopup(m_datePickerPopupMenu); - TQHBoxLayout* tqlayout = new TQHBoxLayout(this); - tqlayout->addWidget(m_edit, 1); - tqlayout->addWidget(btn, 0); + TQHBoxLayout* layout = new TQHBoxLayout(this); + layout->addWidget(m_edit, 1); + layout->addWidget(btn, 0); setFocusProxy(m_edit); } diff --git a/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp b/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp index 629a4bca..627e1172 100644 --- a/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp +++ b/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp @@ -71,11 +71,11 @@ KexiDBDateTimeEdit::KexiDBDateTimeEdit(const TQDateTime &datetime, TQWidget *par m_datePickerPopupMenu->insertItem(m_datePicker); btn->setPopup(m_datePickerPopupMenu); - TQHBoxLayout* tqlayout = new TQHBoxLayout(this); - tqlayout->addWidget(m_dateEdit, 0); - tqlayout->addWidget(btn, 0); - tqlayout->addWidget(m_timeEdit, 0); - //tqlayout->addStretch(1); + TQHBoxLayout* layout = new TQHBoxLayout(this); + layout->addWidget(m_dateEdit, 0); + layout->addWidget(btn, 0); + layout->addWidget(m_timeEdit, 0); + //layout->addStretch(1); setFocusProxy(m_dateEdit); } diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.cpp b/kexi/plugins/forms/widgets/kexidbimagebox.cpp index 5b8b2939..dd52f9f5 100644 --- a/kexi/plugins/forms/widgets/kexidbimagebox.cpp +++ b/kexi/plugins/forms/widgets/kexidbimagebox.cpp @@ -401,14 +401,14 @@ void KexiDBImageBox::handleCutAction() void KexiDBImageBox::handleCopyAction() { - tqApp->tqclipboard()->setPixmap(pixmap(), TQClipboard::Clipboard); + tqApp->clipboard()->setPixmap(pixmap(), TQClipboard::Clipboard); } void KexiDBImageBox::handlePasteAction() { if (isReadOnly() || (!m_designMode && !hasFocus())) return; - TQPixmap pm( tqApp->tqclipboard()->pixmap(TQClipboard::Clipboard) ); + TQPixmap pm( tqApp->clipboard()->pixmap(TQClipboard::Clipboard) ); // if (!pm.isNull()) // setValueInternal(pm, true); if (dataSource().isEmpty()) { @@ -610,7 +610,7 @@ void KexiDBImageBox::setDataSource( const TQString &ds ) } if (!m_paletteBackgroundColorChanged && parentWidget()) { KexiFrame::setPaletteBackgroundColor( - dataSource().isEmpty() ? parentWidget()->paletteBackgroundColor() : tqpalette().active().base() ); + dataSource().isEmpty() ? parentWidget()->paletteBackgroundColor() : palette().active().base() ); } } @@ -685,9 +685,9 @@ void KexiDBImageBox::paintEvent( TQPaintEvent *pe ) // if the widget is focused, draw focus indicator rect _if_ there is no chooser button if (!m_designMode && !dataSource().isEmpty() && hasFocus() && (!m_chooser || !m_chooser->isVisible())) { - tqstyle().tqdrawPrimitive( - TQStyle::PE_FocusRect, &p, tqstyle().subRect(TQStyle::SR_PushButtonContents, this), - tqpalette().active() ); + style().tqdrawPrimitive( + TQStyle::PE_FocusRect, &p, style().subRect(TQStyle::SR_PushButtonContents, this), + palette().active() ); } } diff --git a/kexi/plugins/forms/widgets/kexidblabel.cpp b/kexi/plugins/forms/widgets/kexidblabel.cpp index adb833fa..93f35027 100644 --- a/kexi/plugins/forms/widgets/kexidblabel.cpp +++ b/kexi/plugins/forms/widgets/kexidblabel.cpp @@ -424,7 +424,7 @@ void KexiDBLabel::init() m_hasFocusableWidget = false; d->internalLabel = new KexiDBInternalLabel( this ); d->internalLabel->hide(); - d->frameColor = tqpalette().active().foreground(); + d->frameColor = palette().active().foreground(); setAlignment( d->internalLabel->alignment() ); } diff --git a/kexi/plugins/forms/widgets/kexiframe.cpp b/kexi/plugins/forms/widgets/kexiframe.cpp index 09266ae4..b64d6edf 100644 --- a/kexi/plugins/forms/widgets/kexiframe.cpp +++ b/kexi/plugins/forms/widgets/kexiframe.cpp @@ -48,7 +48,7 @@ KexiFrame::KexiFrame( TQWidget * parent, const char * name, WFlags f ) , d( new Private() ) { //defaults - d->frameColor = tqpalette().active().foreground(); + d->frameColor = palette().active().foreground(); //! @todo obtain these defaults from current template's style... setLineWidth(2); setFrameStyle(TQFrame::StyledPanel|TQFrame::Raised); diff --git a/kexi/plugins/importexport/csv/kexicsvexport.cpp b/kexi/plugins/importexport/csv/kexicsvexport.cpp index f3347676..37e30e04 100644 --- a/kexi/plugins/importexport/csv/kexicsvexport.cpp +++ b/kexi/plugins/importexport/csv/kexicsvexport.cpp @@ -252,7 +252,7 @@ bool KexiCSVExport::exportData(KexiDB::TableOrQuerySchema& tableOrQuery, } if (copyToClipboard) - kapp->tqclipboard()->setText(buffer, TQClipboard::Clipboard); + kapp->clipboard()->setText(buffer, TQClipboard::Clipboard); delete [] isText; delete [] isDateTime; diff --git a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp index 94642d38..4a11d1d7 100644 --- a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp +++ b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp @@ -346,14 +346,14 @@ void KexiCSVExportWizard::slotShowOptionsButtonClicked() } } -void KexiCSVExportWizard::layOutButtonRow( TQHBoxLayout * tqlayout ) +void KexiCSVExportWizard::layOutButtonRow( TQHBoxLayout * layout ) { - TQWizard::layOutButtonRow( tqlayout ); + TQWizard::layOutButtonRow( layout ); - //find the last subtqlayout + //find the last sublayout TQLayout *l = 0; - for (TQLayoutIterator lit( tqlayout->iterator() ); lit.current(); ++lit) - l = lit.current()->tqlayout(); + for (TQLayoutIterator lit( layout->iterator() ); lit.current(); ++lit) + l = lit.current()->layout(); if (dynamic_cast<TQBoxLayout*>(l)) { if (!m_defaultsBtn) { m_defaultsBtn = new KPushButton(i18n("Defaults"), this); diff --git a/kexi/plugins/importexport/csv/kexicsvexportwizard.h b/kexi/plugins/importexport/csv/kexicsvexportwizard.h index 27213159..7ef7020d 100644 --- a/kexi/plugins/importexport/csv/kexicsvexportwizard.h +++ b/kexi/plugins/importexport/csv/kexicsvexportwizard.h @@ -62,7 +62,7 @@ class KexiCSVExportWizard : public KWizard protected: //! reimplemented to add "Defaults" button on the left hand - virtual void layOutButtonRow( TQHBoxLayout * tqlayout ); + virtual void layOutButtonRow( TQHBoxLayout * layout ); //! \return default delimiter depending on mode. TQString defaultDelimiter() const; diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp index 69942a79..0e5f6e4c 100644 --- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp +++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp @@ -280,7 +280,7 @@ KexiCSVImportDialog::KexiCSVImportDialog( Mode mode, KexiMainWindow* mainWin, if ( m_mode == Clipboard ) { setCaption( i18n( "Inserting From Clipboard" ) ); - TQMimeSource * mime = TQApplication::tqclipboard()->data(); + TQMimeSource * mime = TQApplication::clipboard()->data(); if ( !mime ) { KMessageBox::information( this, i18n("There is no data in the clipboard.") ); @@ -336,11 +336,11 @@ if ( m_mode == Clipboard ) } else if (m_mode == Clipboard) { TQCString subtype("plain"); - m_clipboardData = TQApplication::tqclipboard()->text(subtype, TQClipboard::Clipboard); + m_clipboardData = TQApplication::clipboard()->text(subtype, TQClipboard::Clipboard); /* debug - for (int i=0;TQApplication::tqclipboard()->data(TQClipboard::Clipboard)->format(i);i++) + for (int i=0;TQApplication::clipboard()->data(TQClipboard::Clipboard)->format(i);i++) kdDebug() << i << ": " - << TQApplication::tqclipboard()->data(TQClipboard::Clipboard)->format(i) << endl; + << TQApplication::clipboard()->data(TQClipboard::Clipboard)->format(i) << endl; */ } else { @@ -705,9 +705,9 @@ tristate KexiCSVImportDialog::loadRows(TQString &field, int &row, int &column, i if (x == '\r') { continue; // eat '\r', to handle RFC-compliant files } - if (offset==0 && x.tqunicode()==0xfeff) { + if (offset==0 && x.unicode()==0xfeff) { // Ignore BOM, the "Byte Order Mark" - // (http://en.wikipedia.org/wiki/Byte_Order_Mark, // http://www.tqunicode.org/charts/PDF/UFFF0.pdf) + // (http://en.wikipedia.org/wiki/Byte_Order_Mark, // http://www.unicode.org/charts/PDF/UFFF0.pdf) // Probably fixed in TQt4. continue; } diff --git a/kexi/plugins/importexport/csv/kexicsvwidgets.h b/kexi/plugins/importexport/csv/kexicsvwidgets.h index 3c420c7a..76f76d31 100644 --- a/kexi/plugins/importexport/csv/kexicsvwidgets.h +++ b/kexi/plugins/importexport/csv/kexicsvwidgets.h @@ -46,7 +46,7 @@ class KexiCSVInfoLabel : public TQWidget setFileName() can be used to display filename and setCommentAfterFileName() to display additional comment. - The widget's tqlayout can look like this: + The widget's layout can look like this: \pre [icon] [labeltext] [filename] [comment] */ diff --git a/kexi/plugins/macros/kexipart/keximacrodesignview.cpp b/kexi/plugins/macros/kexipart/keximacrodesignview.cpp index 2f6ee825..5406e8ca 100644 --- a/kexi/plugins/macros/kexipart/keximacrodesignview.cpp +++ b/kexi/plugins/macros/kexipart/keximacrodesignview.cpp @@ -158,9 +158,9 @@ KexiMacroDesignView::KexiMacroDesignView(KexiMainWindow *mainwin, TQWidget *pare ) ); // Create the tableview. - TQHBoxLayout* tqlayout = new TQHBoxLayout(this); + TQHBoxLayout* layout = new TQHBoxLayout(this); d->datatable = new KexiDataTable(mainWin(), this, "Macro KexiDataTable", false /*not db aware*/); - tqlayout->addWidget(d->datatable); + layout->addWidget(d->datatable); d->tableview = d->datatable->tableView(); d->tableview->setSpreadSheetMode(); d->tableview->setColumnStretchEnabled( true, COLUMN_ID_COMMENT ); //last column occupies the rest of the area diff --git a/kexi/plugins/macros/kexipart/keximacroerrorbase.ui b/kexi/plugins/macros/kexipart/keximacroerrorbase.ui index 26bd964d..05d7ba72 100644 --- a/kexi/plugins/macros/kexipart/keximacroerrorbase.ui +++ b/kexi/plugins/macros/kexipart/keximacroerrorbase.ui @@ -27,7 +27,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <vbox> <property name="name"> @@ -35,7 +35,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -154,7 +154,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> diff --git a/kexi/plugins/macros/kexipart/keximacroproperty.cpp b/kexi/plugins/macros/kexipart/keximacroproperty.cpp index e3599b22..489640a2 100644 --- a/kexi/plugins/macros/kexipart/keximacroproperty.cpp +++ b/kexi/plugins/macros/kexipart/keximacroproperty.cpp @@ -349,7 +349,7 @@ class EditListBoxItem : public ListBoxItem Q_ASSERT( m_widget != 0 ); //m_widget->reparent(listBox()->viewport(), 0, TQPoint(0,0)); m_widget->reparent(listBox(), 0, TQPoint(1,1)); - //tqlayout->addWidget(m_widget, 1); + //layout->addWidget(m_widget, 1); m_widget->setMinimumHeight(5); m_widget->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); } @@ -507,7 +507,7 @@ KexiMacroPropertyWidget::KexiMacroPropertyWidget(KoProperty::Property* property, { kdDebug() << "KexiMacroPropertyWidget::KexiMacroPropertyWidget() Ctor" << endl; - TQHBoxLayout* tqlayout = new TQHBoxLayout(this, 0, 0); + TQHBoxLayout* layout = new TQHBoxLayout(this, 0, 0); d->macroproperty = dynamic_cast<KexiMacroProperty*>( property->customProperty() ); if(! d->macroproperty) { @@ -516,7 +516,7 @@ KexiMacroPropertyWidget::KexiMacroPropertyWidget(KoProperty::Property* property, } d->combobox = new KComboBox(this); - tqlayout->addWidget(d->combobox); + layout->addWidget(d->combobox); d->listbox = new ListBox(d->combobox, d->macroproperty); d->combobox->setEditable(true); d->combobox->setListBox(d->listbox); diff --git a/kexi/plugins/macros/kexipart/keximacrotextview.cpp b/kexi/plugins/macros/kexipart/keximacrotextview.cpp index d7f3801e..540dcc39 100644 --- a/kexi/plugins/macros/kexipart/keximacrotextview.cpp +++ b/kexi/plugins/macros/kexipart/keximacrotextview.cpp @@ -45,11 +45,11 @@ KexiMacroTextView::KexiMacroTextView(KexiMainWindow *mainwin, TQWidget *parent, : KexiMacroView(mainwin, parent, macro, "KexiMacroTextView") , d( new Private() ) { - TQHBoxLayout* tqlayout = new TQHBoxLayout(this); + TQHBoxLayout* layout = new TQHBoxLayout(this); d->editor = new KTextEdit(this); d->editor->setTextFormat(TQt::PlainText); d->editor->setWordWrap(TQTextEdit::NoWrap); - tqlayout->addWidget(d->editor); + layout->addWidget(d->editor); connect(d->editor, TQT_SIGNAL(textChanged()), this, TQT_SLOT(editorChanged())); } diff --git a/kexi/plugins/queries/kexiaddparamwidget.ui b/kexi/plugins/queries/kexiaddparamwidget.ui index 080f8d08..01a3ee3c 100644 --- a/kexi/plugins/queries/kexiaddparamwidget.ui +++ b/kexi/plugins/queries/kexiaddparamwidget.ui @@ -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"> @@ -37,7 +37,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -82,7 +82,7 @@ </spacer> <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <vbox> <property name="name"> @@ -105,7 +105,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <vbox> <property name="name"> diff --git a/kexi/plugins/queries/kexiparameterlisteditor.ui b/kexi/plugins/queries/kexiparameterlisteditor.ui index e7526413..26b7d0f2 100644 --- a/kexi/plugins/queries/kexiparameterlisteditor.ui +++ b/kexi/plugins/queries/kexiparameterlisteditor.ui @@ -53,7 +53,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> diff --git a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp index cfd38e3a..1b4a3301 100644 --- a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp +++ b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp @@ -1074,7 +1074,7 @@ bool KexiQueryDesignerGuiEditor::loadLayout() // return false; // } if (xml.isEmpty()) { - //in a case when query tqlayout was not saved, build tqlayout by hand + //in a case when query layout was not saved, build layout by hand // -- dynamic cast because of a need for handling invalid queries // (as in KexiQueryDesignerGuiEditor::afterSwitchFrom()): KexiDB::QuerySchema * q = dynamic_cast<KexiDB::QuerySchema *>(parentDialog()->schemaData()); diff --git a/kexi/plugins/queries/kexiquerydesignerguieditor.h b/kexi/plugins/queries/kexiquerydesignerguieditor.h index 1102b1d9..f85125c6 100644 --- a/kexi/plugins/queries/kexiquerydesignerguieditor.h +++ b/kexi/plugins/queries/kexiquerydesignerguieditor.h @@ -134,10 +134,10 @@ class KexiQueryDesignerGuiEditor : public KexiViewBase void slotAboutConnectionRemove(KexiRelationViewConnection*); void slotTableFieldDoubleClicked( KexiDB::TableSchema* table, const TQString& fieldName ); - /*! Loads tqlayout of relation GUI diagram. */ + /*! Loads layout of relation GUI diagram. */ bool loadLayout(); - /*! Stores tqlayout of relation GUI diagram. */ + /*! Stores layout of relation GUI diagram. */ bool storeLayout(); void showTablesForQuery(KexiDB::QuerySchema *query); diff --git a/kexi/plugins/queries/kexiquerydesignersql.cpp b/kexi/plugins/queries/kexiquerydesignersql.cpp index 43353b84..5de13fe2 100644 --- a/kexi/plugins/queries/kexiquerydesignersql.cpp +++ b/kexi/plugins/queries/kexiquerydesignersql.cpp @@ -124,14 +124,14 @@ KexiQueryDesignerSQLView::KexiQueryDesignerSQLView(KexiMainWindow *mainWin, TQWi d->pixmapStatus->setFixedWidth(d->statusPixmapOk.width()*3/2); d->pixmapStatus->setAlignment(AlignHCenter | AlignTop); d->pixmapStatus->setMargin(d->statusPixmapOk.width()/4); - d->pixmapStatus->setPaletteBackgroundColor( tqpalette().active().color(TQColorGroup::Base) ); + d->pixmapStatus->setPaletteBackgroundColor( palette().active().color(TQColorGroup::Base) ); d->lblStatus = new TQLabel(d->status_hbox); d->lblStatus->setAlignment(AlignLeft | AlignTop | WordBreak); d->lblStatus->setMargin(d->statusPixmapOk.width()/4); d->lblStatus->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Expanding ); d->lblStatus->resize(d->lblStatus->width(),d->statusPixmapOk.width()*3); - d->lblStatus->setPaletteBackgroundColor( tqpalette().active().color(TQColorGroup::Base) ); + d->lblStatus->setPaletteBackgroundColor( palette().active().color(TQColorGroup::Base) ); TQHBoxLayout *b = new TQHBoxLayout(this); b->addWidget(d->splitter); @@ -449,7 +449,7 @@ KexiQueryDesignerSQLView::storeNewData(const KexiDB::SchemaData& sdata, bool &ca { Q_UNUSED( cancel ); - //here: we won't store query tqlayout: it will be recreated 'by hand' in GUI Query Editor + //here: we won't store query layout: it will be recreated 'by hand' in GUI Query Editor bool queryOK = slotCheckQuery(); bool ok = true; KexiDB::SchemaData* query = 0; diff --git a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp index e53e876c..4fea781e 100644 --- a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp +++ b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp @@ -180,7 +180,7 @@ KexiQueryDesignerSQLHistory::slotToClipboard() if(!m_selected) return; - TQApplication::tqclipboard()->setText(m_selected->statement(), TQClipboard::Clipboard); + TQApplication::clipboard()->setText(m_selected->statement(), TQClipboard::Clipboard); } void diff --git a/kexi/plugins/scripting/kexidb/kexidbdrivermanager.cpp b/kexi/plugins/scripting/kexidb/kexidbdrivermanager.cpp index 74723bc3..00b5a21d 100644 --- a/kexi/plugins/scripting/kexidb/kexidbdrivermanager.cpp +++ b/kexi/plugins/scripting/kexidb/kexidbdrivermanager.cpp @@ -139,7 +139,7 @@ KexiDBConnectionData* KexiDBDriverManager::createConnectionDataByFile(const TQSt data->password = config.readEntry("encryptedPassword"); uint len = data->password.length(); for (uint i=0; i<len; i++) - data->password[i] = TQChar( data->password[i].tqunicode() - 47 - i ); + data->password[i] = TQChar( data->password[i].unicode() - 47 - i ); } if(data->password.isEmpty()) data->password = config.readEntry("password"); diff --git a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp index ed3b99e2..d44c59b9 100644 --- a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp +++ b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp @@ -73,8 +73,8 @@ KexiScriptDesignView::KexiScriptDesignView(KexiMainWindow *mainWin, TQWidget *pa TQSplitter* splitter = new TQSplitter(this); splitter->setOrientation(Qt::Vertical); - TQHBoxLayout* tqlayout = new TQHBoxLayout(this); - tqlayout->addWidget(splitter); + TQHBoxLayout* layout = new TQHBoxLayout(this); + layout->addWidget(splitter); d->editor = new KexiScriptEditor(mainWin, splitter, "ScriptEditor"); splitter->setFocusProxy(d->editor); diff --git a/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py b/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py index 6f75bdea..f244ae39 100644 --- a/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py +++ b/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py @@ -93,10 +93,10 @@ def runGuiApp(copycenter, name): qt.QDialog.__init__(self, parent, "ProgressDialog", 1) self.parent = parent self.setCaption(caption) - tqlayout = qt.QVBoxLayout(self) + layout = qt.QVBoxLayout(self) box = qt.QVBox(self) box.setMargin(2) - tqlayout.addWidget(box) + layout.addWidget(box) self.listview = qt.QListView(box) self.listview.setAllColumnsShowFocus(True) self.listview.header().setStretchEnabled(True,0) @@ -216,7 +216,7 @@ def runGuiApp(copycenter, name): print "CopyJobWidget.writeOptions" writer.write("<%s plugin=\"%s\">\n" % (plugininst.plugintype, pluginname)) for optionname in plugininst.options: - value = self.escape( tqunicode(plugininst.options[optionname]).encode("utf-8") ) + value = self.escape( unicode(plugininst.options[optionname]).encode("utf-8") ) writer.write("\t<%s value=\"%s\" />\n" % (optionname,value)) writer.write("</%s>\n" % plugininst.plugintype) @@ -309,31 +309,31 @@ def runGuiApp(copycenter, name): self.starttime = None qt.QDialog.__init__(self, dialog, "ProgressDialog", 1) self.setCaption("Copying...") - tqlayout = qt.QVBoxLayout(self) + layout = qt.QVBoxLayout(self) box = qt.QVBox(self) box.setSpacing(6) box.setMargin(6) - tqlayout.addWidget(box) + layout.addWidget(box) self.textbrowser = qt.QTextBrowser(box) self.textbrowser.setWordWrap(qt.QTextEdit.WidgetWidth) self.textbrowser.setTextFormat(qt.Qt.RichText) statusbox = qt.QFrame(box) - tqlayout = qt.QGridLayout(statusbox,4,2,0,2) - tqlayout.addWidget(qt.QLabel("Number of records done:",statusbox),0,0) + layout = qt.QGridLayout(statusbox,4,2,0,2) + layout.addWidget(qt.QLabel("Number of records done:",statusbox),0,0) self.donecounter = 0 self.donelabel = qt.QLabel("-",statusbox) - tqlayout.addWidget(self.donelabel,0,1) - tqlayout.addWidget(qt.QLabel("Successfully copied records:",statusbox),1,0) + layout.addWidget(self.donelabel,0,1) + layout.addWidget(qt.QLabel("Successfully copied records:",statusbox),1,0) self.successcounter = 0 self.successlabel = qt.QLabel("-",statusbox) - tqlayout.addWidget(self.successlabel,1,1) - tqlayout.addWidget(qt.QLabel("Failed to copy records:",statusbox),2,0) + layout.addWidget(self.successlabel,1,1) + layout.addWidget(qt.QLabel("Failed to copy records:",statusbox),2,0) self.failedcounter = 0 self.failedlabel = qt.QLabel("-",statusbox) - tqlayout.addWidget(self.failedlabel,2,1) - tqlayout.addWidget(qt.QLabel("Elapsed time in seconds:",statusbox),3,0) + layout.addWidget(self.failedlabel,2,1) + layout.addWidget(qt.QLabel("Elapsed time in seconds:",statusbox),3,0) self.elapsedlabel = qt.QLabel("-",statusbox) - tqlayout.addWidget(self.elapsedlabel,3,1) + layout.addWidget(self.elapsedlabel,3,1) btnbox = qt.QHBox(box) btnbox.setSpacing(6) self.donebtn = qt.QPushButton(btnbox) @@ -530,11 +530,11 @@ def runGuiApp(copycenter, name): self.ListViewDialog = ListViewDialog qt.QDialog.__init__(self, parent, "Dialog", 1, qt.Qt.WDestructiveClose) self.setCaption("Copy Center") - tqlayout = qt.QVBoxLayout(self) + layout = qt.QVBoxLayout(self) box = qt.QVBox(self) box.setMargin(6) box.setSpacing(6) - tqlayout.addWidget(box) + layout.addWidget(box) self.tab = qt.QTabWidget(box) self.tab.setMargin(6) box.setStretchFactor(self.tab,1) diff --git a/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginQtSQL.py b/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginQtSQL.py index 678cf40b..985d757d 100644 --- a/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginQtSQL.py +++ b/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginQtSQL.py @@ -84,7 +84,7 @@ class CopyCenterPlugin: return None record = [] for fieldname in self.fieldlist: - record.append( tqunicode(self.cursor.value(fieldname).toString()).encode("latin-1") ) + record.append( unicode(self.cursor.value(fieldname).toString()).encode("latin-1") ) #print "read record: %s" % record return record @@ -145,8 +145,8 @@ class CopyCenterPlugin: cursorrecord.setValue(self.fieldlist[i], v) rowcount = self.cursor.insert() if rowcount < 1: - drv = tqunicode(self.cursor.lastError().driverText()).encode("latin-1") - db = tqunicode(self.cursor.lastError().databaseText()).encode("latin-1") + drv = unicode(self.cursor.lastError().driverText()).encode("latin-1") + db = unicode(self.cursor.lastError().databaseText()).encode("latin-1") print "failed: %s %s" % (drv,db) self.copierer.writeFailed(record) else: diff --git a/kexi/plugins/scripting/scripts/importxhtml/ImportXHTML.py b/kexi/plugins/scripting/scripts/importxhtml/ImportXHTML.py index 6ca94f9a..200b3dee 100755 --- a/kexi/plugins/scripting/scripts/importxhtml/ImportXHTML.py +++ b/kexi/plugins/scripting/scripts/importxhtml/ImportXHTML.py @@ -124,9 +124,9 @@ class SaxInput: was parsed. """ if self.field != None: - # the xml-data is tqunicode and we need to encode it + # the xml-data is unicode and we need to encode it # to latin-1 cause KexiDB deals only with latin-1. - u = tqunicode(chars[offset:offset+length]) + u = unicode(chars[offset:offset+length]) self.field.append(u.encode("latin-1")) # start the job diff --git a/kexi/tests/altertable/altertable.cpp b/kexi/tests/altertable/altertable.cpp index 0155ed87..55cd5a1c 100644 --- a/kexi/tests/altertable/altertable.cpp +++ b/kexi/tests/altertable/altertable.cpp @@ -296,7 +296,7 @@ bool AlterTableTester::showSchema(KexiDialogBase* dlg, bool copyToClipboard) if (!getSchemaDump(dlg, schemaDebugString)) return false; if (copyToClipboard) - TQApplication::tqclipboard()->setText( schemaDebugString ); + TQApplication::clipboard()->setText( schemaDebugString ); else kdDebug() << TQString("Schema for '%1' table:\n").arg(dlg->partItem()->name()) + schemaDebugString + "\nendSchema" << endl; @@ -379,7 +379,7 @@ bool AlterTableTester::showActions(KexiDialogBase* dlg, bool copyToClipboard) if (!getActionsDump(dlg, actionsDebugString)) return false; if (copyToClipboard) - TQApplication::tqclipboard()->setText( actionsDebugString ); + TQApplication::clipboard()->setText( actionsDebugString ); else kdDebug() << TQString("Simplified actions for altering table '%1':\n").arg(dlg->partItem()->name()) + actionsDebugString+"\n" << endl; @@ -439,7 +439,7 @@ bool AlterTableTester::showTableData(KexiDialogBase* dlg, bool copyToClipboard) if (!getTableDataDump(dlg, dataString)) return false; if (copyToClipboard) - TQApplication::tqclipboard()->setText( dataString ); + TQApplication::clipboard()->setText( dataString ); else kdDebug() << TQString("Contents of table '%1':\n").arg(dlg->partItem()->name())+dataString+"\n" << endl; return true; diff --git a/kexi/tests/gui/finddialog/kexifinddialogbase.ui b/kexi/tests/gui/finddialog/kexifinddialogbase.ui index a5ece575..bf5fcd32 100644 --- a/kexi/tests/gui/finddialog/kexifinddialogbase.ui +++ b/kexi/tests/gui/finddialog/kexifinddialogbase.ui @@ -231,7 +231,7 @@ </spacer> <widget class="TQLayoutWidget" row="0" column="4" rowspan="8" colspan="1"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <vbox> <property name="name"> diff --git a/kexi/widget/kexidbconnectionwidget.cpp b/kexi/widget/kexidbconnectionwidget.cpp index 1f9006fd..aabd7cc2 100644 --- a/kexi/widget/kexidbconnectionwidget.cpp +++ b/kexi/widget/kexidbconnectionwidget.cpp @@ -225,7 +225,7 @@ KexiDBConnectionTabWidget::KexiDBConnectionTabWidget( TQWidget* parent, const ch : KTabWidget( parent, name ) { mainWidget = new KexiDBConnectionWidget( this, "mainWidget" ); - mainWidget->tqlayout()->setMargin(KDialog::marginHint()); + mainWidget->layout()->setMargin(KDialog::marginHint()); addTab( mainWidget, i18n("Parameters") ); // TQVBox *page2 = new TQVBox(this); diff --git a/kexi/widget/kexidbconnectionwidgetbase.ui b/kexi/widget/kexidbconnectionwidgetbase.ui index 02fe2853..d121f1b7 100644 --- a/kexi/widget/kexidbconnectionwidgetbase.ui +++ b/kexi/widget/kexidbconnectionwidgetbase.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0" rowspan="3" colspan="1"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <vbox> <property name="name"> @@ -395,7 +395,7 @@ </widget> <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> diff --git a/kexi/widget/kexidbconnectionwidgetdetailsbase.ui b/kexi/widget/kexidbconnectionwidgetdetailsbase.ui index 74b4326d..46d2dfac 100644 --- a/kexi/widget/kexidbconnectionwidgetdetailsbase.ui +++ b/kexi/widget/kexidbconnectionwidgetdetailsbase.ui @@ -18,7 +18,7 @@ </property> <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <grid> <property name="name"> @@ -40,7 +40,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -125,7 +125,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <grid> <property name="name"> diff --git a/kexi/widget/kexieditor.cpp b/kexi/widget/kexieditor.cpp index 07627f32..121ee8dd 100644 --- a/kexi/widget/kexieditor.cpp +++ b/kexi/widget/kexieditor.cpp @@ -85,7 +85,7 @@ KexiEditor::KexiEditor(KexiMainWindow *mainWin, TQWidget *parent, const char *na : KexiViewBase(mainWin, parent, name) , d(new KexiEditorPrivate()) { - TQVBoxLayout *tqlayout = new TQVBoxLayout(this); + TQVBoxLayout *layout = new TQVBoxLayout(this); #ifdef KTEXTEDIT_BASED_SQL_EDITOR d->view = new KTextEdit( "", TQString(), this, "kexi_editor" ); //adjust font @@ -98,9 +98,9 @@ KexiEditor::KexiEditor(KexiMainWindow *mainWin, TQWidget *parent, const char *na #else TQFrame *fr = new TQFrame(this); fr->setFrameStyle(TQFrame::Sunken|TQFrame::WinPanel); - tqlayout->addWidget(fr); - tqlayout = new TQVBoxLayout(fr); - tqlayout->setMargin( 2 ); + layout->addWidget(fr); + layout = new TQVBoxLayout(fr); + layout->setMargin( 2 ); d->doc = KTextEditor::EditorChooser::createDocument(TQT_TQOBJECT(fr)); if (!d->doc) @@ -121,7 +121,7 @@ KexiEditor::KexiEditor(KexiMainWindow *mainWin, TQWidget *parent, const char *na KexiEditorSharedActionConnector c(this, TQT_TQOBJECT(d->view)); d->view->installEventFilter(this); - tqlayout->addWidget(d->view); + layout->addWidget(d->view); setViewWidget(d->view, true/*focus*/); d->view->show(); } diff --git a/kexi/widget/kexiscrollview.cpp b/kexi/widget/kexiscrollview.cpp index 04beace6..ba4c8f9e 100644 --- a/kexi/widget/kexiscrollview.cpp +++ b/kexi/widget/kexiscrollview.cpp @@ -53,7 +53,7 @@ KexiScrollView::KexiScrollView(TQWidget *parent, bool preview) { setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken); viewport()->setPaletteBackgroundColor(colorGroup().mid()); - TQColor fc = tqpalette().active().foreground(), + TQColor fc = palette().active().foreground(), bc = viewport()->paletteBackgroundColor(); m_helpColor = KexiUtils::blendedColors(fc, bc, 1, 2); // m_helpColor = TQColor((fc.red()+bc.red()*2)/3, (fc.green()+bc.green()*2)/3, @@ -345,7 +345,7 @@ KexiScrollView::drawContents( TQPainter * p, int clipx, int clipy, int clipw, in //draw right and bottom borders const int wx = childX(m_widget); const int wy = childY(m_widget); - p->setPen(tqpalette().active().foreground()); + p->setPen(palette().active().foreground()); p->drawLine(wx+m_widget->width(), wy, wx+m_widget->width(), wy+m_widget->height()); p->drawLine(wx, wy+m_widget->height(), wx+m_widget->width(), wy+m_widget->height()); //kdDebug() << "KexiScrollView::drawContents() " << wy+m_widget->height() << endl; diff --git a/kexi/widget/kexisectionheader.cpp b/kexi/widget/kexisectionheader.cpp index 65286fbd..cbd48e84 100644 --- a/kexi/widget/kexisectionheader.cpp +++ b/kexi/widget/kexisectionheader.cpp @@ -115,9 +115,9 @@ void KexiSectionHeader::slotFocus(bool in) { in = in || focusWidget()==this; d->lbl->setPaletteBackgroundColor( - in ? tqpalette().active().color(TQColorGroup::Highlight) : tqpalette().active().color(TQColorGroup::Background) ); + in ? palette().active().color(TQColorGroup::Highlight) : palette().active().color(TQColorGroup::Background) ); d->lbl->setPaletteForegroundColor( - in ? tqpalette().active().color(TQColorGroup::HighlightedText) : tqpalette().active().color(TQColorGroup::Foreground) ); + in ? palette().active().color(TQColorGroup::HighlightedText) : palette().active().color(TQColorGroup::Foreground) ); } TQSize KexiSectionHeader::sizeHint() const diff --git a/kexi/widget/kexismalltoolbutton.cpp b/kexi/widget/kexismalltoolbutton.cpp index 237130f2..ab703923 100644 --- a/kexi/widget/kexismalltoolbutton.cpp +++ b/kexi/widget/kexismalltoolbutton.cpp @@ -70,7 +70,7 @@ void KexiSmallToolButton::updateAction() void KexiSmallToolButton::init() { - setPaletteBackgroundColor(tqpalette().active().background()); + setPaletteBackgroundColor(palette().active().background()); setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred); TQFont f(KGlobalSettings::toolBarFont()); f.setPixelSize(Kexi::smallFont().pixelSize()); @@ -124,7 +124,7 @@ void KexiSmallToolButton::drawButton( TQPainter *_painter ) arrowFlags |= TQStyle::Style_Down; if (isEnabled()) arrowFlags |= TQStyle::Style_Enabled; - tqstyle().tqdrawPrimitive(TQStyle::PE_ArrowDown, _painter, + style().tqdrawPrimitive(TQStyle::PE_ArrowDown, _painter, TQRect(width()-7, height()-7, 5, 5), colorGroup(), arrowFlags, TQStyleOption() ); } diff --git a/kexi/widget/pixmapcollection.cpp b/kexi/widget/pixmapcollection.cpp index cee4f360..c03d16e2 100644 --- a/kexi/widget/pixmapcollection.cpp +++ b/kexi/widget/pixmapcollection.cpp @@ -240,28 +240,28 @@ PixmapCollectionEditor::PixmapCollectionEditor(PixmapCollection *collection, TQW setInitialSize(TQSize(400, 200), true); //// Setup the icon toolbar ///////////////// - TQVBoxLayout *vtqlayout = new TQVBoxLayout(l, 3); + TQVBoxLayout *vlayout = new TQVBoxLayout(l, 3); TQToolButton *newItemPath = new TQToolButton(frame); newItemPath->setIconSet(BarIconSet("fileopen")); newItemPath->setTextLabel(i18n("&Add File"), true); - vtqlayout->addWidget(newItemPath); + vlayout->addWidget(newItemPath); m_buttons.insert(BNewItemPath, newItemPath); connect(newItemPath, TQT_SIGNAL(clicked()), this, TQT_SLOT(newItemByPath())); TQToolButton *newItemName = new TQToolButton(frame); newItemName->setIconSet(BarIconSet("icons")); newItemName->setTextLabel(i18n("&Add an Icon"), true); - vtqlayout->addWidget(newItemName); + vlayout->addWidget(newItemName); m_buttons.insert(BNewItemName, newItemName); connect(newItemName, TQT_SIGNAL(clicked()), this, TQT_SLOT(newItemByName())); TQToolButton *delItem = new TQToolButton(frame); delItem->setIconSet(BarIconSet("edit_remove")); delItem->setTextLabel(i18n("&Remove Selected Item"), true); - vtqlayout->addWidget(delItem); + vlayout->addWidget(delItem); m_buttons.insert(BDelItem, delItem); connect(delItem, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeItem())); - vtqlayout->addStretch(); + vlayout->addStretch(); // Setup the iconView m_iconView = new KIconView(frame, "pixcollection_iconView"); diff --git a/kexi/widget/relations/kexirelationviewconnection.cpp b/kexi/widget/relations/kexirelationviewconnection.cpp index ab3f1ac4..fe3b5a53 100644 --- a/kexi/widget/relations/kexirelationviewconnection.cpp +++ b/kexi/widget/relations/kexirelationviewconnection.cpp @@ -67,7 +67,7 @@ KexiRelationViewConnection::~KexiRelationViewConnection() void KexiRelationViewConnection::drawConnection(TQPainter *p) { - p->setPen(m_parent->tqpalette().active().foreground()); + p->setPen(m_parent->palette().active().foreground()); int sx = m_masterTable->x() + m_masterTable->width() + m_parent->contentsX(); int sy = m_masterTable->globalY(m_masterField); int rx = m_detailsTable->x() + m_parent->contentsX(); diff --git a/kexi/widget/relations/kexirelationviewtable.cpp b/kexi/widget/relations/kexirelationviewtable.cpp index b40b9761..ce94a809 100644 --- a/kexi/widget/relations/kexirelationviewtable.cpp +++ b/kexi/widget/relations/kexirelationviewtable.cpp @@ -420,7 +420,7 @@ void KexiRelationViewTable::contentsMousePressEvent(TQMouseEvent *ev) TQRect KexiRelationViewTable::drawItemHighlighter(TQPainter *painter, TQListViewItem *item) { if (painter) { - tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, painter, itemRect(item), colorGroup(), + style().tqdrawPrimitive(TQStyle::PE_FocusRect, painter, itemRect(item), colorGroup(), TQStyle::Style_FocusAtBorder); } return itemRect(item); diff --git a/kexi/widget/tableview/kexiblobtableedit.cpp b/kexi/widget/tableview/kexiblobtableedit.cpp index c818606d..1218a978 100644 --- a/kexi/widget/tableview/kexiblobtableedit.cpp +++ b/kexi/widget/tableview/kexiblobtableedit.cpp @@ -309,14 +309,14 @@ void KexiBlobTableEdit::executeCopyAction(const TQByteArray& data) TQPixmap pixmap; if (!pixmap.loadFromData(data)) return; - tqApp->tqclipboard()->setPixmap(pixmap, TQClipboard::Clipboard); + tqApp->clipboard()->setPixmap(pixmap, TQClipboard::Clipboard); } void KexiBlobTableEdit::handlePasteAction() { if (isReadOnly()) return; - TQPixmap pm( tqApp->tqclipboard()->pixmap(TQClipboard::Clipboard) ); + TQPixmap pm( tqApp->clipboard()->pixmap(TQClipboard::Clipboard) ); TQByteArray ba; TQBuffer buffer( ba ); buffer.open( IO_WriteOnly ); diff --git a/kexi/widget/tableview/kexibooltableedit.cpp b/kexi/widget/tableview/kexibooltableedit.cpp index c0753269..c4067dfd 100644 --- a/kexi/widget/tableview/kexibooltableedit.cpp +++ b/kexi/widget/tableview/kexibooltableedit.cpp @@ -135,7 +135,7 @@ void KexiBoolTableEdit::handleAction(const TQString& actionName) if (actionName=="edit_paste") { emit editRequested(); bool ok; - const int value = tqApp->tqclipboard()->text( TQClipboard::Clipboard ).toInt(&ok); + const int value = tqApp->clipboard()->text( TQClipboard::Clipboard ).toInt(&ok); if (ok) { m_currentValue = (value==0) ? TQVariant(false, 0) : TQVariant(true, 1); } diff --git a/kexi/widget/tableview/kexicomboboxtableedit.cpp b/kexi/widget/tableview/kexicomboboxtableedit.cpp index f45eb0e2..308e565e 100644 --- a/kexi/widget/tableview/kexicomboboxtableedit.cpp +++ b/kexi/widget/tableview/kexicomboboxtableedit.cpp @@ -84,7 +84,7 @@ KexiComboBoxTableEdit::KexiComboBoxTableEdit(KexiTableViewColumn &column, TQWidg // } // setView( m_lineedit ); -// tqlayout->addWidget(m_view); +// layout->addWidget(m_view); // m_combo->setEditable( true ); // m_combo->clear(); // m_combo->insertStringList(f.enumHints()); @@ -434,7 +434,7 @@ void KexiComboBoxTableEdit::handleAction(const TQString& actionName) m_lineedit->clear(); } //! @todo does not work with BLOBs! - setValueInInternalEditor( tqApp->tqclipboard()->text() ); + setValueInInternalEditor( tqApp->clipboard()->text() ); } else KexiInputTableEdit::handleAction(actionName); diff --git a/kexi/widget/tableview/kexitableedit.cpp b/kexi/widget/tableview/kexitableedit.cpp index e531b814..b082bd95 100644 --- a/kexi/widget/tableview/kexitableedit.cpp +++ b/kexi/widget/tableview/kexitableedit.cpp @@ -101,7 +101,7 @@ void KexiTableEdit::resize(int w, int h) { TQWidget::resize(w, h); if (m_view) { - if (!tqlayout()) { //if there is tqlayout (eg. KexiInputTableEdit), resize is automatic + if (!layout()) { //if there is layout (eg. KexiInputTableEdit), resize is automatic m_view->move(0,0); m_view->resize(w, h); } diff --git a/kexi/widget/tableview/kexitableview.h b/kexi/widget/tableview/kexitableview.h index fc488c83..b602168a 100644 --- a/kexi/widget/tableview/kexitableview.h +++ b/kexi/widget/tableview/kexitableview.h @@ -504,7 +504,7 @@ protected: *value is set to the default value. */ bool isDefaultValueDisplayed(KexiTableItem *item, int col, TQVariant* value = 0); - //! painting and tqlayout + //! painting and layout void drawContents(TQPainter *p, int cx, int cy, int cw, int ch); void createBuffer(int width, int height); void paintCell(TQPainter* p, KexiTableItem *item, int col, int row, const TQRect &cr, bool print=false); diff --git a/kexi/widget/tableview/kexitableviewdata.cpp b/kexi/widget/tableview/kexitableviewdata.cpp index 6a15b0db..a4e45daf 100644 --- a/kexi/widget/tableview/kexitableviewdata.cpp +++ b/kexi/widget/tableview/kexitableviewdata.cpp @@ -509,8 +509,8 @@ int KexiTableViewData::cmpStr(Item item1, Item item2) const TQString &as = m_leftTmp.toString(); const TQString &bs = m_rightTmp.toString(); - const TQChar *a = as.tqunicode(); - const TQChar *b = bs.tqunicode(); + const TQChar *a = as.unicode(); + const TQChar *b = bs.unicode(); if ( a == b ) return 0; @@ -524,16 +524,16 @@ int KexiTableViewData::cmpStr(Item item1, Item item2) int l=TQMIN(as.length(),bs.length()); - au = a->tqunicode(); - bu = b->tqunicode(); + au = a->unicode(); + bu = b->unicode(); au = (au <= 0x17e ? charTable[au] : 0xffff); bu = (bu <= 0x17e ? charTable[bu] : 0xffff); while (l-- && au == bu) { a++,b++; - au = a->tqunicode(); - bu = b->tqunicode(); + au = a->unicode(); + bu = b->unicode(); au = (au <= 0x17e ? charTable[au] : 0xffff); bu = (bu <= 0x17e ? charTable[bu] : 0xffff); } diff --git a/kexi/widget/tableview/kexitableviewheader.cpp b/kexi/widget/tableview/kexitableviewheader.cpp index d217337b..cab7f791 100644 --- a/kexi/widget/tableview/kexitableviewheader.cpp +++ b/kexi/widget/tableview/kexitableviewheader.cpp @@ -34,7 +34,7 @@ class KexiTableViewHeaderStyle : public KexiUtils::StyleProxy KexiTableViewHeaderStyle(TQStyle *parentStyle, TQWidget *widget) : KexiUtils::StyleProxy(parentStyle) { - setBackgroundColor( widget->tqpalette().active().background() ); + setBackgroundColor( widget->palette().active().background() ); } ~KexiTableViewHeaderStyle() {} @@ -65,7 +65,7 @@ KexiTableViewHeader::KexiTableViewHeader(TQWidget * parent, const char * name) , m_selectedSection(-1) , m_styleChangeEnabled(true) { - styleChange( tqstyle() ); + styleChange( style() ); installEventFilter(this); connect(this, TQT_SIGNAL(sizeChange(int,int,int)), this, TQT_SLOT(slotSizeChange(int,int,int))); @@ -81,7 +81,7 @@ void KexiTableViewHeader::styleChange( TQStyle& oldStyle ) if (!m_styleChangeEnabled) return; m_styleChangeEnabled = false; - setStyle( new KexiTableViewHeaderStyle(&tqApp->tqstyle(), this) ); + setStyle( new KexiTableViewHeaderStyle(&tqApp->style(), this) ); m_styleChangeEnabled = true; } @@ -126,7 +126,7 @@ bool KexiTableViewHeader::eventFilter(TQObject * watched, TQEvent * e) TQString tip = m_toolTips[ section ]; if (tip.isEmpty()) { //try label TQFontMetrics fm(font()); - int minWidth = fm.width( label( section ) ) + tqstyle().pixelMetric( TQStyle::PM_HeaderMargin ); + int minWidth = fm.width( label( section ) ) + style().pixelMetric( TQStyle::PM_HeaderMargin ); TQIconSet *iset = iconSet( section ); if (iset) minWidth += (2+iset->pixmap( TQIconSet::Small, TQIconSet::Normal ).width()); //taken from TQHeader::sectionSizeHint() @@ -186,16 +186,16 @@ void KexiTableViewHeader::paintSection( TQPainter * p, int index, const TQRect & { const bool paintSelection = index==m_selectedSection && index != -1; if (paintSelection) { - static_cast<KexiTableViewHeaderStyle&>(tqstyle()).setBackgroundColor( + static_cast<KexiTableViewHeaderStyle&>(style()).setBackgroundColor( KexiUtils::blendedColors( - tqpalette().active().background(), m_selectionBackgroundColor, 2, 1) ); + palette().active().background(), m_selectionBackgroundColor, 2, 1) ); } TQHeader::paintSection( p, index, fr ); if (paintSelection) { //revert the color for subsequent paints - static_cast<KexiTableViewHeaderStyle&>(tqstyle()).setBackgroundColor( - tqpalette().active().background()); + static_cast<KexiTableViewHeaderStyle&>(style()).setBackgroundColor( + palette().active().background()); } } diff --git a/kexi/widget/utils/kexiarrowtip.cpp b/kexi/widget/utils/kexiarrowtip.cpp index fa5c35ab..6279aa04 100644 --- a/kexi/widget/utils/kexiarrowtip.cpp +++ b/kexi/widget/utils/kexiarrowtip.cpp @@ -117,14 +117,14 @@ bool KexiArrowTip::close ( bool alsoDelete ) void KexiArrowTip::drawContents(TQPainter& p) { - p.setPen( TQPen(tqpalette().active().foreground(), 1) ); + p.setPen( TQPen(palette().active().foreground(), 1) ); p.drawText(TQRect(0,m_arrowHeight,width(),height()-m_arrowHeight), TQt::AlignCenter, m_value.toString()); } void KexiArrowTip::drawFrame(TQPainter& p) { - TQPen pen(tqpalette().active().foreground(), 1, Qt::SolidLine, Qt::SquareCap, Qt::MiterJoin); + TQPen pen(palette().active().foreground(), 1, Qt::SolidLine, Qt::SquareCap, Qt::MiterJoin); p.setPen( pen ); /* /\ diff --git a/kexi/widget/utils/kexicomboboxdropdownbutton.cpp b/kexi/widget/utils/kexicomboboxdropdownbutton.cpp index 60f99f85..5e0b7ab8 100644 --- a/kexi/widget/utils/kexicomboboxdropdownbutton.cpp +++ b/kexi/widget/utils/kexicomboboxdropdownbutton.cpp @@ -34,7 +34,7 @@ KexiComboBoxDropDownButton::KexiComboBoxDropDownButton( TQWidget *parent ) m_paintedCombo->setEditable(true); setToggleButton(true); - styleChange(tqstyle()); + styleChange(style()); m_paintedCombo->move(0,0); m_paintedCombo->setFixedSize(size()); } @@ -58,30 +58,30 @@ void KexiComboBoxDropDownButton::drawButton(TQPainter *p) m_paintedCombo->move(0,0); m_paintedCombo->setFixedSize(size()+TQSize(0, m_fixForHeight)); //last chance to fix size } - tqstyle().drawComplexControl( TQStyle::CC_ComboBox, p, + style().drawComplexControl( TQStyle::CC_ComboBox, p, m_fixForHeight>0 ? (const TQWidget*)m_paintedCombo : this, r, colorGroup(), flags, (uint)(TQStyle::SC_ComboBoxArrow), TQStyle::SC_None ); } else { r.setWidth(r.width()+2); - tqstyle().tqdrawPrimitive( TQStyle::PE_ArrowDown, p, r, colorGroup(), flags); + style().tqdrawPrimitive( TQStyle::PE_ArrowDown, p, r, colorGroup(), flags); } } void KexiComboBoxDropDownButton::styleChange( TQStyle & oldStyle ) { //<hack> - if (qstricmp(tqstyle().name(),"thinkeramik")==0) { + if (qstricmp(style().name(),"thinkeramik")==0) { m_fixForHeight = 3; } else m_fixForHeight = 0; //</hack> m_drawComplexControl = - (tqstyle().inherits("KStyle") && qstricmp(tqstyle().name(),"qtcurve")!=0) - || qstricmp(tqstyle().name(),"platinum")==0; + (style().inherits("KStyle") && qstricmp(style().name(),"qtcurve")!=0) + || qstricmp(style().name(),"platinum")==0; if (m_fixForHeight==0) - setFixedWidth( tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, + setFixedWidth( style().querySubControlMetrics( TQStyle::CC_ComboBox, (const TQWidget*)m_paintedCombo, TQStyle::SC_ComboBoxArrow ).width() +1 ); KPushButton::styleChange(oldStyle); } diff --git a/kexi/widget/utils/kexidisplayutils.cpp b/kexi/widget/utils/kexidisplayutils.cpp index 1943b086..0866cf65 100644 --- a/kexi/widget/utils/kexidisplayutils.cpp +++ b/kexi/widget/utils/kexidisplayutils.cpp @@ -92,7 +92,7 @@ KexiDisplayUtils::DisplayParameters::DisplayParameters() KexiDisplayUtils::DisplayParameters::DisplayParameters(TQWidget *w) { - textColor = w->tqpalette().active().foreground(); + textColor = w->palette().active().foreground(); selectedTextColor = w->tqpalette().active().highlightedText(); font = w->font(); } diff --git a/kexi/widget/utils/kexidropdownbutton.cpp b/kexi/widget/utils/kexidropdownbutton.cpp index 054192ce..0710b4d0 100644 --- a/kexi/widget/utils/kexidropdownbutton.cpp +++ b/kexi/widget/utils/kexidropdownbutton.cpp @@ -33,10 +33,10 @@ KexiDropDownButton::KexiDropDownButton(TQWidget *parent) // setFixedWidth(TQMAX(18, tqApp->globalStrut().width())); int fixedWidth; //hack - if (qstricmp(tqstyle().name(),"thinkeramik")==0) + if (qstricmp(style().name(),"thinkeramik")==0) fixedWidth = 18; //typical width as in "windows" style else - fixedWidth = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, + fixedWidth = style().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxArrow ).width(); setFixedWidth( fixedWidth ); setPopupDelay(10/*ms*/); @@ -54,7 +54,7 @@ void KexiDropDownButton::drawButton( TQPainter *p ) arrowFlags |= TQStyle::Style_Down; if (isEnabled()) arrowFlags |= TQStyle::Style_Enabled; - tqstyle().tqdrawPrimitive(TQStyle::PE_ArrowDown, p, + style().tqdrawPrimitive(TQStyle::PE_ArrowDown, p, TQRect((width()-7)/2, height()-9, 7, 7), colorGroup(), arrowFlags, TQStyleOption() ); } diff --git a/kexi/widget/utils/kexiflowlayout.cpp b/kexi/widget/utils/kexiflowlayout.cpp index f6868a5e..e2397ede 100644 --- a/kexi/widget/utils/kexiflowlayout.cpp +++ b/kexi/widget/utils/kexiflowlayout.cpp @@ -64,7 +64,7 @@ KexiFlowLayoutIterator::takeCurrent() return (m_idx < (int)count()) ? m_list->take(m_idx) : 0; } -//// The tqlayout itself +//// The layout itself KexiFlowLayout::KexiFlowLayout(TQWidget *parent, int border, int space, const char *name) : TQLayout(parent, border, space, name) @@ -182,8 +182,8 @@ KexiFlowLayout::sizeHint() const TQSize KexiFlowLayout::minimumSize() const { -//js: do we really need to simulate tqlayout here? -// I commented this out because it was impossible to stretch tqlayout conveniently. +//js: do we really need to simulate layout here? +// I commented this out because it was impossible to stretch layout conveniently. // Now, minimum size is computed automatically based on item's minimumSize... #if 0 if(m_cached_minSize.isEmpty()) { @@ -246,7 +246,7 @@ KexiFlowLayout::doHorizontalLayout(const TQRect &r, bool testOnly) // kdDebug() << "- doHorizontalLayout(): " << o->widget()->className() << " " << o->widget()->name() << endl; TQSize oSizeHint = o->sizeHint(); // we cache these ones because it can take a while to get it (eg for child layouts) if ((x + oSizeHint.width()) > r.right() && h > 0) { - // do the tqlayout of current line + // do the layout of current line TQPtrListIterator<TQLayoutItem> it2(currentLine); TQLayoutItem *item; int wx = r.x(); @@ -298,7 +298,7 @@ KexiFlowLayout::doHorizontalLayout(const TQRect &r, bool testOnly) ++it; } - // don't forget to tqlayout the last line + // don't forget to layout the last line TQPtrListIterator<TQLayoutItem> it2(currentLine); TQLayoutItem *item; int wx = r.x(); @@ -362,7 +362,7 @@ KexiFlowLayout::doVerticalLayout(const TQRect &r, bool testOnly) TQSize oSizeHint = o->sizeHint(); // we cache these ones because it can take a while to get it (eg for child layouts) if (y + oSizeHint.height() > r.bottom() && w > 0) { - // do the tqlayout of current line + // do the layout of current line TQPtrListIterator<TQLayoutItem> it2(currentLine); TQLayoutItem *item; int wy = r.y(); @@ -414,7 +414,7 @@ KexiFlowLayout::doVerticalLayout(const TQRect &r, bool testOnly) ++it; } - // don't forget to tqlayout the last line + // don't forget to layout the last line TQPtrListIterator<TQLayoutItem> it2(currentLine); TQLayoutItem *item; int wy = r.y(); diff --git a/kexi/widget/utils/kexiflowlayout.h b/kexi/widget/utils/kexiflowlayout.h index aec6c6c3..c23398e0 100644 --- a/kexi/widget/utils/kexiflowlayout.h +++ b/kexi/widget/utils/kexiflowlayout.h @@ -23,7 +23,7 @@ #include <tqlayout.h> #include <tqptrlist.h> -//! @short a special "flow" tqlayout +//! @short a special "flow" layout class KEXIGUIUTILS_EXPORT KexiFlowLayout : public TQLayout { public: @@ -33,14 +33,14 @@ class KEXIGUIUTILS_EXPORT KexiFlowLayout : public TQLayout ~KexiFlowLayout(); - /*! \return the widgets in the order of the tqlayout, + /*! \return the widgets in the order of the layout, ie as it is stored in m_list. You must delete the list after using it. */ TQPtrList<TQWidget>* widgetList() const; - /*! Sets tqlayout's orientation to \a orientation. Default orientation isQt::Vertical. */ + /*! Sets layout's orientation to \a orientation. Default orientation isQt::Vertical. */ void setOrientation(Qt::Orientation orientation) { m_orientation = orientation; } - /*! \return tqlayout's orientation. */ + /*! \return layout's orientation. */ Qt::Orientation orientation() const { return m_orientation; } void setJustified(bool justify) { m_justify = justify; } diff --git a/kexi/widget/utils/kexirecordmarker.cpp b/kexi/widget/utils/kexirecordmarker.cpp index e3e281e3..a2d6b3d6 100644 --- a/kexi/widget/utils/kexirecordmarker.cpp +++ b/kexi/widget/utils/kexirecordmarker.cpp @@ -205,7 +205,7 @@ void KexiRecordMarker::paintEvent(TQPaintEvent *e) int y = ((d->rowHeight * i)-d->offset); TQRect r(0, y, width(), d->rowHeight); p.drawRect(r); - tqstyle().tqdrawPrimitive( TQStyle::PE_HeaderSection, &p, r, + style().tqdrawPrimitive( TQStyle::PE_HeaderSection, &p, r, (d->currentRow == i) ? selectedColorGroup : (d->highlightedRow == i ? highlightedColorGroup : colorGroup()), TQStyle::Style_Raised | (isEnabled() ? TQStyle::Style_Enabled : 0)); } diff --git a/kexi/widget/utils/kexitooltip.cpp b/kexi/widget/utils/kexitooltip.cpp index ad55774e..2a36ef09 100644 --- a/kexi/widget/utils/kexitooltip.cpp +++ b/kexi/widget/utils/kexitooltip.cpp @@ -64,7 +64,7 @@ void KexiToolTip::paintEvent( TQPaintEvent *pev ) void KexiToolTip::drawFrame(TQPainter& p) { - p.setPen( TQPen(tqpalette().active().foreground(), 1) ); + p.setPen( TQPen(palette().active().foreground(), 1) ); p.drawRect(rect()); } diff --git a/kformula/fsparser.cc b/kformula/fsparser.cc index 77a11819..863cc9eb 100644 --- a/kformula/fsparser.cc +++ b/kformula/fsparser.cc @@ -50,20 +50,20 @@ public: //virtual void output( ostream& stream ) { stream << "PrimaryNode {" << m_primary << "}" << endl; } virtual void buildXML( TQDomDocument& doc, TQDomElement element ); virtual bool isSimple() { return true; } - void setUnicode( TQChar tqunicode ) { m_tqunicode = tqunicode; } + void setUnicode( TQChar unicode ) { m_unicode = unicode; } void setFunctionName( bool functionName ) { m_functionName = functionName; } TQString primary() const { return m_primary; } private: TQString m_primary; - TQChar m_tqunicode; + TQChar m_unicode; bool m_functionName; }; void PrimaryNode::buildXML( TQDomDocument& doc, TQDomElement element ) { - if ( m_tqunicode != TQChar::null ) { + if ( m_unicode != TQChar::null ) { TQDomElement de = doc.createElement( "TEXT" ); - de.setAttribute( "CHAR", TQString( m_tqunicode ) ); + de.setAttribute( "CHAR", TQString( m_unicode ) ); de.setAttribute( "SYMBOL", "3" ); element.appendChild( de ); } @@ -543,7 +543,7 @@ ParserNode* FormulaStringParser::parsePrimary() } case NAME: { PrimaryNode* node = new PrimaryNode( current ); - node->setUnicode( m_symbolTable.tqunicode( current ) ); + node->setUnicode( m_symbolTable.unicode( current ) ); nextToken(); if ( currentType == LP ) { nextToken(); diff --git a/kivio/kiviopart/config/kivio_config.cpp b/kivio/kiviopart/config/kivio_config.cpp index 6428c1fd..74e8572b 100644 --- a/kivio/kiviopart/config/kivio_config.cpp +++ b/kivio/kiviopart/config/kivio_config.cpp @@ -28,30 +28,30 @@ namespace Kivio { KoPageLayout Config::defaultPageLayout() { - KoPageLayout tqlayout; + KoPageLayout layout; - tqlayout.format = KoPageFormat::formatFromString(Settings::format()); - tqlayout.orientation = Kivio::orientationFromString(Settings::orientation()); - tqlayout.ptTop = Settings::borderTop(); - tqlayout.ptBottom = Settings::borderBottom(); - tqlayout.ptLeft = Settings::borderLeft(); - tqlayout.ptRight = Settings::borderRight(); - tqlayout.ptWidth = Settings::width(); - tqlayout.ptHeight = Settings::height(); + layout.format = KoPageFormat::formatFromString(Settings::format()); + layout.orientation = Kivio::orientationFromString(Settings::orientation()); + layout.ptTop = Settings::borderTop(); + layout.ptBottom = Settings::borderBottom(); + layout.ptLeft = Settings::borderLeft(); + layout.ptRight = Settings::borderRight(); + layout.ptWidth = Settings::width(); + layout.ptHeight = Settings::height(); - return tqlayout; + return layout; } - void Config::setDefaultPageLayout(const KoPageLayout& tqlayout) + void Config::setDefaultPageLayout(const KoPageLayout& layout) { - Settings::setFormat(KoPageFormat::formatString(tqlayout.format)); - Settings::setOrientation(Kivio::orientationString(tqlayout.orientation)); - Settings::setBorderTop(tqlayout.ptTop); - Settings::setBorderBottom(tqlayout.ptBottom); - Settings::setBorderLeft(tqlayout.ptLeft); - Settings::setBorderRight(tqlayout.ptRight); - Settings::setWidth(tqlayout.ptWidth); - Settings::setHeight(tqlayout.ptHeight); + Settings::setFormat(KoPageFormat::formatString(layout.format)); + Settings::setOrientation(Kivio::orientationString(layout.orientation)); + Settings::setBorderTop(layout.ptTop); + Settings::setBorderBottom(layout.ptBottom); + Settings::setBorderLeft(layout.ptLeft); + Settings::setBorderRight(layout.ptRight); + Settings::setWidth(layout.ptWidth); + Settings::setHeight(layout.ptHeight); } void Config::setGrid(const KivioGridData& /*grid*/) diff --git a/kivio/kiviopart/config/kivio_config.h b/kivio/kiviopart/config/kivio_config.h index b4df785a..651ec121 100644 --- a/kivio/kiviopart/config/kivio_config.h +++ b/kivio/kiviopart/config/kivio_config.h @@ -34,12 +34,12 @@ namespace Kivio { { public: /** - * Set the default page tqlayout + * Set the default page layout */ - static void setDefaultPageLayout(const KoPageLayout& tqlayout); + static void setDefaultPageLayout(const KoPageLayout& layout); /** - * Get the default page tqlayout + * Get the default page layout */ static KoPageLayout defaultPageLayout(); diff --git a/kivio/kiviopart/kivio_canvas.cpp b/kivio/kiviopart/kivio_canvas.cpp index 30ef3850..e2125cbb 100644 --- a/kivio/kiviopart/kivio_canvas.cpp +++ b/kivio/kiviopart/kivio_canvas.cpp @@ -275,7 +275,7 @@ void KivioCanvas::paintEvent( TQPaintEvent* ev ) painter.save(); painter.setClipRegion(grayRegion, TQPainter::CoordPainter); painter.setPen(TQt::NoPen); - painter.fillRect(grayRegion.boundingRect(), KApplication::tqpalette().active().brush(TQColorGroup::Mid)); + painter.fillRect(grayRegion.boundingRect(), KApplication::palette().active().brush(TQColorGroup::Mid)); painter.restore(); // end of copy... diff --git a/kivio/kiviopart/kivio_doc.cpp b/kivio/kiviopart/kivio_doc.cpp index 300488c6..5a9d0a77 100644 --- a/kivio/kiviopart/kivio_doc.cpp +++ b/kivio/kiviopart/kivio_doc.cpp @@ -307,7 +307,7 @@ bool KivioDoc::saveOasis(KoStore* store, KoXmlWriter* manifestWriter) KoGenStyle pageLayout = Kivio::Config::defaultPageLayout().saveOasis(); TQString layoutName = styles.lookup(pageLayout, "PL"); KoGenStyle masterPage(KoGenStyle::STYLE_MASTER); - masterPage.addAttribute("style:page-tqlayout-name", layoutName); + masterPage.addAttribute("style:page-layout-name", layoutName); styles.lookup(masterPage, "Standard", false); if(!store->open("content.xml")) { @@ -345,7 +345,7 @@ bool KivioDoc::saveOasis(KoStore* store, KoXmlWriter* manifestWriter) TQValueList<KoGenStyles::NamedStyle>::const_iterator it = styleList.begin(); for ( ; it != styleList.end(); ++it) { - (*it).style->writeStyle(styleWriter, styles, "style:page-tqlayout", (*it).name, "style:page-tqlayout-properties"); + (*it).style->writeStyle(styleWriter, styles, "style:page-layout", (*it).name, "style:page-layout-properties"); } styleList = styles.styles(Kivio::STYLE_PAGE); diff --git a/kivio/kiviopart/kivio_page.cpp b/kivio/kiviopart/kivio_page.cpp index 0b60344b..a52f522b 100644 --- a/kivio/kiviopart/kivio_page.cpp +++ b/kivio/kiviopart/kivio_page.cpp @@ -153,7 +153,7 @@ TQDomElement KivioPage::save( TQDomDocument& doc ) page.setAttribute( "name", m_strName ); page.setAttribute( "hide", (int)m_bPageHide ); - // Create a child element for the page tqlayout + // Create a child element for the page layout TQDomElement layoutE = saveLayout( doc ); page.appendChild( layoutE ); @@ -194,7 +194,7 @@ void KivioPage::saveOasis(KoStore* /*store*/, KoXmlWriter* docWriter, KoGenStyle TQString layoutName = styles->lookup(pageLayout, "PL"); KoGenStyle masterPage(KoGenStyle::STYLE_MASTER); - masterPage.addAttribute("style:page-tqlayout-name", layoutName); + masterPage.addAttribute("style:page-layout-name", layoutName); TQString masterName = styles->lookup(masterPage, "MP"); docWriter->addAttribute("draw:master-page-name", masterName); @@ -324,17 +324,17 @@ bool KivioPage::loadOasis(const TQDomElement& page, KoOasisStyles& oasisStyles) return false; } - const TQDomElement *pageLayout = oasisStyles.findStyle(masterPage->attributeNS( KoXmlNS::style, "page-tqlayout-name", TQString() ) ); + const TQDomElement *pageLayout = oasisStyles.findStyle(masterPage->attributeNS( KoXmlNS::style, "page-layout-name", TQString() ) ); if(!pageLayout) { - kdDebug(430000) << "Couldn't find the pagetqlayout!" << endl; + kdDebug(430000) << "Couldn't find the pagelayout!" << endl; return false; } m_pPageLayout.loadOasis(*pageLayout); if(m_pPageLayout.ptWidth <= 1e-13 || m_pPageLayout.ptHeight <= 1e-13) { - kdDebug(430000) << "Non valid pagetqlayout!" << endl; + kdDebug(430000) << "Non valid pagelayout!" << endl; return false; } @@ -941,7 +941,7 @@ void KivioPage::copy() KivioDragObject* kdo = new KivioDragObject(); kdo->setStencilList(m_lstSelection); kdo->setStencilRect(getRectForAllSelectedStencils()); - TQApplication::tqclipboard()->setData(kdo, TQClipboard::Clipboard); + TQApplication::clipboard()->setData(kdo, TQClipboard::Clipboard); } void KivioPage::cut() @@ -987,7 +987,7 @@ void KivioPage::paste(KivioView* view) list.setAutoDelete(false); KivioDragObject kdo; - if(kdo.decode(TQApplication::tqclipboard()->data(TQClipboard::Clipboard), list, this)) { + if(kdo.decode(TQApplication::clipboard()->data(TQClipboard::Clipboard), list, this)) { unselectAllStencils(); KivioStencil* stencil = list.first(); diff --git a/kivio/kiviopart/kivio_view.cpp b/kivio/kiviopart/kivio_view.cpp index 340a5124..cdc550af 100644 --- a/kivio/kiviopart/kivio_view.cpp +++ b/kivio/kiviopart/kivio_view.cpp @@ -245,14 +245,14 @@ KivioView::KivioView( TQWidget *_parent, const char *_name, KivioDoc* doc ) &(m_pCanvas->guideLines()), TQT_SLOT(moveGuide(const TQPoint&, bool, int))); connect(&(m_pCanvas->guideLines()), TQT_SIGNAL(guideLinesChanged(KoView*)), m_pDoc, TQT_SLOT(updateGuideLines(KoView*))); - TQGridLayout* tqlayout = new TQGridLayout(pRightSide); - tqlayout->addWidget(hRuler, 0, 1); - tqlayout->addWidget(vRuler, 1, 0); - tqlayout->addWidget(canvasBase, 1, 1); - tqlayout->addMultiCellLayout(tabLayout, 2, 2, 0, 1); - tqlayout->addMultiCellWidget(m_vertScrollBar, 0, 1, 2, 2); - tqlayout->setRowStretch(1, 10); - tqlayout->setColStretch(1, 10); + TQGridLayout* layout = new TQGridLayout(pRightSide); + layout->addWidget(hRuler, 0, 1); + layout->addWidget(vRuler, 1, 0); + layout->addWidget(canvasBase, 1, 1); + layout->addMultiCellLayout(tabLayout, 2, 2, 0, 1); + layout->addMultiCellWidget(m_vertScrollBar, 0, 1, 2, 2); + layout->setRowStretch(1, 10); + layout->setColStretch(1, 10); TQWidget::setFocusPolicy( TQ_StrongFocus ); setFocusProxy( m_pCanvas ); @@ -390,7 +390,7 @@ void KivioView::setupActions() m_editCut = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT(cutStencil()), actionCollection(), "cutStencil" ); m_editCopy = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(copyStencil()), actionCollection(), "copyStencil" ); m_editPaste = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT(pasteStencil()), actionCollection(), "pasteStencil" ); - connect(TQApplication::tqclipboard(), TQT_SIGNAL(dataChanged()), TQT_TQOBJECT(this), TQT_SLOT(clipboardDataChanged())); + connect(TQApplication::clipboard(), TQT_SIGNAL(dataChanged()), TQT_TQOBJECT(this), TQT_SLOT(clipboardDataChanged())); m_selectAll = KStdAction::selectAll(TQT_TQOBJECT(this), TQT_SLOT(selectAllStencils()), actionCollection(), "selectAllStencils"); m_selectNone = KStdAction::deselect(TQT_TQOBJECT(this), TQT_SLOT(unselectAllStencils()), actionCollection(), "unselectAllStencils"); @@ -2113,7 +2113,7 @@ Kivio::PluginManager* KivioView::pluginManager() void KivioView::clipboardDataChanged() { - TQMimeSource* data = TQApplication::tqclipboard()->data(); + TQMimeSource* data = TQApplication::clipboard()->data(); KivioDragObject decoder(this); bool paste = decoder.canDecode(data); m_editPaste->setEnabled(paste); diff --git a/kivio/kiviopart/kivioglobal.cpp b/kivio/kiviopart/kivioglobal.cpp index 7479af08..201eea08 100644 --- a/kivio/kiviopart/kivioglobal.cpp +++ b/kivio/kiviopart/kivioglobal.cpp @@ -44,52 +44,52 @@ struct PaperSizeDef { int unit; }; -void Kivio::savePageLayout(TQDomElement& e, const KoPageLayout& tqlayout) +void Kivio::savePageLayout(TQDomElement& e, const KoPageLayout& layout) { - XmlWriteFloat(e, "width", tqlayout.ptWidth); - XmlWriteFloat(e, "height", tqlayout.ptHeight); - XmlWriteFloat(e, "marginLeft", tqlayout.ptLeft); - XmlWriteFloat(e, "marginRight", tqlayout.ptRight); - XmlWriteFloat(e, "marginTop", tqlayout.ptTop); - XmlWriteFloat(e, "marginBottom", tqlayout.ptBottom); - XmlWriteString(e, "format", KoPageFormat::formatString(tqlayout.format)); - XmlWriteString(e, "orientation", Kivio::orientationString(tqlayout.orientation)); + XmlWriteFloat(e, "width", layout.ptWidth); + XmlWriteFloat(e, "height", layout.ptHeight); + XmlWriteFloat(e, "marginLeft", layout.ptLeft); + XmlWriteFloat(e, "marginRight", layout.ptRight); + XmlWriteFloat(e, "marginTop", layout.ptTop); + XmlWriteFloat(e, "marginBottom", layout.ptBottom); + XmlWriteString(e, "format", KoPageFormat::formatString(layout.format)); + XmlWriteString(e, "orientation", Kivio::orientationString(layout.orientation)); } -// ## TODO: remove this method, now that tqlayout.saveOasis() does it all -KoGenStyle Kivio::savePageLayout(const KoPageLayout& tqlayout) +// ## TODO: remove this method, now that layout.saveOasis() does it all +KoGenStyle Kivio::savePageLayout(const KoPageLayout& layout) { - return tqlayout.saveOasis(); + return layout.saveOasis(); } KoPageLayout Kivio::loadPageLayout(const TQDomElement& e) { - KoPageLayout tqlayout; + KoPageLayout layout; if(e.hasAttribute("unit")) { // Compatibility with Kivio <= 1.2.x kdDebug(43000) << "Compatibility mode..." << endl; KoUnit::Unit unit = Kivio::convToKoUnit(XmlReadInt(e, "unit", 0)); - tqlayout.ptWidth = KoUnit::fromUserValue(XmlReadFloat(e, "width", 0.0), unit); - tqlayout.ptHeight = KoUnit::fromUserValue(XmlReadFloat(e, "height", 0.0), unit); - tqlayout.ptLeft = KoUnit::fromUserValue(XmlReadFloat(e, "marginLeft", 0.0), unit); - tqlayout.ptRight = KoUnit::fromUserValue(XmlReadFloat(e, "marginRight", 0.0), unit); - tqlayout.ptTop = KoUnit::fromUserValue(XmlReadFloat(e, "marginTop", 0.0), unit); - tqlayout.ptBottom = KoUnit::fromUserValue(XmlReadFloat(e, "marginBottom", 0.0), unit); - Kivio::setFormatOrientation(tqlayout); + layout.ptWidth = KoUnit::fromUserValue(XmlReadFloat(e, "width", 0.0), unit); + layout.ptHeight = KoUnit::fromUserValue(XmlReadFloat(e, "height", 0.0), unit); + layout.ptLeft = KoUnit::fromUserValue(XmlReadFloat(e, "marginLeft", 0.0), unit); + layout.ptRight = KoUnit::fromUserValue(XmlReadFloat(e, "marginRight", 0.0), unit); + layout.ptTop = KoUnit::fromUserValue(XmlReadFloat(e, "marginTop", 0.0), unit); + layout.ptBottom = KoUnit::fromUserValue(XmlReadFloat(e, "marginBottom", 0.0), unit); + Kivio::setFormatOrientation(layout); kdDebug(43000) << "Ready." << endl; } else { - tqlayout.ptWidth = XmlReadFloat(e, "width", 0.0); - tqlayout.ptHeight = XmlReadFloat(e, "height", 0.0); - tqlayout.ptLeft = XmlReadFloat(e, "marginLeft", 0.0); - tqlayout.ptRight = XmlReadFloat(e, "marginRight", 0.0); - tqlayout.ptTop = XmlReadFloat(e, "marginTop", 0.0); - tqlayout.ptBottom = XmlReadFloat(e, "marginBottom", 0.0); - tqlayout.format = KoPageFormat::formatFromString(XmlReadString(e, "format", pageSizeString(KGlobal::locale()->pageSize()))); - tqlayout.orientation = Kivio::orientationFromString(XmlReadString(e, "orientation", "Portrait")); + layout.ptWidth = XmlReadFloat(e, "width", 0.0); + layout.ptHeight = XmlReadFloat(e, "height", 0.0); + layout.ptLeft = XmlReadFloat(e, "marginLeft", 0.0); + layout.ptRight = XmlReadFloat(e, "marginRight", 0.0); + layout.ptTop = XmlReadFloat(e, "marginTop", 0.0); + layout.ptBottom = XmlReadFloat(e, "marginBottom", 0.0); + layout.format = KoPageFormat::formatFromString(XmlReadString(e, "format", pageSizeString(KGlobal::locale()->pageSize()))); + layout.orientation = Kivio::orientationFromString(XmlReadString(e, "orientation", "Portrait")); } - return tqlayout; + return layout; } KoUnit::Unit Kivio::convToKoUnit(int tkUnit) @@ -132,7 +132,7 @@ KoOrientation Kivio::orientationFromString(const TQString& s) return PG_PORTRAIT; } -void Kivio::setFormatOrientation(KoPageLayout& tqlayout) +void Kivio::setFormatOrientation(KoPageLayout& layout) { const PaperSizeDef PapersTable[] = { {"A0",841,1189,KoUnit::U_MM}, @@ -166,20 +166,20 @@ void Kivio::setFormatOrientation(KoPageLayout& tqlayout) PaperSizeDef sizeDef = PapersTable[0]; bool found = false; float width, height; - tqlayout.format = PG_CUSTOM; - tqlayout.orientation = PG_PORTRAIT; + layout.format = PG_CUSTOM; + layout.orientation = PG_PORTRAIT; while((sizeDef.unit != -2) && !found) { width = KoUnit::fromUserValue(sizeDef.width, static_cast<KoUnit::Unit>(sizeDef.unit)); height = KoUnit::fromUserValue(sizeDef.height, static_cast<KoUnit::Unit>(sizeDef.unit)); - if((tqlayout.ptWidth == width) && (tqlayout.ptHeight == height)) { - tqlayout.format = KoPageFormat::formatFromString(sizeDef.title); - tqlayout.orientation = PG_PORTRAIT; + if((layout.ptWidth == width) && (layout.ptHeight == height)) { + layout.format = KoPageFormat::formatFromString(sizeDef.title); + layout.orientation = PG_PORTRAIT; found = true; - } else if((tqlayout.ptWidth == height) && (tqlayout.ptHeight == width)) { - tqlayout.format = KoPageFormat::formatFromString(sizeDef.title); - tqlayout.orientation = PG_LANDSCAPE; + } else if((layout.ptWidth == height) && (layout.ptHeight == width)) { + layout.format = KoPageFormat::formatFromString(sizeDef.title); + layout.orientation = PG_LANDSCAPE; found = true; } diff --git a/kivio/kiviopart/kivioglobal.h b/kivio/kiviopart/kivioglobal.h index 1e94f79b..cd0fe3d6 100644 --- a/kivio/kiviopart/kivioglobal.h +++ b/kivio/kiviopart/kivioglobal.h @@ -37,12 +37,12 @@ namespace Kivio }; /** - * Save a page tqlayout to a TQDomElement + * Save a page layout to a TQDomElement */ - void savePageLayout(TQDomElement& e, const KoPageLayout& tqlayout); - KoGenStyle savePageLayout(const KoPageLayout& tqlayout); + void savePageLayout(TQDomElement& e, const KoPageLayout& layout); + KoGenStyle savePageLayout(const KoPageLayout& layout); /** - * Load a page tqlayout from a TQDomElement + * Load a page layout from a TQDomElement */ KoPageLayout loadPageLayout(const TQDomElement& e); /** @@ -57,7 +57,7 @@ namespace Kivio * Return the orientation based on the string */ KoOrientation orientationFromString(const TQString& s); - void setFormatOrientation(KoPageLayout& tqlayout); + void setFormatOrientation(KoPageLayout& layout); /** * Load a KoSize from a TQDomElement diff --git a/kivio/kiviopart/kiviosdk/kivio_common.cpp b/kivio/kiviopart/kiviosdk/kivio_common.cpp index bb95c94a..3dd8b428 100644 --- a/kivio/kiviopart/kiviosdk/kivio_common.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_common.cpp @@ -330,7 +330,7 @@ void XmlWriteDouble( TQDomElement &e, const TQString &att, const double &val ) * across two quadrants, you need to determine which side of the test point it crossed, and then * either add or subtract 2. * - * Quad tqlayout: + * Quad layout: * 1 2 * 4 3 */ diff --git a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp index 8969ea82..30cf7f1f 100644 --- a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp +++ b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp @@ -151,7 +151,7 @@ void KivioBirdEyePanel::updateView() KivioScreenPainter kpainter; kpainter.start(TQT_TQPAINTDEVICE(m_buffer)); - kpainter.painter()->fillRect(rect, KApplication::tqpalette().active().brush(TQColorGroup::Mid)); + kpainter.painter()->fillRect(rect, KApplication::palette().active().brush(TQColorGroup::Mid)); kpainter.painter()->fillRect(px0, py0, pw, ph, white); diff --git a/kivio/kiviopart/ui/kiviooptionsdialog.cpp b/kivio/kiviopart/ui/kiviooptionsdialog.cpp index 14a3c86d..5621074d 100644 --- a/kivio/kiviopart/ui/kiviooptionsdialog.cpp +++ b/kivio/kiviopart/ui/kiviooptionsdialog.cpp @@ -111,7 +111,7 @@ void KivioOptionsDialog::initPage() m_unitCombo->insertStringList(KoUnit::listOfUnitName()); m_unitCombo->setCurrentItem(unit); unitLbl->setBuddy(m_unitCombo); - TQLabel* layoutLbl = new TQLabel(i18n("Default tqlayout:"), page); + TQLabel* layoutLbl = new TQLabel(i18n("Default layout:"), page); m_layoutTxtLbl = new TQLabel(page); m_layoutTxtLbl->setFrameStyle(TQFrame::LineEditPanel | TQFrame::Sunken); m_layoutTxtLbl->setSizePolicy(TQSizePolicy( diff --git a/kivio/kiviopart/ui/objectlistpalette.cpp b/kivio/kiviopart/ui/objectlistpalette.cpp index 7483e98d..fbe094e5 100644 --- a/kivio/kiviopart/ui/objectlistpalette.cpp +++ b/kivio/kiviopart/ui/objectlistpalette.cpp @@ -85,7 +85,7 @@ ObjectListPalette::ObjectListPalette(KivioView* parent, const char* name) { m_blockUpdate = false; - TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 0, 2); + TQVBoxLayout* layout = new TQVBoxLayout(this, 0, 2); m_objectList = new KListView(this); m_objectList->setFullWidth(true); @@ -95,7 +95,7 @@ ObjectListPalette::ObjectListPalette(KivioView* parent, const char* name) m_objectList->addColumn(i18n("Name")); m_objectList->addColumn(i18n("Type")); - tqlayout->addWidget(m_objectList); + layout->addWidget(m_objectList); connect(m_objectList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(updateSelection())); } diff --git a/kplato/kptaccountspanelbase.ui b/kplato/kptaccountspanelbase.ui index c1091745..42b35ba9 100644 --- a/kplato/kptaccountspanelbase.ui +++ b/kplato/kptaccountspanelbase.ui @@ -37,7 +37,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -87,7 +87,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> diff --git a/kplato/kptcalendareditbase.cc b/kplato/kptcalendareditbase.cc index a7b36ef1..052928d3 100644 --- a/kplato/kptcalendareditbase.cc +++ b/kplato/kptcalendareditbase.cc @@ -51,9 +51,9 @@ CalendarEditBase::CalendarEditBase( TQWidget* parent, const char* name, WFlags f groupBox2 = new TQGroupBox( this, "groupBox2" ); groupBox2->setColumnLayout(0, Qt::Vertical ); - groupBox2->tqlayout()->setSpacing( 6 ); - groupBox2->tqlayout()->setMargin( 6 ); - groupBox2Layout = new TQGridLayout( groupBox2->tqlayout() ); + groupBox2->layout()->setSpacing( 6 ); + groupBox2->layout()->setMargin( 6 ); + groupBox2Layout = new TQGridLayout( groupBox2->layout() ); groupBox2Layout->setAlignment( TQt::AlignTop ); calendarPanel = new CalendarPanel( groupBox2, "calendarPanel" ); @@ -62,48 +62,48 @@ CalendarEditBase::CalendarEditBase( TQWidget* parent, const char* name, WFlags f day = new TQButtonGroup( groupBox2, "day" ); day->setColumnLayout(0, Qt::Vertical ); - day->tqlayout()->setSpacing( 6 ); - day->tqlayout()->setMargin( 6 ); - dayLayout = new TQVBoxLayout( day->tqlayout() ); + day->layout()->setSpacing( 6 ); + day->layout()->setMargin( 6 ); + dayLayout = new TQVBoxLayout( day->layout() ); dayLayout->setAlignment( TQt::AlignTop ); - tqlayout8 = new TQHBoxLayout( 0, 0, 6, "tqlayout8"); + layout8 = new TQHBoxLayout( 0, 0, 6, "layout8"); state = new TQComboBox( FALSE, day, "state" ); - tqlayout8->addWidget( state ); + layout8->addWidget( state ); bApply = new TQPushButton( day, "bApply" ); - tqlayout8->addWidget( bApply ); - dayLayout->addLayout( tqlayout8 ); + layout8->addWidget( bApply ); + dayLayout->addLayout( layout8 ); groupBox4 = new TQGroupBox( day, "groupBox4" ); groupBox4->setColumnLayout(0, Qt::Vertical ); - groupBox4->tqlayout()->setSpacing( 6 ); - groupBox4->tqlayout()->setMargin( 6 ); - groupBox4Layout = new TQVBoxLayout( groupBox4->tqlayout() ); + groupBox4->layout()->setSpacing( 6 ); + groupBox4->layout()->setMargin( 6 ); + groupBox4Layout = new TQVBoxLayout( groupBox4->layout() ); groupBox4Layout->setAlignment( TQt::AlignTop ); intervalList = new TQListView( groupBox4, "intervalList" ); intervalList->addColumn( tr2i18n( "Work Interval" ) ); groupBox4Layout->addWidget( intervalList ); - tqlayout6 = new TQHBoxLayout( 0, 0, 6, "tqlayout6"); + layout6 = new TQHBoxLayout( 0, 0, 6, "layout6"); startTime = new TQTimeEdit( groupBox4, "startTime" ); - tqlayout6->addWidget( startTime ); + layout6->addWidget( startTime ); endTime = new TQTimeEdit( groupBox4, "endTime" ); - tqlayout6->addWidget( endTime ); - groupBox4Layout->addLayout( tqlayout6 ); + layout6->addWidget( endTime ); + groupBox4Layout->addLayout( layout6 ); - tqlayout5 = new TQHBoxLayout( 0, 0, 6, "tqlayout5"); + layout5 = new TQHBoxLayout( 0, 0, 6, "layout5"); bClear = new TQPushButton( groupBox4, "bClear" ); - tqlayout5->addWidget( bClear ); + layout5->addWidget( bClear ); bAddInterval = new TQPushButton( groupBox4, "bAddInterval" ); - tqlayout5->addWidget( bAddInterval ); - groupBox4Layout->addLayout( tqlayout5 ); + layout5->addWidget( bAddInterval ); + groupBox4Layout->addLayout( layout5 ); dayLayout->addWidget( groupBox4 ); groupBox2Layout->addWidget( day, 1, 1 ); diff --git a/kplato/kptcalendareditbase.h b/kplato/kptcalendareditbase.h index df2f9c0c..b6a22064 100644 --- a/kplato/kptcalendareditbase.h +++ b/kplato/kptcalendareditbase.h @@ -64,12 +64,12 @@ public: protected: TQHBoxLayout* CalendarEditBaseLayout; TQGridLayout* groupBox2Layout; - TQHBoxLayout* tqlayout10; + TQHBoxLayout* layout10; TQVBoxLayout* dayLayout; - TQHBoxLayout* tqlayout8; + TQHBoxLayout* layout8; TQVBoxLayout* groupBox4Layout; - TQHBoxLayout* tqlayout6; - TQHBoxLayout* tqlayout5; + TQHBoxLayout* layout6; + TQHBoxLayout* layout5; protected slots: virtual void languageChange(); diff --git a/kplato/kptcalendarlistpanel.ui b/kplato/kptcalendarlistpanel.ui index 04f86757..29f4a4fd 100644 --- a/kplato/kptcalendarlistpanel.ui +++ b/kplato/kptcalendarlistpanel.ui @@ -25,7 +25,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <grid> <property name="name"> @@ -67,7 +67,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <vbox> <property name="name"> @@ -75,7 +75,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> diff --git a/kplato/kptcalendarpanel.cc b/kplato/kptcalendarpanel.cc index 59ab2f01..4010afa3 100644 --- a/kplato/kptcalendarpanel.cc +++ b/kplato/kptcalendarpanel.cc @@ -174,8 +174,8 @@ CalendarPanel::resizeEvent(TQResizeEvent*) // ----- calculate size of the month button: for(count=0; count<NoOfButtons; ++count) { if(buttons[count]==selectMonth) { - TQSize metricBound = tqstyle().tqsizeFromContents(TQStyle::CT_ToolButton, selectMonth, maxMonthRect); - sizes[count].setWidth(TQMAX(metricBound.width(), maxMonthRect.width()+2*TQApplication::tqstyle().pixelMetric(TQStyle::PM_ButtonMargin))); + TQSize metricBound = style().tqsizeFromContents(TQStyle::CT_ToolButton, selectMonth, maxMonthRect); + sizes[count].setWidth(TQMAX(metricBound.width(), maxMonthRect.width()+2*TQApplication::style().pixelMetric(TQStyle::PM_ButtonMargin))); } } // ----- center buttons @@ -432,8 +432,8 @@ CalendarPanel::sizeHint() const sizes[count] = TQSize(0,0); if(buttons[count]==selectMonth) { - TQSize metricBound = tqstyle().tqsizeFromContents(TQStyle::CT_ToolButton, selectMonth, maxMonthRect); - cx+=TQMAX(metricBound.width(), maxMonthRect.width()+2*TQApplication::tqstyle().pixelMetric(TQStyle::PM_ButtonMargin)); + TQSize metricBound = style().tqsizeFromContents(TQStyle::CT_ToolButton, selectMonth, maxMonthRect); + cx+=TQMAX(metricBound.width(), maxMonthRect.width()+2*TQApplication::style().pixelMetric(TQStyle::PM_ButtonMargin)); } else { cx+=sizes[count].width(); } diff --git a/kplato/kptconfigtaskpanelbase.ui b/kplato/kptconfigtaskpanelbase.ui index 31e07542..178d1f08 100644 --- a/kplato/kptconfigtaskpanelbase.ui +++ b/kplato/kptconfigtaskpanelbase.ui @@ -25,7 +25,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -231,7 +231,7 @@ The estimation can be either effort based or duration based. If it is effort bas </widget> <widget class="TQLayoutWidget" row="3" column="2" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout41</cstring> + <cstring>layout41</cstring> </property> <hbox> <property name="name"> diff --git a/kplato/kptintervaleditbase.ui b/kplato/kptintervaleditbase.ui index 4e847442..4967bd4a 100644 --- a/kplato/kptintervaleditbase.ui +++ b/kplato/kptintervaleditbase.ui @@ -50,7 +50,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -70,7 +70,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> diff --git a/kplato/kptmainprojectpanelbase.ui b/kplato/kptmainprojectpanelbase.ui index e711ca64..5a0ccb9a 100644 --- a/kplato/kptmainprojectpanelbase.ui +++ b/kplato/kptmainprojectpanelbase.ui @@ -25,7 +25,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout14</cstring> + <cstring>layout14</cstring> </property> <grid> <property name="name"> diff --git a/kplato/kptpertview.cc b/kplato/kptpertview.cc index 02830d37..f68d9eb8 100644 --- a/kplato/kptpertview.cc +++ b/kplato/kptpertview.cc @@ -40,19 +40,19 @@ namespace KPlato { -PertView::PertView( View *view, TQWidget *parent, TQLayout *tqlayout ) +PertView::PertView( View *view, TQWidget *parent, TQLayout *layout ) : TQWidget( parent, "Pert view" ), m_mainview( view ), m_node( 0 ) { - init(tqlayout); + init(layout); } PertView::~PertView() { } -void PertView::init(TQLayout */*tqlayout*/) +void PertView::init(TQLayout */*layout*/) { //kdDebug()<<k_funcinfo<<endl; TQGridLayout *gl = new TQGridLayout(this, 1, 1, -1, -1, "Pert TQGridLayout"); diff --git a/kplato/kptpertview.h b/kplato/kptpertview.h index b98b2cae..4937a421 100644 --- a/kplato/kptpertview.h +++ b/kplato/kptpertview.h @@ -44,7 +44,7 @@ class PertView : public TQWidget public: - PertView( View *view, TQWidget *parent, TQLayout *tqlayout ); + PertView( View *view, TQWidget *parent, TQLayout *layout ); ~PertView(); @@ -70,7 +70,7 @@ signals: void modifyRelation(Relation *rel); private: - void init(TQLayout *tqlayout); + void init(TQLayout *layout); View *m_mainview; PertCanvas *m_canvasview; Node *m_node; diff --git a/kplato/kptprojectdialogbase.ui b/kplato/kptprojectdialogbase.ui index 6ff94658..8eb79e69 100644 --- a/kplato/kptprojectdialogbase.ui +++ b/kplato/kptprojectdialogbase.ui @@ -33,7 +33,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <grid> <property name="name"> diff --git a/kplato/kptresourceview.cc b/kplato/kptresourceview.cc index b7544f90..58ea413e 100644 --- a/kplato/kptresourceview.cc +++ b/kplato/kptresourceview.cc @@ -203,7 +203,7 @@ protected: c = fc; // draw to last interesting column - const TQColorGroup &cg = ( tqpalette().inactive() ); + const TQColorGroup &cg = ( palette().inactive() ); while ( c < lc && !drawables.isEmpty() ) { int i = header()->mapToLogical( c ); diff --git a/kplato/kptsummarytaskgeneralpanelbase.ui b/kplato/kptsummarytaskgeneralpanelbase.ui index 57e25e51..afef245e 100644 --- a/kplato/kptsummarytaskgeneralpanelbase.ui +++ b/kplato/kptsummarytaskgeneralpanelbase.ui @@ -31,7 +31,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <hbox> <property name="name"> @@ -39,7 +39,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <vbox> <property name="name"> @@ -95,7 +95,7 @@ This is not limited to persons available in a resource group but can be anyone. </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <vbox> <property name="name"> @@ -103,7 +103,7 @@ This is not limited to persons available in a resource group but can be anyone. </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -171,7 +171,7 @@ This is not limited to persons available in a resource group but can be anyone. </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> diff --git a/kplato/kpttaskgeneralpanelbase.ui b/kplato/kpttaskgeneralpanelbase.ui index e61f316e..5d950f6b 100644 --- a/kplato/kpttaskgeneralpanelbase.ui +++ b/kplato/kpttaskgeneralpanelbase.ui @@ -25,7 +25,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <hbox> <property name="name"> @@ -33,7 +33,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <vbox> <property name="name"> @@ -89,7 +89,7 @@ This is not limited to persons available in a resource group but can be anyone. </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <vbox> <property name="name"> @@ -97,7 +97,7 @@ This is not limited to persons available in a resource group but can be anyone. </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -159,7 +159,7 @@ This is not limited to persons available in a resource group but can be anyone. </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -316,7 +316,7 @@ The estimation can be either effort based or duration based. If it is effort bas </widget> <widget class="TQLayoutWidget" row="3" column="2" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout41</cstring> + <cstring>layout41</cstring> </property> <hbox> <property name="name"> diff --git a/kplato/kpttasknotespanelbase.ui b/kplato/kpttasknotespanelbase.ui index 90f413ff..f3f52ab9 100644 --- a/kplato/kpttasknotespanelbase.ui +++ b/kplato/kpttasknotespanelbase.ui @@ -18,7 +18,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <vbox> <property name="name"> diff --git a/kplato/kpttaskprogresspanelbase.ui b/kplato/kpttaskprogresspanelbase.ui index 2bcb2eac..b4c5b24f 100644 --- a/kplato/kpttaskprogresspanelbase.ui +++ b/kplato/kpttaskprogresspanelbase.ui @@ -226,7 +226,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -258,7 +258,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <hbox> <property name="name"> @@ -290,7 +290,7 @@ </widget> <widget class="TQLayoutWidget" row="2" column="1"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <hbox> <property name="name"> diff --git a/kplato/kpttaskresourcespanelbase.ui b/kplato/kpttaskresourcespanelbase.ui index 52fa42d0..93444894 100644 --- a/kplato/kpttaskresourcespanelbase.ui +++ b/kplato/kpttaskresourcespanelbase.ui @@ -58,7 +58,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout14</cstring> + <cstring>layout14</cstring> </property> <vbox> <property name="name"> diff --git a/kplato/kptview.cc b/kplato/kptview.cc index e986ea99..d4a84e68 100644 --- a/kplato/kptview.cc +++ b/kplato/kptview.cc @@ -102,9 +102,9 @@ namespace KPlato View::View(Part* part, TQWidget* parent, const char* /*name*/) : KoView(part, parent, "Main View"), m_ganttview(0), - m_gantttqlayout(0), + m_ganttlayout(0), m_pertview(0), - m_perttqlayout(0), + m_pertlayout(0), // m_reportview(0), m_baselineMode(false), m_currentEstimateType(Effort::Use_Expected) @@ -122,15 +122,15 @@ View::View(Part* part, TQWidget* parent, const char* /*name*/) dcopObject(); m_tab = new TQWidgetStack(this); - TQVBoxLayout *tqlayout = new TQVBoxLayout(this); - tqlayout->add(m_tab); + TQVBoxLayout *layout = new TQVBoxLayout(this); + layout->add(m_tab); m_ganttview = new GanttView(m_tab, part->isReadWrite()); m_tab->addWidget(m_ganttview); m_updateGanttview = false; m_ganttview->draw(getPart()->getProject()); - m_pertview = new PertView( this, m_tab, tqlayout ); + m_pertview = new PertView( this, m_tab, layout ); m_tab->addWidget(m_pertview); m_resourceview = new ResourceView( this, m_tab ); diff --git a/kplato/kptview.h b/kplato/kptview.h index 38d93501..b2c85346 100644 --- a/kplato/kptview.h +++ b/kplato/kptview.h @@ -176,9 +176,9 @@ protected: private: GanttView *m_ganttview; - TQHBoxLayout *m_gantttqlayout; + TQHBoxLayout *m_ganttlayout; PertView *m_pertview; - TQHBoxLayout *m_perttqlayout; + TQHBoxLayout *m_pertlayout; TQWidgetStack *m_tab; ResourceView *m_resourceview; AccountsView *m_accountsview; diff --git a/kplato/kptwbsdefinitionpanelbase.ui b/kplato/kptwbsdefinitionpanelbase.ui index afe672f8..5f76c4f4 100644 --- a/kplato/kptwbsdefinitionpanelbase.ui +++ b/kplato/kptwbsdefinitionpanelbase.ui @@ -39,7 +39,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <grid> <property name="name"> @@ -121,7 +121,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -154,7 +154,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> diff --git a/kplato/relationpanel.ui b/kplato/relationpanel.ui index 1c120b57..2f7b904e 100644 --- a/kplato/relationpanel.ui +++ b/kplato/relationpanel.ui @@ -207,7 +207,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <vbox> <property name="name"> diff --git a/kplato/resourcedialogbase.ui b/kplato/resourcedialogbase.ui index 3fb04b75..f7b75137 100644 --- a/kplato/resourcedialogbase.ui +++ b/kplato/resourcedialogbase.ui @@ -61,7 +61,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <hbox> <property name="name"> @@ -112,7 +112,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>tqlayout12</cstring> + <cstring>layout12</cstring> </property> <hbox> <property name="name"> @@ -146,7 +146,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -198,7 +198,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <grid> <property name="name"> diff --git a/kplato/resourcespanelbase.ui b/kplato/resourcespanelbase.ui index 5af1ac5d..cc47ad3f 100644 --- a/kplato/resourcespanelbase.ui +++ b/kplato/resourcespanelbase.ui @@ -28,7 +28,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <vbox> <property name="name"> @@ -52,7 +52,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -99,7 +99,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout51</cstring> + <cstring>layout51</cstring> </property> <vbox> <property name="name"> @@ -127,7 +127,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <vbox> <property name="name"> diff --git a/kplato/standardworktimedialogbase.ui b/kplato/standardworktimedialogbase.ui index 7d33ffb3..eafdca61 100644 --- a/kplato/standardworktimedialogbase.ui +++ b/kplato/standardworktimedialogbase.ui @@ -28,7 +28,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <grid> <property name="name"> diff --git a/kpresenter/KPrBackDia.cpp b/kpresenter/KPrBackDia.cpp index fb87b9f3..d8eb9f20 100644 --- a/kpresenter/KPrBackDia.cpp +++ b/kpresenter/KPrBackDia.cpp @@ -89,10 +89,10 @@ KPrBackDialog::KPrBackDialog( TQWidget* parent, const char* name, TQWidget *page = new TQWidget( this ); setMainWidget(page); - TQVBoxLayout *tqlayout = new TQVBoxLayout( page, 0, spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( page, 0, spacingHint() ); - TQHBoxLayout *hbox = new TQHBoxLayout( tqlayout ); + TQHBoxLayout *hbox = new TQHBoxLayout( layout ); hbox->setSpacing( KDialog::spacingHint() ); TQVBoxLayout *vbox = new TQVBoxLayout( hbox ); vbox->setSpacing( KDialog::spacingHint() ); diff --git a/kpresenter/KPrBackground.cpp b/kpresenter/KPrBackground.cpp index 484a5eab..e8dcdc39 100644 --- a/kpresenter/KPrBackground.cpp +++ b/kpresenter/KPrBackground.cpp @@ -589,7 +589,7 @@ void KPrBackGround::drawBackPix( TQPainter *_painter, const TQSize& ext, const T void KPrBackGround::drawBorders( TQPainter *_painter, const TQSize& /*ext*/, const TQRect& /*crect*/ ) { - _painter->setPen( TQApplication::tqpalette().active().color( TQColorGroup::Dark ) ); + _painter->setPen( TQApplication::palette().active().color( TQColorGroup::Dark ) ); _painter->setBrush( TQt::NoBrush ); TQRect rect = m_page->getZoomPageRect(); diff --git a/kpresenter/KPrBrushProperty.cpp b/kpresenter/KPrBrushProperty.cpp index eee5d6c9..7734835a 100644 --- a/kpresenter/KPrBrushProperty.cpp +++ b/kpresenter/KPrBrushProperty.cpp @@ -37,21 +37,21 @@ KPrBrushProperty::KPrBrushProperty( TQWidget *parent, const char *name, const KP : TQWidget( parent, name ) , m_brush( brush ) { - TQGridLayout *tqlayout = new TQGridLayout( this, 1, 1, KDialog::marginHint(), KDialog::spacingHint() ); + TQGridLayout *layout = new TQGridLayout( this, 1, 1, KDialog::marginHint(), KDialog::spacingHint() ); m_typeCombo = new KComboBox( this ); - tqlayout->addWidget( m_typeCombo, 0, 1 ); + layout->addWidget( m_typeCombo, 0, 1 ); m_typeCombo->insertItem( i18n( "Single Color" ) ); m_typeCombo->insertItem( i18n( "Gradient" ) ); m_typeCombo->insertItem( i18n( "Transparent" ) ); TQWhatsThis::add(m_typeCombo, i18n( "You can choose between Single Color, Gradient or Transparent as the type." ) ); TQLabel *typeLabel = new TQLabel( i18n( "&Type:" ), this ); - tqlayout->addWidget( typeLabel, 0, 0 ); + layout->addWidget( typeLabel, 0, 0 ); typeLabel->setBuddy( m_typeCombo ); m_stack = new TQWidgetStack( this ); - tqlayout->addMultiCellWidget( m_stack, 1, 1, 0, 1 ); + layout->addMultiCellWidget( m_stack, 1, 1, 0, 1 ); connect( m_typeCombo, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotTypeChanged( int ) ) ); diff --git a/kpresenter/KPrCanvas.cpp b/kpresenter/KPrCanvas.cpp index 61c00c96..56a75516 100644 --- a/kpresenter/KPrCanvas.cpp +++ b/kpresenter/KPrCanvas.cpp @@ -481,7 +481,7 @@ void KPrCanvas::drawBackground( TQPainter *painter, const TQRect& rect, KPrPage // In edit mode we also want to draw the gray area out of the pages if ( !grayRegion.isEmpty() ) - eraseEmptySpace( painter, grayRegion, TQApplication::tqpalette().active().brush( TQColorGroup::Mid ) ); + eraseEmptySpace( painter, grayRegion, TQApplication::palette().active().brush( TQColorGroup::Mid ) ); } else { @@ -706,9 +706,9 @@ void KPrCanvas::mousePressEvent( TQMouseEvent *e ) } else if( e->button() == Qt::MidButton ) { - TQApplication::tqclipboard()->setSelectionMode( true ); + TQApplication::clipboard()->setSelectionMode( true ); m_currentTextObjectView->paste(); - TQApplication::tqclipboard()->setSelectionMode( false ); + TQApplication::clipboard()->setSelectionMode( false ); } return; } @@ -2723,9 +2723,9 @@ void KPrCanvas::setTextDepthPlus() m_view->kPresenterDoc()->addCommand( macroCmd ); if(!lst.isEmpty()) { - const KoParagLayout *tqlayout=lst.first()->currentParagLayoutFormat(); - m_view->showRulerIndent( tqlayout->margins[TQStyleSheetItem::MarginLeft], tqlayout->margins[TQStyleSheetItem::MarginFirstLine], - tqlayout->margins[TQStyleSheetItem::MarginRight], lst.first()->rtl()); + const KoParagLayout *layout=lst.first()->currentParagLayoutFormat(); + m_view->showRulerIndent( layout->margins[TQStyleSheetItem::MarginLeft], layout->margins[TQStyleSheetItem::MarginFirstLine], + layout->margins[TQStyleSheetItem::MarginRight], lst.first()->rtl()); } } @@ -2753,9 +2753,9 @@ void KPrCanvas::setTextDepthMinus() m_view->kPresenterDoc()->addCommand( macroCmd ); if(!lst.isEmpty()) { - const KoParagLayout *tqlayout=lst.first()->currentParagLayoutFormat(); - m_view->showRulerIndent( tqlayout->margins[TQStyleSheetItem::MarginLeft], tqlayout->margins[TQStyleSheetItem::MarginFirstLine], - tqlayout->margins[TQStyleSheetItem::MarginRight], lst.first()->rtl()); + const KoParagLayout *layout=lst.first()->currentParagLayoutFormat(); + m_view->showRulerIndent( layout->margins[TQStyleSheetItem::MarginLeft], layout->margins[TQStyleSheetItem::MarginFirstLine], + layout->margins[TQStyleSheetItem::MarginRight], lst.first()->rtl()); } } @@ -4145,7 +4145,7 @@ void KPrCanvas::copyOasisObjs() delete store; kd->setEncodedData( arr ); - TQApplication::tqclipboard()->setData( dragObject, TQClipboard::Clipboard ); + TQApplication::clipboard()->setData( dragObject, TQClipboard::Clipboard ); } void KPrCanvas::copyObjs() @@ -4214,7 +4214,7 @@ void KPrCanvas::copyObjs() delete store; kd->setEncodedData( arr ); - TQApplication::tqclipboard()->setData( dragObject, TQClipboard::Clipboard ); + TQApplication::clipboard()->setData( dragObject, TQClipboard::Clipboard ); } void KPrCanvas::deleteObjs() @@ -4941,7 +4941,7 @@ void KPrCanvas::resizeObject( ModifyType _modType, const KoPoint & point, bool k } -void KPrCanvas::finishResizeObject( const TQString &name, bool tqlayout ) +void KPrCanvas::finishResizeObject( const TQString &name, bool layout ) { if ( m_resizeObject ) { @@ -4958,8 +4958,8 @@ void KPrCanvas::finishResizeObject( const TQString &name, bool tqlayout ) m_view->kPresenterDoc()->addCommand( resizeCmd ); } - if ( tqlayout ) - m_view->kPresenterDoc()->tqlayout( m_resizeObject ); + if ( layout ) + m_view->kPresenterDoc()->layout( m_resizeObject ); m_ratio = 0.0; m_isResizing = false; @@ -5535,12 +5535,12 @@ void KPrCanvas::closeObject(bool /*close*/) m_view->kPresenterDoc()->addCommand( cmd ); } -void KPrCanvas::tqlayout() +void KPrCanvas::layout() { TQPtrListIterator<KPrObject> it(getObjectList()); for ( ; it.current(); ++it ) { if ( it.current()->getType() == OT_TEXT ) - static_cast<KPrTextObject *>( it.current() )->tqlayout(); + static_cast<KPrTextObject *>( it.current() )->layout(); } } diff --git a/kpresenter/KPrCanvas.h b/kpresenter/KPrCanvas.h index f5355be7..2d8c7f48 100644 --- a/kpresenter/KPrCanvas.h +++ b/kpresenter/KPrCanvas.h @@ -360,7 +360,7 @@ exportPage( 0, s, 800, 600, "/home/khz/page0.png", "PNG", 100 ); TQPixmap getPicturePixmap() const; void closeObject(bool _close); - void tqlayout(); + void layout(); void alignVertical(VerticalAlignmentType _type ); void savePicture(); @@ -633,7 +633,7 @@ private: /// resize the m_resizeObject void resizeObject( ModifyType _modType, const KoPoint & point, bool keepRatio, bool scaleAroundCenter ); /// create KPrResizeCmd - void finishResizeObject( const TQString &name, bool tqlayout = true ); + void finishResizeObject( const TQString &name, bool layout = true ); /** * @brief Display object above the other objects in editiong mode diff --git a/kpresenter/KPrCommand.cpp b/kpresenter/KPrCommand.cpp index 85e66845..5f88381d 100644 --- a/kpresenter/KPrCommand.cpp +++ b/kpresenter/KPrCommand.cpp @@ -1345,7 +1345,7 @@ KPrPgLayoutCmd::KPrPgLayoutCmd( const TQString &_name, KoPageLayout _layout, KoP : KNamedCommand( _name ) { m_doc=_doc; - tqlayout = _layout; + layout = _layout; oldLayout = _oldLayout; oldUnit = _oldUnit; unit = _unit; @@ -1354,7 +1354,7 @@ KPrPgLayoutCmd::KPrPgLayoutCmd( const TQString &_name, KoPageLayout _layout, KoP void KPrPgLayoutCmd::execute() { m_doc->setUnit( unit ); - m_doc->setPageLayout( tqlayout ); + m_doc->setPageLayout( layout ); m_doc->updateHeaderFooterPosition(); m_doc->updateRuler(); m_doc->updateRulerPageLayout(); @@ -1842,7 +1842,7 @@ void KPrResizeCmd::execute() { if(object->isSelected()) doc->updateRuler(); - doc->tqlayout( object ); + doc->layout( object ); } if ( object->isSelected()) doc->updateObjectStatusBarItem(); @@ -1863,7 +1863,7 @@ void KPrResizeCmd::unexecute() { if(object->isSelected()) doc->updateRuler(); - doc->tqlayout( object ); + doc->layout( object ); } if ( object->isSelected()) doc->updateObjectStatusBarItem(); @@ -2668,7 +2668,7 @@ void KPrChangeMarginCommand::execute() it.current()->setTextMargins( m_newMargins.leftMargin, m_newMargins.topMargin, m_newMargins.rightMargin, m_newMargins.bottomMargin); it.current()->resizeTextDocument(); - it.current()->tqlayout(); + it.current()->layout(); } m_doc->repaint( false ); @@ -2684,7 +2684,7 @@ void KPrChangeMarginCommand::unexecute() object->setTextMargins( marginsStruct->leftMargin, marginsStruct->topMargin, marginsStruct->rightMargin, marginsStruct->bottomMargin); object->resizeTextDocument(); - object->tqlayout(); + object->layout(); } m_doc->repaint( false ); @@ -2708,7 +2708,7 @@ KPrChangeVerticalAlignmentCommand::KPrChangeVerticalAlignmentCommand( const TQSt void KPrChangeVerticalAlignmentCommand::execute() { m_obj->setVerticalAligment( m_newAlign ); - m_obj->kPresenterDocument()->tqlayout(m_obj); + m_obj->kPresenterDocument()->layout(m_obj); m_obj->kPresenterDocument()->repaint(m_obj); m_doc->updateSideBarItem( m_page ); @@ -2717,7 +2717,7 @@ void KPrChangeVerticalAlignmentCommand::execute() void KPrChangeVerticalAlignmentCommand::unexecute() { m_obj->setVerticalAligment( m_oldAlign ); - m_obj->kPresenterDocument()->tqlayout(m_obj); + m_obj->kPresenterDocument()->layout(m_obj); m_obj->kPresenterDocument()->repaint(m_obj); m_doc->updateSideBarItem( m_page ); diff --git a/kpresenter/KPrCommand.h b/kpresenter/KPrCommand.h index 4a4cc0ec..cc22d2c2 100644 --- a/kpresenter/KPrCommand.h +++ b/kpresenter/KPrCommand.h @@ -543,7 +543,7 @@ public: protected: KPrDocument *m_doc; - KoPageLayout tqlayout, oldLayout; + KoPageLayout layout, oldLayout; KoUnit::Unit unit, oldUnit; }; diff --git a/kpresenter/KPrConfig.cpp b/kpresenter/KPrConfig.cpp index b25e1255..1a5808ec 100644 --- a/kpresenter/KPrConfig.cpp +++ b/kpresenter/KPrConfig.cpp @@ -419,9 +419,9 @@ KPrConfigureMiscPage::KPrConfigureMiscPage( KPrView *_view, TQWidget *parent, ch config = KPrFactory::global()->config(); TQGroupBox* tmpTQGroupBox = new TQGroupBox( 0, Qt::Vertical, i18n("Misc"), this, "GroupBox" ); - tmpTQGroupBox->tqlayout()->setSpacing(KDialog::spacingHint()); - tmpTQGroupBox->tqlayout()->setMargin(KDialog::marginHint()); - TQGridLayout *grid = new TQGridLayout( tmpTQGroupBox->tqlayout(), 8, 1 ); + tmpTQGroupBox->layout()->setSpacing(KDialog::spacingHint()); + tmpTQGroupBox->layout()->setMargin(KDialog::marginHint()); + TQGridLayout *grid = new TQGridLayout( tmpTQGroupBox->layout(), 8, 1 ); m_oldNbRedo=30; m_printNotes=true; @@ -469,9 +469,9 @@ KPrConfigureMiscPage::KPrConfigureMiscPage( KPrView *_view, TQWidget *parent, ch box->addWidget(tmpTQGroupBox); tmpTQGroupBox = new TQGroupBox( 0, Qt::Vertical, i18n("Grid"), this, "GroupBox" ); - tmpTQGroupBox->tqlayout()->setSpacing(KDialog::spacingHint()); - tmpTQGroupBox->tqlayout()->setMargin(KDialog::marginHint()); - grid = new TQGridLayout( tmpTQGroupBox->tqlayout(), 8, 1 ); + tmpTQGroupBox->layout()->setSpacing(KDialog::spacingHint()); + tmpTQGroupBox->layout()->setMargin(KDialog::marginHint()); + grid = new TQGridLayout( tmpTQGroupBox->layout(), 8, 1 ); KoRect rect = doc->masterPage()->getPageRect(); TQLabel *lab=new TQLabel(i18n("Horizontal grid size:"), tmpTQGroupBox); diff --git a/kpresenter/KPrDocument.cpp b/kpresenter/KPrDocument.cpp index fca675d5..1aa505eb 100644 --- a/kpresenter/KPrDocument.cpp +++ b/kpresenter/KPrDocument.cpp @@ -272,7 +272,7 @@ KPrDocument::KPrDocument( TQWidget *parentWidget, const char *widgetName, TQObje saveOnlyPage = -1; m_maxRecentFiles = 10; - connect( TQApplication::tqclipboard(), TQT_SIGNAL( dataChanged() ), + connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ), this, TQT_SLOT( clipboardDataChanged() ) ); m_commandHistory = new KoCommandHistory( actionCollection(), true ) ; @@ -1535,7 +1535,7 @@ void KPrDocument::saveOasisDocumentStyles( KoStore* store, KoGenStyles& mainStyl Q_ASSERT( styles.count() == 1 ); it = styles.begin(); for ( ; it != styles.end() ; ++it ) { - (*it).style->writeStyle( stylesWriter, mainStyles, "style:page-tqlayout", (*it).name, "style:page-tqlayout-properties", false /*don't close*/ ); + (*it).style->writeStyle( stylesWriter, mainStyles, "style:page-layout", (*it).name, "style:page-layout-properties", false /*don't close*/ ); stylesWriter->endElement(); } @@ -1648,7 +1648,7 @@ bool KPrDocument::loadOasis( const TQDomDocument& doc, KoOasisStyles&oasisStyles kdDebug()<<" masterPageName:"<<masterPageName<<endl; if ( ! master ) { - masterPageName = "Standard"; // use default tqlayout as fallback (default in kpresenter) + masterPageName = "Standard"; // use default layout as fallback (default in kpresenter) master = oasisStyles.masterPages()[ masterPageName]; if ( !master ) //last test... master = oasisStyles.masterPages()["Default"]; @@ -1685,7 +1685,7 @@ bool KPrDocument::loadOasis( const TQDomDocument& doc, KoOasisStyles&oasisStyles kdDebug()<<" end load oasis master style \n"; Q_ASSERT( master ); - const TQDomElement *style = master ? oasisStyles.findStyle(master->attributeNS( KoXmlNS::style, "page-tqlayout-name", TQString() )) : 0; + const TQDomElement *style = master ? oasisStyles.findStyle(master->attributeNS( KoXmlNS::style, "page-layout-name", TQString() )) : 0; const TQDomElement *backgroundStyle = oasisStyles.findStyle( "Standard-background", "presentation" ); kdDebug()<<"Standard background "<<backgroundStyle<<endl; // parse all pages @@ -2089,7 +2089,7 @@ void KPrDocument::loadOasisObject( KPrPage * newpage, TQDomNode & drawPage, KoOa if ( !note.isEmpty() ) note += "\n"; - //todo load tqlayout for note. + //todo load layout for note. TQDomNode textBox = KoDom::namedItemNS( frameBox, KoXmlNS::draw, "text-box" ); if ( !textBox.isNull() ) @@ -2514,7 +2514,7 @@ bool KPrDocument::loadXML( const TQDomDocument &doc ) else if(borders.hasAttribute("mmBottom")) //compatibility __pgLayout.ptBottom = MM_TO_POINT( borders.attribute("inchBottom").toDouble() ); } - // PAPER found and parsed -> apply page tqlayout + // PAPER found and parsed -> apply page layout // e.g. the text objects need it if ( _clean ) setPageLayout( __pgLayout ); @@ -3276,11 +3276,11 @@ void KPrDocument::setPageLayout( const KoPageLayout &pgLayout ) // m_pageList.at( i )->updateBackgroundSize(); repaint( false ); - tqlayout(); + layout(); // don't setModified(true) here, since this is called on startup } -//when we change pagetqlayout we must re-position header/footer +//when we change pagelayout we must re-position header/footer void KPrDocument::updateHeaderFooterPosition( ) { KoRect pageRect=m_masterPage->getPageRect(); @@ -3423,19 +3423,19 @@ void KPrDocument::repaint( const TQRect& rect ) } } -void KPrDocument::tqlayout(KPrObject *kpobject) +void KPrDocument::layout(KPrObject *kpobject) { KPrTextObject * obj = dynamic_cast<KPrTextObject *>( kpobject ); if (obj) - obj->tqlayout(); + obj->layout(); } -void KPrDocument::tqlayout() +void KPrDocument::layout() { TQPtrListIterator<KoView> it( views() ); for( ; it.current(); ++it ) { KPrCanvas* canvas = ((KPrView*)it.current())->getCanvas(); - canvas->tqlayout(); + canvas->layout(); } } @@ -3963,7 +3963,7 @@ void KPrDocument::copyPageToClipboard( int pgnum ) KURL url; url.setPath( tempFile.name() ); KURL::List lst; lst.append( url ); - TQApplication::tqclipboard()->setData( new KURLDrag( lst ) ); + TQApplication::clipboard()->setData( new KURLDrag( lst ) ); m_tempFileInClipboard = tempFile.name(); // do this last, the above calls clipboardDataChanged } @@ -3987,7 +3987,7 @@ void KPrDocument::clipboardDataChanged() } // TODO enable paste as well, when a txtobject is activated // and there is plain text in the clipboard. Then enable this code. - //TQMimeSource *data = TQApplication::tqclipboard()->data(); + //TQMimeSource *data = TQApplication::clipboard()->data(); //bool canPaste = data->provides( "text/uri-list" ) || data->provides( "application/x-kpresenter-selection" ); // emit enablePaste( canPaste ); } @@ -4295,7 +4295,7 @@ void KPrDocument::newZoomAndResolution( bool updateViews, bool /*forPrint*/ ) for (; it.current(); ++it ) { static_cast<KPrView *>( it.current() )->getCanvas()->update(); - static_cast<KPrView *>( it.current() )->getCanvas()->tqlayout(); + static_cast<KPrView *>( it.current() )->getCanvas()->layout(); } } } diff --git a/kpresenter/KPrDocument.h b/kpresenter/KPrDocument.h index e1ae80e3..3584e372 100644 --- a/kpresenter/KPrDocument.h +++ b/kpresenter/KPrDocument.h @@ -166,7 +166,7 @@ class KPrDocument : public KoDocument virtual void addView( KoView *_view ); virtual void removeView( KoView *_view ); - // page tqlayout + // page layout void setPageLayout( const KoPageLayout &); virtual TQPixmap generatePreview( const TQSize &size ); @@ -461,8 +461,8 @@ class KPrDocument : public KoDocument KoCommandHistory * commandHistory()const { return m_commandHistory; } void updateObjectStatusBarItem(); void updateObjectSelected(); - void tqlayout(KPrObject *kpobject); - void tqlayout(); + void layout(KPrObject *kpobject); + void layout(); void changeBgSpellCheckingState( bool b ); bool cursorInProtectedArea()const; diff --git a/kpresenter/KPrEffectDia.cpp b/kpresenter/KPrEffectDia.cpp index 979df309..3d66f48a 100644 --- a/kpresenter/KPrEffectDia.cpp +++ b/kpresenter/KPrEffectDia.cpp @@ -62,10 +62,10 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList< topLayout = new TQVBoxLayout( page, 0, spacingHint() ); TQGroupBox *grp1 = new TQGroupBox(0, Qt::Vertical, i18n( "Appear" ), page ); - grp1->tqlayout()->setSpacing(KDialog::spacingHint()); - grp1->tqlayout()->setMargin(KDialog::marginHint()); + grp1->layout()->setSpacing(KDialog::spacingHint()); + grp1->layout()->setMargin(KDialog::marginHint()); topLayout->addWidget(grp1); - TQGridLayout *upperRow = new TQGridLayout(grp1->tqlayout(), 6, 4); + TQGridLayout *upperRow = new TQGridLayout(grp1->layout(), 6, 4); lAppear = new TQLabel( i18n( "Order of appearance:" ), grp1 ); lAppear->setAlignment( AlignVCenter ); @@ -197,10 +197,10 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList< topLayout->addWidget(disappear); TQGroupBox *grp2 = new TQGroupBox(0, Qt::Vertical, i18n( "Disappear" ), page); - grp2->tqlayout()->setSpacing(KDialog::spacingHint()); - grp2->tqlayout()->setMargin(KDialog::marginHint()); + grp2->layout()->setSpacing(KDialog::spacingHint()); + grp2->layout()->setMargin(KDialog::marginHint()); topLayout->addWidget(grp2); - TQGridLayout *lowerRow = new TQGridLayout(grp2->tqlayout(), 5, 4); + TQGridLayout *lowerRow = new TQGridLayout(grp2->layout(), 5, 4); lDisappear = new TQLabel( i18n( "Order of disappearance:" ), grp2 ); lDisappear->setAlignment( AlignVCenter ); diff --git a/kpresenter/KPrGeneralProperty.cpp b/kpresenter/KPrGeneralProperty.cpp index 89cf00ab..75671e28 100644 --- a/kpresenter/KPrGeneralProperty.cpp +++ b/kpresenter/KPrGeneralProperty.cpp @@ -37,11 +37,11 @@ KPrGeneralProperty::KPrGeneralProperty( TQWidget *parent, const char *name, Gene , m_generalValue( generalValue ) , m_unit( unit ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); - tqlayout->addWidget( m_ui = new KoGeneralPropertyUI( this ) ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); + layout->addWidget( m_ui = new KoGeneralPropertyUI( this ) ); TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); - tqlayout->addItem( spacer ); + layout->addItem( spacer ); if ( m_generalValue.m_name.isNull() ) { diff --git a/kpresenter/KPrMarginWidget.cpp b/kpresenter/KPrMarginWidget.cpp index 48074143..532fbb6e 100644 --- a/kpresenter/KPrMarginWidget.cpp +++ b/kpresenter/KPrMarginWidget.cpp @@ -38,13 +38,13 @@ KPrMarginWidget::KPrMarginWidget( TQWidget *parent, const char *name, const KoUn , m_changed( false ) , m_noSignal( false ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); m_ui = new MarginUI( this ); - tqlayout->addWidget( m_ui ); + layout->addWidget( m_ui ); TQSpacerItem *spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Expanding, TQSizePolicy::Expanding ); - tqlayout->addItem( spacer ); + layout->addItem( spacer ); m_ui->margins->setTitle( i18n( "Margins" ) ); diff --git a/kpresenter/KPrMoveHelpLineDia.cpp b/kpresenter/KPrMoveHelpLineDia.cpp index ea050f41..ba07c8b6 100644 --- a/kpresenter/KPrMoveHelpLineDia.cpp +++ b/kpresenter/KPrMoveHelpLineDia.cpp @@ -74,7 +74,7 @@ KPrInsertHelpLineDia::KPrInsertHelpLineDia( TQWidget *parent, const KoRect & _pa TQVBox *page = makeVBoxMainWidget(); TQButtonGroup *group = new TQButtonGroup( 1, Qt::Horizontal,i18n("Orientation"), page ); group->setRadioButtonExclusive( TRUE ); - group->tqlayout(); + group->layout(); m_rbHoriz = new TQRadioButton( i18n("Horizontal"), group ); m_rbVert = new TQRadioButton( i18n("Vertical"), group ); diff --git a/kpresenter/KPrPage.cpp b/kpresenter/KPrPage.cpp index 3eff9180..656b48e2 100644 --- a/kpresenter/KPrPage.cpp +++ b/kpresenter/KPrPage.cpp @@ -538,7 +538,7 @@ bool KPrPage::saveOasisPage( KoStore *store, KoXmlWriter &xmlWriter, int posPage xmlWriter.startElement( "style:master-page" ); xmlWriter.addAttribute( "style:name", "Standard" ); - xmlWriter.addAttribute( "style:page-tqlayout-name", pageLayoutName ); + xmlWriter.addAttribute( "style:page-layout-name", pageLayoutName ); TQString styleName = saveOasisPageStyle( store, context.mainStyles() ); if ( !styleName.isEmpty() ) @@ -655,7 +655,7 @@ bool KPrPage::saveOasisNote( KoXmlWriter &xmlWriter ) const return true; //todo : add size for draw:text-box otherwise we can't import into oo - //<draw:text-box presentation:style-name="pr1" draw:text-style-name="P1" draw:layer="tqlayout" svg:width="14.5cm" svg:height="11.408cm" svg:x="3.247cm" svg:y="14.126cm" presentation:class="notes"> + //<draw:text-box presentation:style-name="pr1" draw:text-style-name="P1" draw:layer="layout" svg:width="14.5cm" svg:height="11.408cm" svg:x="3.247cm" svg:y="14.126cm" presentation:class="notes"> xmlWriter.startElement( "presentation:notes" ); xmlWriter.startElement( "draw:frame" ); //todo save style @@ -2445,7 +2445,7 @@ void KPrPage::changeTabStopValue ( double _tabStop ) if ( obj ) { obj->textDocument()->setTabStops( m_doc->zoomHandler()->ptToLayoutUnitPixX( _tabStop )); - obj->tqlayout(); + obj->layout(); m_doc->repaint( obj ); } } diff --git a/kpresenter/KPrPenStyleWidget.cpp b/kpresenter/KPrPenStyleWidget.cpp index d6790084..753b184a 100644 --- a/kpresenter/KPrPenStyleWidget.cpp +++ b/kpresenter/KPrPenStyleWidget.cpp @@ -37,11 +37,11 @@ KPrPenStyleWidget::KPrPenStyleWidget( TQWidget *parent, const char *name, const : TQWidget( parent, name ) , m_pen( pen ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); - tqlayout->addWidget( m_ui = new PenStyleUI( this ) ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); + layout->addWidget( m_ui = new PenStyleUI( this ) ); TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); - tqlayout->addItem( spacer ); + layout->addItem( spacer ); connect( m_ui->colorChooser, TQT_SIGNAL( changed( const TQColor& ) ), this, TQT_SLOT( slotPenChanged() ) ); diff --git a/kpresenter/KPrPgConfDia.cpp b/kpresenter/KPrPgConfDia.cpp index 0b1aab1f..fa51abf4 100644 --- a/kpresenter/KPrPgConfDia.cpp +++ b/kpresenter/KPrPgConfDia.cpp @@ -135,9 +135,9 @@ void KPrPgConfDia::setupPageGeneral() "using the mouse.</p>" "<p>You can configure the color of the drawing pen and the " "width of the pen.</p>" ) ); - penGroup->tqlayout()->setSpacing(KDialog::marginHint()); - penGroup->tqlayout()->setMargin(KDialog::spacingHint()); - //TQGridLayout *grid = new TQGridLayout(penGroup->tqlayout(), 3, 2 ); + penGroup->layout()->setSpacing(KDialog::marginHint()); + penGroup->layout()->setMargin(KDialog::spacingHint()); + //TQGridLayout *grid = new TQGridLayout(penGroup->layout(), 3, 2 ); TQLabel* label = new TQLabel( i18n( "Color:" ), penGroup ); //grid->addWidget( label, 0, 0 ); diff --git a/kpresenter/KPrPictureProperty.cpp b/kpresenter/KPrPictureProperty.cpp index 5e0e6db8..89c1111f 100644 --- a/kpresenter/KPrPictureProperty.cpp +++ b/kpresenter/KPrPictureProperty.cpp @@ -33,8 +33,8 @@ KPrPictureProperty::KPrPictureProperty( TQWidget *parent, const char *name, cons : TQWidget( parent, name ) , m_pictureSettings( pictureSettings ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); - tqlayout->addWidget( m_ui = new PicturePropertyUI( this ) ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); + layout->addWidget( m_ui = new PicturePropertyUI( this ) ); connect( m_ui->depth0, TQT_SIGNAL( clicked() ), m_ui->picturePreview, TQT_SLOT( slotPictureDepth0() ) ); connect( m_ui->depth1, TQT_SIGNAL( clicked() ), m_ui->picturePreview, TQT_SLOT( slotPictureDepth1() ) ); diff --git a/kpresenter/KPrPieProperty.cpp b/kpresenter/KPrPieProperty.cpp index 694a9653..7c7e788a 100644 --- a/kpresenter/KPrPieProperty.cpp +++ b/kpresenter/KPrPieProperty.cpp @@ -35,8 +35,8 @@ KPrPieProperty::KPrPieProperty( TQWidget *parent, const char *name, KPrPieValueC : TQWidget( parent, name ) , m_pieValues( pieValues ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); - tqlayout->addWidget( m_ui = new PiePropertyUI( this ) ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); + layout->addWidget( m_ui = new PiePropertyUI( this ) ); m_ui->typeCombo->insertItem( i18n( "Pie" ) ); m_ui->typeCombo->insertItem( i18n( "Arc" ) ); diff --git a/kpresenter/KPrPolygonProperty.cpp b/kpresenter/KPrPolygonProperty.cpp index fe303a0b..4d8cf155 100644 --- a/kpresenter/KPrPolygonProperty.cpp +++ b/kpresenter/KPrPolygonProperty.cpp @@ -33,8 +33,8 @@ KPrPolygonProperty::KPrPolygonProperty( TQWidget *parent, const char *name, KPrP : TQWidget( parent, name ) , m_polygonSettings( polygonSettings ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); - tqlayout->addWidget( m_ui = new PolygonPropertyUI( this ) ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); + layout->addWidget( m_ui = new PolygonPropertyUI( this ) ); m_ui->typeCombo->insertItem( i18n( "Polygon" ) ); m_ui->typeCombo->insertItem( i18n( "Convex/Concave" ) ); diff --git a/kpresenter/KPrPrinterDlg.cpp b/kpresenter/KPrPrinterDlg.cpp index 3dce55a3..cf496a15 100644 --- a/kpresenter/KPrPrinterDlg.cpp +++ b/kpresenter/KPrPrinterDlg.cpp @@ -36,7 +36,7 @@ : KPrintDialogPage( parent, name ) { setTitle( i18n( "KPresenter Options" ) ); - TQGridLayout *tqlayout = new TQGridLayout( this, 2, 1, 11, 6 ); + TQGridLayout *layout = new TQGridLayout( this, 2, 1, 11, 6 ); txtRows = new KIntNumInput(this ); txtRows->setMinValue(1); txtRows->setMaxValue(5); @@ -50,21 +50,21 @@ TQLabel *caption = new TQLabel(i18n("Slides in the pages:"), this ); TQToolTip::add( caption, i18n("Choose how many rows and columns with slides you want to have on all pages") ); - tqlayout->addMultiCellWidget( caption, 0, 0, 0, 1 ); + layout->addMultiCellWidget( caption, 0, 0, 0, 1 ); TQVBoxLayout *l2 = new TQVBoxLayout( 0, 0, 6 ); l2->addWidget( new TQLabel(i18n("Rows: "), this) ); l2->addWidget( new TQLabel(i18n("Columns: "), this) ); - tqlayout->addLayout( l2, 1, 0 ); + layout->addLayout( l2, 1, 0 ); TQVBoxLayout *l3 = new TQVBoxLayout( 0, 0, 6 ); l3->addWidget( txtRows ); l3->addWidget( txtColumns ); - tqlayout->addLayout( l3, 1, 1 ); + layout->addLayout( l3, 1, 1 ); drawBorder = new TQCheckBox(i18n("Draw border around the slides"), this ); drawBorder->setChecked( true ); drawBorder->setEnabled( false ); - tqlayout->addMultiCellWidget( drawBorder, 2, 2, 0, 1 ); + layout->addMultiCellWidget( drawBorder, 2, 2, 0, 1 ); } void KPrPrinterDlg::getOptions( TQMap<TQString, TQString>& opts, bool ) diff --git a/kpresenter/KPrRectProperty.cpp b/kpresenter/KPrRectProperty.cpp index 2174755b..4f9bd8b6 100644 --- a/kpresenter/KPrRectProperty.cpp +++ b/kpresenter/KPrRectProperty.cpp @@ -34,8 +34,8 @@ KPrRectProperty::KPrRectProperty( TQWidget *parent, const char *name, KPrRectVal , m_rectValue( rectValue ) { formerVerticalValue = 0; - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); - tqlayout->addWidget( m_ui = new RectPropertyUI( this ) ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); + layout->addWidget( m_ui = new RectPropertyUI( this ) ); KoImageResource kir; m_ui->combineButton->setPixmap(kir.chain()); diff --git a/kpresenter/KPrTextObject.cpp b/kpresenter/KPrTextObject.cpp index 6c16133e..87db439d 100644 --- a/kpresenter/KPrTextObject.cpp +++ b/kpresenter/KPrTextObject.cpp @@ -473,7 +473,7 @@ void KPrTextObject::drawText( TQPainter* _painter, KoTextZoomHandler *zoomHandle { //kdDebug(33001) << "KPrTextObject::drawText onlyChanged=" << onlyChanged << " cursor=" << cursor << " resetChanged=" << resetChanged << endl; recalcVerticalAlignment(); - TQColorGroup cg = TQApplication::tqpalette().active(); + TQColorGroup cg = TQApplication::palette().active(); _painter->save(); _painter->translate( m_doc->zoomHandler()->zoomItX( bLeft()), m_doc->zoomHandler()->zoomItY( bTop()+alignVertical)); if ( !editingTextObj || (_painter->device() && _painter->device()->devType() == TQInternal::Printer)) @@ -972,7 +972,7 @@ KoTextFormat KPrTextObject::loadFormat( TQDomElement &n, KoTextFormat * refForma KoParagLayout KPrTextObject::loadParagLayout( TQDomElement & parentElem, KPrDocument *doc, bool findStyle) { - KoParagLayout tqlayout; + KoParagLayout layout; // Only when loading paragraphs, not when loading styles if ( findStyle ) @@ -998,7 +998,7 @@ KoParagLayout KPrTextObject::loadParagLayout( TQDomElement & parentElem, KPrDocu style = doc->styleCollection()->findStyle( "Standard" ); } Q_ASSERT(style); - tqlayout.style = style; + layout.style = style; } TQDomElement element = parentElem.namedItem( "INDENTS" ).toElement(); @@ -1007,17 +1007,17 @@ KoParagLayout KPrTextObject::loadParagLayout( TQDomElement & parentElem, KPrDocu double val=0.0; if(element.hasAttribute("first")) val=element.attribute("first").toDouble(); - tqlayout.margins[TQStyleSheetItem::MarginFirstLine] = val; + layout.margins[TQStyleSheetItem::MarginFirstLine] = val; val=0.0; if(element.hasAttribute( "left")) // The GUI prevents a negative indent, so let's fixup broken docs too val=TQMAX(0, element.attribute( "left").toDouble()); - tqlayout.margins[TQStyleSheetItem::MarginLeft] = val; + layout.margins[TQStyleSheetItem::MarginLeft] = val; val=0.0; if(element.hasAttribute("right")) // The GUI prevents a negative indent, so let's fixup broken docs too val=TQMAX(0, element.attribute("right").toDouble()); - tqlayout.margins[TQStyleSheetItem::MarginRight] = val; + layout.margins[TQStyleSheetItem::MarginRight] = val; } element = parentElem.namedItem( "LINESPACING" ).toElement(); if ( !element.isNull() ) @@ -1028,18 +1028,18 @@ KoParagLayout KPrTextObject::loadParagLayout( TQDomElement & parentElem, KPrDocu TQString value = element.attribute( "value" ); if ( value == "oneandhalf" ) { - tqlayout.lineSpacingType = KoParagLayout::LS_ONEANDHALF; - tqlayout.setLineSpacingValue(0); + layout.lineSpacingType = KoParagLayout::LS_ONEANDHALF; + layout.setLineSpacingValue(0); } else if ( value == "double" ) { - tqlayout.lineSpacingType = KoParagLayout::LS_DOUBLE; - tqlayout.setLineSpacingValue(0); + layout.lineSpacingType = KoParagLayout::LS_DOUBLE; + layout.setLineSpacingValue(0); } else { - tqlayout.lineSpacingType = KoParagLayout::LS_CUSTOM; - tqlayout.setLineSpacingValue(value.toDouble()); + layout.lineSpacingType = KoParagLayout::LS_CUSTOM; + layout.setLineSpacingValue(value.toDouble()); } } else @@ -1047,28 +1047,28 @@ KoParagLayout KPrTextObject::loadParagLayout( TQDomElement & parentElem, KPrDocu TQString type = element.attribute( "type" ); if ( type == "oneandhalf" ) { - tqlayout.lineSpacingType = KoParagLayout::LS_ONEANDHALF; - tqlayout.setLineSpacingValue(0); + layout.lineSpacingType = KoParagLayout::LS_ONEANDHALF; + layout.setLineSpacingValue(0); } else if ( type == "double" ) { - tqlayout.lineSpacingType = KoParagLayout::LS_DOUBLE; - tqlayout.setLineSpacingValue(0); + layout.lineSpacingType = KoParagLayout::LS_DOUBLE; + layout.setLineSpacingValue(0); } else if ( type == "custom" ) { - tqlayout.lineSpacingType = KoParagLayout::LS_CUSTOM; - tqlayout.setLineSpacingValue(element.attribute( "spacingvalue" ).toDouble()); + layout.lineSpacingType = KoParagLayout::LS_CUSTOM; + layout.setLineSpacingValue(element.attribute( "spacingvalue" ).toDouble()); } else if ( type == "atleast" ) { - tqlayout.lineSpacingType = KoParagLayout::LS_AT_LEAST; - tqlayout.setLineSpacingValue(element.attribute( "spacingvalue" ).toDouble()); + layout.lineSpacingType = KoParagLayout::LS_AT_LEAST; + layout.setLineSpacingValue(element.attribute( "spacingvalue" ).toDouble()); } else if ( type == "multiple" ) { - tqlayout.lineSpacingType = KoParagLayout::LS_MULTIPLE; - tqlayout.setLineSpacingValue(element.attribute( "spacingvalue" ).toDouble()); + layout.lineSpacingType = KoParagLayout::LS_MULTIPLE; + layout.setLineSpacingValue(element.attribute( "spacingvalue" ).toDouble()); } } } @@ -1079,43 +1079,43 @@ KoParagLayout KPrTextObject::loadParagLayout( TQDomElement & parentElem, KPrDocu double val =0.0; if(element.hasAttribute("before")) val=TQMAX(0, element.attribute("before").toDouble()); - tqlayout.margins[TQStyleSheetItem::MarginTop] = val; + layout.margins[TQStyleSheetItem::MarginTop] = val; val = 0.0; if(element.hasAttribute("after")) val=TQMAX(0, element.attribute("after").toDouble()); - tqlayout.margins[TQStyleSheetItem::MarginBottom] = val; + layout.margins[TQStyleSheetItem::MarginBottom] = val; } element = parentElem.namedItem( "LEFTBORDER" ).toElement(); if ( !element.isNull() ) - tqlayout.leftBorder = KoBorder::loadBorder( element ); + layout.leftBorder = KoBorder::loadBorder( element ); else - tqlayout.leftBorder.setPenWidth( 0); + layout.leftBorder.setPenWidth( 0); element = parentElem.namedItem( "RIGHTBORDER" ).toElement(); if ( !element.isNull() ) - tqlayout.rightBorder = KoBorder::loadBorder( element ); + layout.rightBorder = KoBorder::loadBorder( element ); else - tqlayout.rightBorder.setPenWidth( 0); + layout.rightBorder.setPenWidth( 0); element = parentElem.namedItem( "TOPBORDER" ).toElement(); if ( !element.isNull() ) - tqlayout.topBorder = KoBorder::loadBorder( element ); + layout.topBorder = KoBorder::loadBorder( element ); else - tqlayout.topBorder.setPenWidth(0); + layout.topBorder.setPenWidth(0); element = parentElem.namedItem( "BOTTOMBORDER" ).toElement(); if ( !element.isNull() ) - tqlayout.bottomBorder = KoBorder::loadBorder( element ); + layout.bottomBorder = KoBorder::loadBorder( element ); else - tqlayout.bottomBorder.setPenWidth(0); + layout.bottomBorder.setPenWidth(0); element = parentElem.namedItem( "COUNTER" ).toElement(); if ( !element.isNull() ) { - tqlayout.counter = new KoParagCounter; - tqlayout.counter->load( element ); + layout.counter = new KoParagCounter; + layout.counter->load( element ); } KoTabulatorList tabList; @@ -1140,110 +1140,110 @@ KoParagLayout KPrTextObject::loadParagLayout( TQDomElement & parentElem, KPrDocu tabList.append( tab ); } } - tqlayout.setTabList( tabList ); + layout.setTabList( tabList ); - return tqlayout; + return layout; } -void KPrTextObject::saveParagLayout( const KoParagLayout& tqlayout, TQDomElement & parentElem ) +void KPrTextObject::saveParagLayout( const KoParagLayout& layout, TQDomElement & parentElem ) { TQDomDocument doc = parentElem.ownerDocument(); TQDomElement element = doc.createElement( "NAME" ); parentElem.appendChild( element ); - if ( tqlayout.style ) - element.setAttribute( "value", tqlayout.style->name() ); + if ( layout.style ) + element.setAttribute( "value", layout.style->name() ); else kdWarning() << "KWTextParag::saveParagLayout: style==0L!" << endl; - if ( tqlayout.margins[TQStyleSheetItem::MarginFirstLine] != 0 || - tqlayout.margins[TQStyleSheetItem::MarginLeft] != 0 || - tqlayout.margins[TQStyleSheetItem::MarginRight] != 0 ) + if ( layout.margins[TQStyleSheetItem::MarginFirstLine] != 0 || + layout.margins[TQStyleSheetItem::MarginLeft] != 0 || + layout.margins[TQStyleSheetItem::MarginRight] != 0 ) { element = doc.createElement( "INDENTS" ); parentElem.appendChild( element ); - if ( tqlayout.margins[TQStyleSheetItem::MarginFirstLine] != 0 ) - element.setAttribute( "first", tqlayout.margins[TQStyleSheetItem::MarginFirstLine] ); - if ( tqlayout.margins[TQStyleSheetItem::MarginLeft] != 0 ) - element.setAttribute( "left", tqlayout.margins[TQStyleSheetItem::MarginLeft] ); - if ( tqlayout.margins[TQStyleSheetItem::MarginRight] != 0 ) - element.setAttribute( "right", tqlayout.margins[TQStyleSheetItem::MarginRight] ); + if ( layout.margins[TQStyleSheetItem::MarginFirstLine] != 0 ) + element.setAttribute( "first", layout.margins[TQStyleSheetItem::MarginFirstLine] ); + if ( layout.margins[TQStyleSheetItem::MarginLeft] != 0 ) + element.setAttribute( "left", layout.margins[TQStyleSheetItem::MarginLeft] ); + if ( layout.margins[TQStyleSheetItem::MarginRight] != 0 ) + element.setAttribute( "right", layout.margins[TQStyleSheetItem::MarginRight] ); } - if ( tqlayout.margins[TQStyleSheetItem::MarginTop] != 0 || - tqlayout.margins[TQStyleSheetItem::MarginBottom] != 0 ) + if ( layout.margins[TQStyleSheetItem::MarginTop] != 0 || + layout.margins[TQStyleSheetItem::MarginBottom] != 0 ) { element = doc.createElement( "OFFSETS" ); parentElem.appendChild( element ); - if ( tqlayout.margins[TQStyleSheetItem::MarginTop] != 0 ) - element.setAttribute( "before", tqlayout.margins[TQStyleSheetItem::MarginTop] ); - if ( tqlayout.margins[TQStyleSheetItem::MarginBottom] != 0 ) - element.setAttribute( "after", tqlayout.margins[TQStyleSheetItem::MarginBottom] ); + if ( layout.margins[TQStyleSheetItem::MarginTop] != 0 ) + element.setAttribute( "before", layout.margins[TQStyleSheetItem::MarginTop] ); + if ( layout.margins[TQStyleSheetItem::MarginBottom] != 0 ) + element.setAttribute( "after", layout.margins[TQStyleSheetItem::MarginBottom] ); } - if ( tqlayout.lineSpacingType != KoParagLayout::LS_SINGLE ) + if ( layout.lineSpacingType != KoParagLayout::LS_SINGLE ) { element = doc.createElement( "LINESPACING" ); parentElem.appendChild( element ); - if ( tqlayout.lineSpacingType == KoParagLayout::LS_ONEANDHALF ) + if ( layout.lineSpacingType == KoParagLayout::LS_ONEANDHALF ) element.setAttribute( "type", "oneandhalf" ); - else if ( tqlayout.lineSpacingType == KoParagLayout::LS_DOUBLE ) + else if ( layout.lineSpacingType == KoParagLayout::LS_DOUBLE ) element.setAttribute( "type", "double" ); - else if ( tqlayout.lineSpacingType == KoParagLayout::LS_CUSTOM ) + else if ( layout.lineSpacingType == KoParagLayout::LS_CUSTOM ) { element.setAttribute( "type", "custom" ); - element.setAttribute( "spacingvalue", tqlayout.lineSpacingValue()); + element.setAttribute( "spacingvalue", layout.lineSpacingValue()); } - else if ( tqlayout.lineSpacingType == KoParagLayout::LS_AT_LEAST ) + else if ( layout.lineSpacingType == KoParagLayout::LS_AT_LEAST ) { element.setAttribute( "type", "atleast" ); - element.setAttribute( "spacingvalue", tqlayout.lineSpacingValue()); + element.setAttribute( "spacingvalue", layout.lineSpacingValue()); } - else if ( tqlayout.lineSpacingType == KoParagLayout::LS_MULTIPLE ) + else if ( layout.lineSpacingType == KoParagLayout::LS_MULTIPLE ) { element.setAttribute( "type", "multiple" ); - element.setAttribute( "spacingvalue", tqlayout.lineSpacingValue()); + element.setAttribute( "spacingvalue", layout.lineSpacingValue()); } else kdDebug(33001) << " error in lineSpacing Type" << endl; } - if ( tqlayout.leftBorder.penWidth() > 0 ) + if ( layout.leftBorder.penWidth() > 0 ) { element = doc.createElement( "LEFTBORDER" ); parentElem.appendChild( element ); - tqlayout.leftBorder.save( element ); + layout.leftBorder.save( element ); } - if ( tqlayout.rightBorder.penWidth() > 0 ) + if ( layout.rightBorder.penWidth() > 0 ) { element = doc.createElement( "RIGHTBORDER" ); parentElem.appendChild( element ); - tqlayout.rightBorder.save( element ); + layout.rightBorder.save( element ); } - if ( tqlayout.topBorder.penWidth() > 0 ) + if ( layout.topBorder.penWidth() > 0 ) { element = doc.createElement( "TOPBORDER" ); parentElem.appendChild( element ); - tqlayout.topBorder.save( element ); + layout.topBorder.save( element ); } - if ( tqlayout.bottomBorder.penWidth() > 0 ) + if ( layout.bottomBorder.penWidth() > 0 ) { element = doc.createElement( "BOTTOMBORDER" ); parentElem.appendChild( element ); - tqlayout.bottomBorder.save( element ); + layout.bottomBorder.save( element ); } - if ( tqlayout.counter && tqlayout.counter->numbering() != KoParagCounter::NUM_NONE ) + if ( layout.counter && layout.counter->numbering() != KoParagCounter::NUM_NONE ) { element = doc.createElement( "COUNTER" ); parentElem.appendChild( element ); - if (tqlayout.counter ) - tqlayout.counter->save( element ); + if (layout.counter ) + layout.counter->save( element ); } - KoTabulatorList tabList = tqlayout.tabList(); + KoTabulatorList tabList = layout.tabList(); KoTabulatorList::ConstIterator it = tabList.begin(); for ( ; it != tabList.end() ; it++ ) { @@ -1293,7 +1293,7 @@ void KPrTextObject::recalcPageNum( KPrPage *page ) } } -void KPrTextObject::tqlayout() +void KPrTextObject::layout() { invalidate(); // Get the thing going though, repainting doesn't call formatMore @@ -1305,7 +1305,7 @@ void KPrTextObject::invalidate() //kdDebug(33001) << "KWTextFrameSet::invalidate " << getName() << endl; m_textobj->setLastFormattedParag( textDocument()->firstParag() ); textDocument()->formatter()->setViewFormattingChars( m_doc->viewFormattingChars() ); - textDocument()->invalidate(); // lazy tqlayout, real update follows upon next repaint + textDocument()->invalidate(); // lazy layout, real update follows upon next repaint } // For the "paragraph after paragraph" effect @@ -1380,7 +1380,7 @@ void KPrTextObject::drawCursor( TQPainter *p, KoTextCursor *cursor, bool cursorV //p->fillRect( clip, TQt::blue ); TQPixmap *pix = 0; - TQColorGroup cg = TQApplication::tqpalette().active(); + TQColorGroup cg = TQApplication::palette().active(); cg.setColor( TQColorGroup::Base, m_doc->txtBackCol() ); uint drawingFlags = KoTextDocument::DrawSelections; @@ -1582,7 +1582,7 @@ void KPrTextObject::slotAfterFormatting( int bottom, KoTextParag* lastFormatted, if ( ( bottom > availHeight ) || // this parag is already below the avail height ( lastFormatted && (bottom + lastFormatted->rect().height() > availHeight) ) ) // or next parag will be below it { - int difference = ( bottom + 2 ) - availHeight; // in tqlayout unit pixels + int difference = ( bottom + 2 ) - availHeight; // in layout unit pixels if( lastFormatted && bottom + lastFormatted->rect().height() > availHeight ) { difference += lastFormatted->rect().height(); @@ -1822,7 +1822,7 @@ void KPrTextView::copy() //kdDebug(33001)<<"void KPrTextView::copy() "<<endl; if ( textDocument()->hasSelection( KoTextDocument::Standard ) ) { TQDragObject *drag = newDrag( 0 ); - TQApplication::tqclipboard()->setData( drag ); + TQApplication::clipboard()->setData( drag ); } } @@ -1830,7 +1830,7 @@ void KPrTextView::paste() { //kdDebug(33001) << "KPrTextView::paste()" << endl; - TQMimeSource *data = TQApplication::tqclipboard()->data(); + TQMimeSource *data = TQApplication::clipboard()->data(); TQCString returnedMimeType = KoTextObject::providesOasis( data ); if ( !returnedMimeType.isEmpty() ) { @@ -1852,11 +1852,11 @@ void KPrTextView::paste() { // Note: TQClipboard::text() seems to do a better job than encodedData( "text/plain" ) // In particular it handles charsets (in the mimetype). - TQString text = TQApplication::tqclipboard()->text(); + TQString text = TQApplication::clipboard()->text(); if ( !text.isEmpty() ) textObject()->pasteText( cursor(), text, currentFormat(), true /*removeSelected*/ ); } - kpTextObject()->tqlayout(); + kpTextObject()->layout(); } void KPrTextView::updateUI( bool updateFormat, bool force ) @@ -2472,7 +2472,7 @@ void KPrTextView::dropEvent( TQDropEvent * e ) KCommand *cmd = textView()->prepareDropMove( dropCursor ); if(cmd) { - kpTextObject()->tqlayout(); + kpTextObject()->layout(); macroCmd->addCommand(cmd); addMacroCmd = true; } diff --git a/kpresenter/KPrTextObject.h b/kpresenter/KPrTextObject.h index 03de6444..6b62d6b8 100644 --- a/kpresenter/KPrTextObject.h +++ b/kpresenter/KPrTextObject.h @@ -137,7 +137,7 @@ public: bool isProtectContent() const { return textObject()->protectContent();} void loadVariable( TQValueList<TQDomElement> & listVariable,KoTextParag *lastParag, int offset=0 ); - void tqlayout(); + void layout(); /** Reimplemented from KoTextFlow */ int availableHeight() const; @@ -194,7 +194,7 @@ protected: virtual void loadKTextObject( const TQDomElement &e ); void drawText( TQPainter* _painter, KoTextZoomHandler* zoomHandler, bool onlyChanged, KoTextCursor* cursor, bool resetChanged ); void drawParags( TQPainter *p, KoTextZoomHandler* zoomHandler, const TQColorGroup& cg, int from, int to ); - void saveParagLayout( const KoParagLayout& tqlayout, TQDomElement & parentElem ); + void saveParagLayout( const KoParagLayout& layout, TQDomElement & parentElem ); void invalidate(); void recalcVerticalAlignment(); virtual KoPen defaultPen() const; diff --git a/kpresenter/KPrTextObjectIface.cpp b/kpresenter/KPrTextObjectIface.cpp index 0dfc1d79..01478ef2 100644 --- a/kpresenter/KPrTextObjectIface.cpp +++ b/kpresenter/KPrTextObjectIface.cpp @@ -247,25 +247,25 @@ bool KPrTextObjectIface::isProtectContent() const void KPrTextObjectIface::setPtMarginLeft(double val) { m_textobject->setBLeft(val); - m_textobject->kPresenterDocument()->tqlayout( m_textobject ); + m_textobject->kPresenterDocument()->layout( m_textobject ); } void KPrTextObjectIface::setPtMarginRight(double val) { m_textobject->setBRight(val); - m_textobject->kPresenterDocument()->tqlayout( m_textobject ); + m_textobject->kPresenterDocument()->layout( m_textobject ); } void KPrTextObjectIface::setPtMarginTop(double val) { m_textobject->setBTop(val); - m_textobject->kPresenterDocument()->tqlayout( m_textobject ); + m_textobject->kPresenterDocument()->layout( m_textobject ); } void KPrTextObjectIface::setPtMarginBottom(double val) { m_textobject->setBBottom(val); - m_textobject->kPresenterDocument()->tqlayout( m_textobject ); + m_textobject->kPresenterDocument()->layout( m_textobject ); } double KPrTextObjectIface::ptMarginLeft()const diff --git a/kpresenter/KPrTextProperty.cpp b/kpresenter/KPrTextProperty.cpp index 891ff5b4..a0610cec 100644 --- a/kpresenter/KPrTextProperty.cpp +++ b/kpresenter/KPrTextProperty.cpp @@ -37,10 +37,10 @@ KPrTextProperty::KPrTextProperty( TQWidget *parent, const char *name, const Marg , m_unit( unit ) , m_protectContent( protectContent ) { - TQGridLayout *tqlayout = new TQGridLayout( this, 1, 1, 11, 6 ); + TQGridLayout *layout = new TQGridLayout( this, 1, 1, 11, 6 ); - tqlayout->addWidget( m_protectContentCheck = new TQCheckBox( i18n( "Protect content" ), this ), 0, 0 ); - tqlayout->addWidget( m_margins = new KPrMarginWidget( this, name, m_unit ), 1, 0 ); + layout->addWidget( m_protectContentCheck = new TQCheckBox( i18n( "Protect content" ), this ), 0, 0 ); + layout->addWidget( m_margins = new KPrMarginWidget( this, name, m_unit ), 1, 0 ); connect( m_protectContentCheck, TQT_SIGNAL( toggled ( bool ) ), this, TQT_SLOT( slotProtectContentChanged( bool ) ) ); diff --git a/kpresenter/KPrTransEffectDia.cpp b/kpresenter/KPrTransEffectDia.cpp index a060e45f..ba421709 100644 --- a/kpresenter/KPrTransEffectDia.cpp +++ b/kpresenter/KPrTransEffectDia.cpp @@ -160,8 +160,8 @@ KPrTransEffectDia::KPrTransEffectDia( TQWidget *parent, const char *name, // right-side of the dialog, for showing effect preview - TQVBoxLayout *righttqlayout = new TQVBoxLayout( rightpart, KDialog::marginHint(), KDialog::spacingHint() ); - righttqlayout->setAutoAdd( true ); + TQVBoxLayout *rightlayout = new TQVBoxLayout( rightpart, KDialog::marginHint(), KDialog::spacingHint() ); + rightlayout->setAutoAdd( true ); effectPreview = new KPrEffectPreview( rightpart, doc, view ); @@ -178,8 +178,8 @@ KPrTransEffectDia::KPrTransEffectDia( TQWidget *parent, const char *name, pageEffect = pg->getPageEffect(); speed = pg->getPageEffectSpeed(); - TQVBoxLayout *lefttqlayout = new TQVBoxLayout( leftpart, KDialog::marginHint(), KDialog::spacingHint() ); - lefttqlayout->setAutoAdd( true ); + TQVBoxLayout *leftlayout = new TQVBoxLayout( leftpart, KDialog::marginHint(), KDialog::spacingHint() ); + leftlayout->setAutoAdd( true ); new TQLabel( i18n("Effect:"), leftpart ); diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp index a2781ca1..af3905ba 100644 --- a/kpresenter/KPrView.cpp +++ b/kpresenter/KPrView.cpp @@ -502,12 +502,12 @@ void KPrView::setupPrinter( KPrinter &prt ) prt.setFromTo( 1, m_pKPresenterDoc->getPageNums() ); prt.setOption( "kde-range", m_pKPresenterDoc->selectedForPrinting() ); prt.setPageSelection(KPrinter::ApplicationSide); - KoPageLayout tqlayout = m_pKPresenterDoc->pageLayout(); - prt.setOption( "kde-margin-top", TQString::number(tqlayout.ptTop) ); - prt.setOption( "kde-margin-bottom", TQString::number(tqlayout.ptBottom) ); - prt.setOption( "kde-margin-left", TQString::number(tqlayout.ptLeft) ); - prt.setOption( "kde-margin-right", TQString::number(tqlayout.ptRight) ); - KoFormat pageFormat = tqlayout.format; + KoPageLayout layout = m_pKPresenterDoc->pageLayout(); + prt.setOption( "kde-margin-top", TQString::number(layout.ptTop) ); + prt.setOption( "kde-margin-bottom", TQString::number(layout.ptBottom) ); + prt.setOption( "kde-margin-left", TQString::number(layout.ptLeft) ); + prt.setOption( "kde-margin-right", TQString::number(layout.ptRight) ); + KoFormat pageFormat = layout.format; prt.setPageSize( static_cast<KPrinter::PageSize>( KoPageFormat::printerPageSize( pageFormat ) ) ); if ( m_pKPresenterDoc->pageLayout().orientation == PG_LANDSCAPE || pageFormat == PG_SCREEN ) @@ -620,7 +620,7 @@ void KPrView::editPaste() if ( !m_canvas->currentTextObjectView() ) { m_canvas->setToolEditMode( TEM_MOUSE ); deSelectAllObjects(); - TQMimeSource *data = TQApplication::tqclipboard()->data(); + TQMimeSource *data = TQApplication::clipboard()->data(); if ( data->provides( "text/uri-list" ) ) { m_pKPresenterDoc->pastePage( data, currPg ); @@ -5360,7 +5360,7 @@ KoTextZoomHandler *KPrView::zoomHandler() const void KPrView::slotViewFormattingChars() { m_pKPresenterDoc->setViewFormattingChars(actionViewFormattingChars->isChecked()); - m_pKPresenterDoc->tqlayout(); // Due to the different formatting when this option is activated + m_pKPresenterDoc->layout(); // Due to the different formatting when this option is activated m_pKPresenterDoc->repaint(false); } @@ -5964,7 +5964,7 @@ void KPrView::duplicateObj() m_canvas->copyObjs(); m_canvas->setToolEditMode( TEM_MOUSE ); deSelectAllObjects(); - TQMimeSource *data = TQApplication::tqclipboard()->data(); + TQMimeSource *data = TQApplication::clipboard()->data(); TQCString clip_str = KoStoreDrag::mimeType("application/x-kpresenter"); if ( data->provides( clip_str ) ) { diff --git a/kpresenter/KPrWebPresentation.cpp b/kpresenter/KPrWebPresentation.cpp index 0d490cf4..d4df256b 100644 --- a/kpresenter/KPrWebPresentation.cpp +++ b/kpresenter/KPrWebPresentation.cpp @@ -87,7 +87,7 @@ static TQString EscapeSgmlText(const TQTextCodec* codec, const TQString& strIn, for (uint i=0; i<strIn.length(); i++) { ch=strIn[i]; - switch (ch.tqunicode()) + switch (ch.unicode()) { case 38: // & { @@ -129,7 +129,7 @@ static TQString EscapeSgmlText(const TQTextCodec* codec, const TQString& strIn, { if (!codec->canEncode(ch)) { - strReturn+=TQString("&#%1;").arg(ch.tqunicode()); + strReturn+=TQString("&#%1;").arg(ch.unicode()); break; } } @@ -156,7 +156,7 @@ static TQString EscapeEncodingOnly(const TQTextCodec* codec, const TQString& str { if (!codec->canEncode(ch)) { - strReturn+=TQString("&#%1;").arg(ch.tqunicode()); + strReturn+=TQString("&#%1;").arg(ch.unicode()); continue; } } @@ -664,7 +664,7 @@ void KPrWebPresentationWizard::setupPage1() sidebar->setPixmap(locate("data", "kpresenter/pics/webslideshow-sidebar.png")); TQWidget* canvas = new TQWidget( page1 ); - TQGridLayout *tqlayout = new TQGridLayout( canvas, 7, 2, + TQGridLayout *layout = new TQGridLayout( canvas, 7, 2, KDialog::marginHint(), KDialog::spacingHint() ); TQLabel *helptext = new TQLabel( canvas ); @@ -673,29 +673,29 @@ void KPrWebPresentationWizard::setupPage1() "the title of the web presentation. " "Also enter the output directory where the " "web presentation should be saved. " ) ); - tqlayout->addMultiCellWidget( helptext, 0, 0, 0, 1 ); + layout->addMultiCellWidget( helptext, 0, 0, 0, 1 ); - tqlayout->addMultiCell( new TQSpacerItem( 1, 50 ), 1, 1, 0, 1 ); + layout->addMultiCell( new TQSpacerItem( 1, 50 ), 1, 1, 0, 1 ); TQLabel *label1 = new TQLabel( i18n("Author:"), canvas ); label1->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); TQWhatsThis::add( label1, i18n("This is where you enter the name of the person or " "organization that should be named as the author of " "the presentation.") ); - tqlayout->addWidget( label1, 2, 0 ); + layout->addWidget( label1, 2, 0 ); TQLabel *label2 = new TQLabel( i18n("Title:"), canvas ); label2->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); TQWhatsThis::add( label2, i18n("This is where you enter the title of the overall " "presentation." ) ); - tqlayout->addWidget( label2, 3, 0 ); + layout->addWidget( label2, 3, 0 ); TQLabel *label3 = new TQLabel( i18n("Email address:"), canvas ); label3->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); TQWhatsThis::add( label3, i18n("This is where you enter the email address of the " "person or organization that is responsible for " "the presentation.") ); - tqlayout->addWidget( label3, 4, 0 ); + layout->addWidget( label3, 4, 0 ); TQLabel *label4 = new TQLabel( i18n("Path:"), canvas ); label4->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); @@ -703,24 +703,24 @@ void KPrWebPresentationWizard::setupPage1() "where the presentation will be saved. If it does " "not exist, you'll be asked if you want to create " "the directory or abort the creation.") ); - tqlayout->addWidget( label4, 5, 0 ); + layout->addWidget( label4, 5, 0 ); author = new KLineEdit( webPres.getAuthor(), canvas ); TQWhatsThis::add( author, i18n("This is where you enter the name of the person or " "organization that should be named as the author of " "the presentation.") ); - tqlayout->addWidget( author, 2, 1 ); + layout->addWidget( author, 2, 1 ); title = new KLineEdit( webPres.getTitle(), canvas ); TQWhatsThis::add( title, i18n("This is where you enter the title of the overall " "presentation." ) ); - tqlayout->addWidget( title, 3, 1 ); + layout->addWidget( title, 3, 1 ); email = new KLineEdit( webPres.getEmail(), canvas ); TQWhatsThis::add( email, i18n("This is where you enter the email address of the " "person or organization that is responsible for " "the presentation.") ); - tqlayout->addWidget( email, 4, 1 ); + layout->addWidget( email, 4, 1 ); path=new KURLRequester( canvas ); path->setMode( KFile::Directory); @@ -729,11 +729,11 @@ void KPrWebPresentationWizard::setupPage1() "where the presentation will be saved. If it does " "not exist, you'll be asked if you want to create " "the directory or abort the creation.") ); - tqlayout->addWidget( path, 5, 1 ); + layout->addWidget( path, 5, 1 ); TQSpacerItem* spacer = new TQSpacerItem( 1, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); - tqlayout->addMultiCell( spacer, 6, 6, 0, 1 ); + layout->addMultiCell( spacer, 6, 6, 0, 1 ); connect(path, TQT_SIGNAL(textChanged(const TQString&)), this,TQT_SLOT(slotChoosePath(const TQString&))); @@ -762,7 +762,7 @@ void KPrWebPresentationWizard::setupPage2() sidebar->setPixmap(locate("data", "kpresenter/pics/webslideshow-sidebar.png")); TQWidget* canvas = new TQWidget( page2 ); - TQGridLayout *tqlayout = new TQGridLayout( canvas, 6, 2, + TQGridLayout *layout = new TQGridLayout( canvas, 6, 2, KDialog::marginHint(), KDialog::spacingHint() ); TQLabel *helptext = new TQLabel( canvas ); @@ -771,34 +771,34 @@ void KPrWebPresentationWizard::setupPage2() help += i18n( "You can also specify the zoom for the slides." ); helptext->setText(help); - tqlayout->addMultiCellWidget( helptext, 0, 0, 0, 1 ); + layout->addMultiCellWidget( helptext, 0, 0, 0, 1 ); - tqlayout->addMultiCell( new TQSpacerItem( 1, 50 ), 1, 1, 0, 1 ); + layout->addMultiCell( new TQSpacerItem( 1, 50 ), 1, 1, 0, 1 ); TQLabel *label1 = new TQLabel( i18n("Zoom:"), canvas ); label1->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); TQWhatsThis::add( label1, i18n( "This selection allows you to specify " "the size of the slide image." ) ); - tqlayout->addWidget( label1, 2, 0 ); + layout->addWidget( label1, 2, 0 ); TQLabel *label2 = new TQLabel( i18n( "Encoding:" ), canvas ); label2->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); - tqlayout->addWidget( label2, 3, 0 ); + layout->addWidget( label2, 3, 0 ); TQLabel *label3 = new TQLabel( i18n( "Document type:" ), canvas ); label3->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); - tqlayout->addWidget( label3, 4, 0 ); + layout->addWidget( label3, 4, 0 ); zoom = new KIntNumInput( webPres.getZoom(), canvas ); TQWhatsThis::add( zoom, i18n( "This selection allows you to specify " "the size of the slide image." ) ); - tqlayout->addWidget( zoom, 2, 1 ); + layout->addWidget( zoom, 2, 1 ); zoom->setSuffix( " %" ); zoom->setRange( 25, 1000, 5 ); encoding = new KComboBox( false, canvas ); - tqlayout->addWidget( encoding, 3, 1 ); + layout->addWidget( encoding, 3, 1 ); // Fill encoding combo // Stolen from tdelibs/kate/part/katedialogs.cpp @@ -819,7 +819,7 @@ void KPrWebPresentationWizard::setupPage2() } doctype = new KComboBox( false, canvas ); - tqlayout->addWidget( doctype, 4, 1 ); + layout->addWidget( doctype, 4, 1 ); doctype->insertItem( "HTML 4.01", -1 ); doctype->insertItem( "XHTML 1.0", -1 ); @@ -827,7 +827,7 @@ void KPrWebPresentationWizard::setupPage2() TQSpacerItem* spacer = new TQSpacerItem( 1, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); - tqlayout->addMultiCell( spacer, 5, 5, 0, 1 ); + layout->addMultiCell( spacer, 5, 5, 0, 1 ); addPage( page2, i18n( "Step 2: Configure HTML" ) ); @@ -852,40 +852,40 @@ void KPrWebPresentationWizard::setupPage3() sidebar->setPixmap(locate("data", "kpresenter/pics/webslideshow-sidebar.png")); TQWidget* canvas = new TQWidget( page3 ); - TQGridLayout *tqlayout = new TQGridLayout( canvas, 6, 2, + TQGridLayout *layout = new TQGridLayout( canvas, 6, 2, KDialog::marginHint(), KDialog::spacingHint() ); TQLabel *helptext = new TQLabel( canvas ); helptext->setAlignment( TQt::WordBreak | TQt::AlignVCenter| TQt::AlignLeft ); helptext->setText( i18n( "Now you can customize the colors of the web pages." ) ); - tqlayout->addMultiCellWidget( helptext, 0, 0, 0, 1 ); + layout->addMultiCellWidget( helptext, 0, 0, 0, 1 ); - tqlayout->addMultiCell( new TQSpacerItem( 1, 50 ), 1, 1, 0, 1 ); + layout->addMultiCell( new TQSpacerItem( 1, 50 ), 1, 1, 0, 1 ); TQLabel *label1 = new TQLabel( i18n("Text color:"), canvas ); label1->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); - tqlayout->addWidget( label1, 2, 0 ); + layout->addWidget( label1, 2, 0 ); TQLabel *label2 = new TQLabel( i18n("Title color:"), canvas ); label2->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); - tqlayout->addWidget( label2, 3, 0 ); + layout->addWidget( label2, 3, 0 ); TQLabel *label3 = new TQLabel( i18n("Background color:"), canvas ); label3->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); - tqlayout->addWidget( label3, 4, 0 ); + layout->addWidget( label3, 4, 0 ); textColor = new KColorButton( webPres.getTextColor(), canvas ); - tqlayout->addWidget( textColor, 2, 1 ); + layout->addWidget( textColor, 2, 1 ); titleColor = new KColorButton( webPres.getTitleColor(), canvas ); - tqlayout->addWidget( titleColor, 3, 1 ); + layout->addWidget( titleColor, 3, 1 ); backColor = new KColorButton( webPres.getBackColor(), canvas ); - tqlayout->addWidget( backColor, 4, 1 ); + layout->addWidget( backColor, 4, 1 ); TQSpacerItem* spacer = new TQSpacerItem( 1, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); - tqlayout->addMultiCell( spacer, 5, 5, 0, 1 ); + layout->addMultiCell( spacer, 5, 5, 0, 1 ); addPage( page3, i18n( "Step 3: Customize Colors" ) ); @@ -909,7 +909,7 @@ void KPrWebPresentationWizard::setupPage4() sidebar->setPixmap(locate("data", "kpresenter/pics/webslideshow-sidebar.png")); TQWidget* canvas = new TQWidget( page4 ); - TQGridLayout *tqlayout = new TQGridLayout( canvas, 3, 2, + TQGridLayout *layout = new TQGridLayout( canvas, 3, 2, KDialog::marginHint(), KDialog::spacingHint() ); TQLabel *helptext = new TQLabel( canvas ); @@ -921,19 +921,19 @@ void KPrWebPresentationWizard::setupPage4() "click on a title, KPresenter " "mainview will display the slide.") ); - tqlayout->addMultiCellWidget( helptext, 0, 0, 0, 1 ); + layout->addMultiCellWidget( helptext, 0, 0, 0, 1 ); TQLabel *label = new TQLabel( i18n( "Slide title:" ), canvas ); label->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); - tqlayout->addWidget( label, 1, 0 ); + layout->addWidget( label, 1, 0 ); slideTitle = new KLineEdit( canvas ); - tqlayout->addWidget( slideTitle, 1, 1 ); + layout->addWidget( slideTitle, 1, 1 ); connect( slideTitle, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( slideTitleChanged( const TQString & ) ) ); slideTitles = new KListView( canvas ); - tqlayout->addMultiCellWidget( slideTitles, 2, 2, 0, 1 ); + layout->addMultiCellWidget( slideTitles, 2, 2, 0, 1 ); slideTitles->addColumn( i18n( "No." ) ); slideTitles->addColumn( i18n( "Slide Title" ) ); connect( slideTitles, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), this, @@ -977,7 +977,7 @@ void KPrWebPresentationWizard::setupPage5() sidebar->setPixmap(locate("data", "kpresenter/pics/webslideshow-sidebar.png")); TQWidget* canvas = new TQWidget( page5 ); - TQGridLayout *tqlayout = new TQGridLayout( canvas, 6, 2, + TQGridLayout *layout = new TQGridLayout( canvas, 6, 2, KDialog::marginHint(), KDialog::spacingHint() ); TQLabel *helptext = new TQLabel( canvas ); @@ -987,50 +987,50 @@ void KPrWebPresentationWizard::setupPage5() "the next slide, looping and the presence of headers."); helptext->setText(help); - tqlayout->addMultiCellWidget( helptext, 0, 0, 0, 1 ); + layout->addMultiCellWidget( helptext, 0, 0, 0, 1 ); - tqlayout->addMultiCell( new TQSpacerItem( 1, 50 ), 1, 1, 0, 1 ); + layout->addMultiCell( new TQSpacerItem( 1, 50 ), 1, 1, 0, 1 ); TQLabel *label1 = new TQLabel( i18n("Advance after:"), canvas ); label1->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); TQWhatsThis::add( label1, i18n( "This selection allows you to specify " "the time between slides." ) ); - tqlayout->addWidget( label1, 2, 0 ); + layout->addWidget( label1, 2, 0 ); timeBetweenSlides = new KIntNumInput( webPres.getTimeBetweenSlides(), canvas ); timeBetweenSlides->setSpecialValueText(i18n( "Disabled" )); TQWhatsThis::add( timeBetweenSlides, i18n( "This selection allows you to specify " "the time between slides." ) ); - tqlayout->addWidget( timeBetweenSlides, 2, 1 ); + layout->addWidget( timeBetweenSlides, 2, 1 ); timeBetweenSlides->setSuffix( " seconds" ); timeBetweenSlides->setRange( 0, 900, 1 ); - tqlayout->addMultiCell( new TQSpacerItem( 1, 10 ), 1, 1, 0, 1 ); + layout->addMultiCell( new TQSpacerItem( 1, 10 ), 1, 1, 0, 1 ); writeHeader=new TQCheckBox( i18n("Write header to the slides"), canvas); TQWhatsThis::add( writeHeader, i18n( "This checkbox allows you to specify if you " "want to write the navigation buttons on top " "of the slide." ) ); writeHeader->setChecked( webPres.wantHeader() ); - tqlayout->addWidget( writeHeader, 3, 1); + layout->addWidget( writeHeader, 3, 1); writeFooter=new TQCheckBox( i18n("Write footer to the slides"), canvas); TQWhatsThis::add( writeFooter, i18n( "This checkbox allows you to specify if you " "want to write an imprint consisting on the author " "and the software used to create these slides." ) ); writeFooter->setChecked( webPres.wantFooter() ); - tqlayout->addWidget( writeFooter, 4, 1); + layout->addWidget( writeFooter, 4, 1); loopSlides=new TQCheckBox( i18n("Loop presentation"), canvas); TQWhatsThis::add( loopSlides, i18n( "This checkbox allows you to specify if you " "want the presentation to start again once " "the latest slide is reached." ) ); loopSlides->setChecked( webPres.wantLoopSlides() ); - tqlayout->addWidget( loopSlides, 5, 1); + layout->addWidget( loopSlides, 5, 1); TQSpacerItem* spacer = new TQSpacerItem( 1, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); - tqlayout->addMultiCell( spacer, 5, 5, 0, 1 ); + layout->addMultiCell( spacer, 5, 5, 0, 1 ); addPage( page5, i18n( "Step 5: Options for Unattended Presentations" ) ); diff --git a/kpresenter/generalpropertyui.ui b/kpresenter/generalpropertyui.ui index 1161f42b..0dad8b48 100644 --- a/kpresenter/generalpropertyui.ui +++ b/kpresenter/generalpropertyui.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout13</cstring> + <cstring>layout13</cstring> </property> <hbox> <property name="name"> diff --git a/kpresenter/gradientpropertyui.ui b/kpresenter/gradientpropertyui.ui index bc7f0707..b0ccae0a 100644 --- a/kpresenter/gradientpropertyui.ui +++ b/kpresenter/gradientpropertyui.ui @@ -24,7 +24,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <grid> <property name="name"> @@ -77,7 +77,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout17</cstring> + <cstring>layout17</cstring> </property> <grid> <property name="name"> diff --git a/kpresenter/marginui.ui b/kpresenter/marginui.ui index b4e1bd1e..8e638381 100644 --- a/kpresenter/marginui.ui +++ b/kpresenter/marginui.ui @@ -43,7 +43,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <vbox> <property name="name"> @@ -59,7 +59,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <grid> <property name="name"> diff --git a/kpresenter/polygonpropertyui.ui b/kpresenter/polygonpropertyui.ui index dd0be8e6..813215db 100644 --- a/kpresenter/polygonpropertyui.ui +++ b/kpresenter/polygonpropertyui.ui @@ -24,7 +24,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <grid> <property name="name"> diff --git a/kpresenter/rectpropertyui.ui b/kpresenter/rectpropertyui.ui index ff66c8b7..98bedfd5 100644 --- a/kpresenter/rectpropertyui.ui +++ b/kpresenter/rectpropertyui.ui @@ -24,7 +24,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -35,7 +35,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <grid> <property name="name"> diff --git a/kpresenter/rotationpropertyui.ui b/kpresenter/rotationpropertyui.ui index f54609ae..3f604490 100644 --- a/kpresenter/rotationpropertyui.ui +++ b/kpresenter/rotationpropertyui.ui @@ -50,7 +50,7 @@ </widget> <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>tqlayout13</cstring> + <cstring>layout13</cstring> </property> <hbox> <property name="name"> diff --git a/kpresenter/slidetransitionwidget.ui b/kpresenter/slidetransitionwidget.ui index 844424c2..b9774639 100644 --- a/kpresenter/slidetransitionwidget.ui +++ b/kpresenter/slidetransitionwidget.ui @@ -24,7 +24,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>tqlayout39</cstring> + <cstring>layout39</cstring> </property> <vbox> <property name="name"> @@ -67,7 +67,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <vbox> <property name="name"> @@ -75,7 +75,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <grid> <property name="name"> @@ -147,7 +147,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <grid> <property name="name"> diff --git a/kspread/KSpreadLayoutIface.cc b/kspread/KSpreadLayoutIface.cc index 1ca174cf..d3c5e1b7 100644 --- a/kspread/KSpreadLayoutIface.cc +++ b/kspread/KSpreadLayoutIface.cc @@ -28,47 +28,47 @@ using namespace KSpread; LayoutIface::LayoutIface(Format *_layout) { - tqlayout=_layout; + layout=_layout; } void LayoutIface::setBgColor(const TQString& _c) { TQColor c(_c); - tqlayout->setBgColor(c); + layout->setBgColor(c); } void LayoutIface::setBgColor(int r,int g,int b) { TQColor c(r,g,b); - tqlayout->setBgColor(c); + layout->setBgColor(c); } void LayoutIface::setTextColor(int r,int g,int b) { TQColor c(r,g,b); - tqlayout->setTextColor(c); + layout->setTextColor(c); } void LayoutIface::setTextColor(const TQString& _c) { TQColor c(_c); - tqlayout->setTextColor(c); + layout->setTextColor(c); } void LayoutIface::setAngle(int angle) { - tqlayout->setAngle(angle); + layout->setAngle(angle); } void LayoutIface::setVerticalText(bool _vertical) { - tqlayout->setVerticalText(_vertical); + layout->setVerticalText(_vertical); } void LayoutIface::setMultiRow(bool _multi) { - tqlayout->setMultiRow( _multi ); + layout->setMultiRow( _multi ); } void LayoutIface::setAlign( const TQString& _Align ) @@ -82,7 +82,7 @@ void LayoutIface::setAlign( const TQString& _Align ) Align=Format::Center; else Align=Format::Undefined; - tqlayout->setAlign( Align); + layout->setAlign( Align); } void LayoutIface::setAlignY( const TQString& _AlignY ) @@ -96,23 +96,23 @@ void LayoutIface::setAlignY( const TQString& _AlignY ) AlignY=Format::Bottom; else AlignY=Format::Middle; - tqlayout->setAlignY( AlignY); + layout->setAlignY( AlignY); } void LayoutIface::setPostfix(const TQString &_postfix) { - tqlayout->setPostfix( _postfix ); + layout->setPostfix( _postfix ); } void LayoutIface::setPrefix(const TQString &_prefix) { - tqlayout->setPrefix( _prefix ); + layout->setPrefix( _prefix ); } void LayoutIface::setFormatType(const TQString &_formatType) { FormatType format; - tqlayout->setPrecision(2); + layout->setPrecision(2); if (_formatType=="Generic") format = Generic_format; else if(_formatType=="Number") @@ -151,43 +151,43 @@ void LayoutIface::setFormatType(const TQString &_formatType) format=fraction_three_digits; else format=Generic_format; - tqlayout->setFormatType( format); + layout->setFormatType( format); } void LayoutIface::setPrecision(int _p) { - tqlayout->setPrecision( _p ); + layout->setPrecision( _p ); } void LayoutIface::setTextFontBold(bool _b) { - tqlayout->setTextFontBold( _b ); + layout->setTextFontBold( _b ); } void LayoutIface::setTextFontItalic(bool _b) { - tqlayout->setTextFontItalic( _b ); + layout->setTextFontItalic( _b ); } void LayoutIface::setTextFontUnderline(bool _b) { - tqlayout->setTextFontUnderline( _b ); + layout->setTextFontUnderline( _b ); } void LayoutIface::setTextFontStrike(bool _b) { - tqlayout->setTextFontStrike( _b ); + layout->setTextFontStrike( _b ); } void LayoutIface::setTextFontSize( int _size ) { - tqlayout->setTextFontSize( _size ); + layout->setTextFontSize( _size ); } void LayoutIface::setTextFontFamily( const TQString& _font ) { - tqlayout->setTextFontFamily( _font ); + layout->setTextFontFamily( _font ); } @@ -195,34 +195,34 @@ void LayoutIface::setTextFontFamily( const TQString& _font ) void LayoutIface::setLeftBorderStyle( const TQString& _style ) { if(_style=="DotLine") - tqlayout->setLeftBorderStyle(Qt::DotLine); + layout->setLeftBorderStyle(Qt::DotLine); else if(_style=="DashLine") - tqlayout->setLeftBorderStyle(Qt::DashLine); + layout->setLeftBorderStyle(Qt::DashLine); else if(_style=="DashDotLine") - tqlayout->setLeftBorderStyle(Qt::DashDotLine); + layout->setLeftBorderStyle(Qt::DashDotLine); else if(_style=="DashDotDotLine") - tqlayout->setLeftBorderStyle(Qt::DashDotDotLine); + layout->setLeftBorderStyle(Qt::DashDotDotLine); else if(_style=="SolidLine") - tqlayout->setLeftBorderStyle(Qt::SolidLine); + layout->setLeftBorderStyle(Qt::SolidLine); else - tqlayout->setLeftBorderStyle(Qt::SolidLine); + layout->setLeftBorderStyle(Qt::SolidLine); } void LayoutIface::setLeftBorderColor(const TQString& _c) { TQColor c(_c); - tqlayout->setLeftBorderColor(c ); + layout->setLeftBorderColor(c ); } void LayoutIface::setLeftBorderColor(int r,int g,int b) { TQColor c(r,g,b); - tqlayout->setLeftBorderColor(c ); + layout->setLeftBorderColor(c ); } void LayoutIface::setLeftBorderWidth( int _size ) { - tqlayout->setLeftBorderWidth( _size ); + layout->setLeftBorderWidth( _size ); } @@ -230,34 +230,34 @@ void LayoutIface::setLeftBorderWidth( int _size ) void LayoutIface::setRightBorderStyle( const TQString& _style ) { if(_style=="DotLine") - tqlayout->setRightBorderStyle(Qt::DotLine); + layout->setRightBorderStyle(Qt::DotLine); else if(_style=="DashLine") - tqlayout->setRightBorderStyle(Qt::DashLine); + layout->setRightBorderStyle(Qt::DashLine); else if(_style=="DashDotLine") - tqlayout->setRightBorderStyle(Qt::DashDotLine); + layout->setRightBorderStyle(Qt::DashDotLine); else if(_style=="DashDotDotLine") - tqlayout->setRightBorderStyle(Qt::DashDotDotLine); + layout->setRightBorderStyle(Qt::DashDotDotLine); else if(_style=="SolidLine") - tqlayout->setRightBorderStyle(Qt::SolidLine); + layout->setRightBorderStyle(Qt::SolidLine); else - tqlayout->setRightBorderStyle(Qt::SolidLine); + layout->setRightBorderStyle(Qt::SolidLine); } void LayoutIface::setRightBorderColor(const TQString& _c) { TQColor c(_c); - tqlayout->setRightBorderColor(c ); + layout->setRightBorderColor(c ); } void LayoutIface::setRightBorderColor(int r,int g,int b) { TQColor c(r,g,b); - tqlayout->setRightBorderColor(c ); + layout->setRightBorderColor(c ); } void LayoutIface::setRightBorderWidth( int _size ) { - tqlayout->setRightBorderWidth( _size ); + layout->setRightBorderWidth( _size ); } @@ -265,34 +265,34 @@ void LayoutIface::setRightBorderWidth( int _size ) void LayoutIface::setTopBorderStyle( const TQString& _style ) { if(_style=="DotLine") - tqlayout->setTopBorderStyle(Qt::DotLine); + layout->setTopBorderStyle(Qt::DotLine); else if(_style=="DashLine") - tqlayout->setTopBorderStyle(Qt::DashLine); + layout->setTopBorderStyle(Qt::DashLine); else if(_style=="DashDotLine") - tqlayout->setTopBorderStyle(Qt::DashDotLine); + layout->setTopBorderStyle(Qt::DashDotLine); else if(_style=="DashDotDotLine") - tqlayout->setTopBorderStyle(Qt::DashDotDotLine); + layout->setTopBorderStyle(Qt::DashDotDotLine); else if(_style=="SolidLine") - tqlayout->setTopBorderStyle(Qt::SolidLine); + layout->setTopBorderStyle(Qt::SolidLine); else - tqlayout->setTopBorderStyle(Qt::SolidLine); + layout->setTopBorderStyle(Qt::SolidLine); } void LayoutIface::setTopBorderColor(const TQString& _c) { TQColor c(_c); - tqlayout->setTopBorderColor(c ); + layout->setTopBorderColor(c ); } void LayoutIface::setTopBorderColor(int r,int g,int b) { TQColor c(r,g,b); - tqlayout->setTopBorderColor(c ); + layout->setTopBorderColor(c ); } void LayoutIface::setTopBorderWidth( int _size ) { - tqlayout->setTopBorderWidth( _size ); + layout->setTopBorderWidth( _size ); } @@ -300,33 +300,33 @@ void LayoutIface::setTopBorderWidth( int _size ) void LayoutIface::setBottomBorderStyle( const TQString& _style ) { if(_style=="DotLine") - tqlayout->setBottomBorderStyle(Qt::DotLine); + layout->setBottomBorderStyle(Qt::DotLine); else if(_style=="DashLine") - tqlayout->setBottomBorderStyle(Qt::DashLine); + layout->setBottomBorderStyle(Qt::DashLine); else if(_style=="DashDotLine") - tqlayout->setBottomBorderStyle(Qt::DashDotLine); + layout->setBottomBorderStyle(Qt::DashDotLine); else if(_style=="DashDotDotLine") - tqlayout->setBottomBorderStyle(Qt::DashDotDotLine); + layout->setBottomBorderStyle(Qt::DashDotDotLine); else if(_style=="SolidLine") - tqlayout->setBottomBorderStyle(Qt::SolidLine); + layout->setBottomBorderStyle(Qt::SolidLine); else - tqlayout->setBottomBorderStyle(Qt::SolidLine); + layout->setBottomBorderStyle(Qt::SolidLine); } void LayoutIface::setBottomBorderColor(const TQString& _c) { TQColor c(_c); - tqlayout->setBottomBorderColor(c ); + layout->setBottomBorderColor(c ); } void LayoutIface::setBottomBorderColor(int r,int g,int b) { TQColor c(r,g,b); - tqlayout->setBottomBorderColor(c ); + layout->setBottomBorderColor(c ); } void LayoutIface::setBottomBorderWidth( int _size ) { - tqlayout->setBottomBorderWidth( _size ); + layout->setBottomBorderWidth( _size ); } @@ -334,33 +334,33 @@ void LayoutIface::setBottomBorderWidth( int _size ) void LayoutIface::setFallDiagonalStyle( const TQString& _style ) { if(_style=="DotLine") - tqlayout->setFallDiagonalStyle(Qt::DotLine); + layout->setFallDiagonalStyle(Qt::DotLine); else if(_style=="DashLine") - tqlayout->setFallDiagonalStyle(Qt::DashLine); + layout->setFallDiagonalStyle(Qt::DashLine); else if(_style=="DashDotLine") - tqlayout->setFallDiagonalStyle(Qt::DashDotLine); + layout->setFallDiagonalStyle(Qt::DashDotLine); else if(_style=="DashDotDotLine") - tqlayout->setFallDiagonalStyle(Qt::DashDotDotLine); + layout->setFallDiagonalStyle(Qt::DashDotDotLine); else if(_style=="SolidLine") - tqlayout->setFallDiagonalStyle(Qt::SolidLine); + layout->setFallDiagonalStyle(Qt::SolidLine); else - tqlayout->setFallDiagonalStyle(Qt::SolidLine); + layout->setFallDiagonalStyle(Qt::SolidLine); } void LayoutIface::setFallDiagonalColor(const TQString& _c) { TQColor c(_c); - tqlayout->setFallDiagonalColor(c ); + layout->setFallDiagonalColor(c ); } void LayoutIface::setFallDiagonalColor(int r,int g,int b) { TQColor c(r,g,b); - tqlayout->setFallDiagonalColor(c ); + layout->setFallDiagonalColor(c ); } void LayoutIface::setFallDiagonalWidth( int _size ) { - tqlayout->setFallDiagonalWidth( _size ); + layout->setFallDiagonalWidth( _size ); } @@ -369,47 +369,47 @@ void LayoutIface::setFallDiagonalWidth( int _size ) void LayoutIface::setGoUpDiagonalStyle( const TQString& _style ) { if(_style=="DotLine") - tqlayout->setGoUpDiagonalStyle(Qt::DotLine); + layout->setGoUpDiagonalStyle(Qt::DotLine); else if(_style=="DashLine") - tqlayout->setGoUpDiagonalStyle(Qt::DashLine); + layout->setGoUpDiagonalStyle(Qt::DashLine); else if(_style=="DashDotLine") - tqlayout->setGoUpDiagonalStyle(Qt::DashDotLine); + layout->setGoUpDiagonalStyle(Qt::DashDotLine); else if(_style=="DashDotDotLine") - tqlayout->setGoUpDiagonalStyle(Qt::DashDotDotLine); + layout->setGoUpDiagonalStyle(Qt::DashDotDotLine); else if(_style=="SolidLine") - tqlayout->setGoUpDiagonalStyle(Qt::SolidLine); + layout->setGoUpDiagonalStyle(Qt::SolidLine); else - tqlayout->setGoUpDiagonalStyle(Qt::SolidLine); + layout->setGoUpDiagonalStyle(Qt::SolidLine); } void LayoutIface::setGoUpDiagonalColor(const TQString& _c) { TQColor c(_c); - tqlayout->setGoUpDiagonalColor(c ); + layout->setGoUpDiagonalColor(c ); } void LayoutIface::setGoUpDiagonalColor(int r,int g,int b) { TQColor c(r,g,b); - tqlayout->setGoUpDiagonalColor(c ); + layout->setGoUpDiagonalColor(c ); } void LayoutIface::setGoUpDiagonalWidth( int _size ) { - tqlayout->setGoUpDiagonalWidth( _size ); + layout->setGoUpDiagonalWidth( _size ); } void LayoutIface::setIndent( double indent ) { if( indent >= 0.0 ) - tqlayout->setIndent( indent ); + layout->setIndent( indent ); else - tqlayout->setIndent( 0.0 ); + layout->setIndent( 0.0 ); } void LayoutIface::setDontPrintText ( bool _print) { - tqlayout->setDontPrintText ( _print); + layout->setDontPrintText ( _print); } diff --git a/kspread/KSpreadLayoutIface.h b/kspread/KSpreadLayoutIface.h index c4231032..84de8ac4 100644 --- a/kspread/KSpreadLayoutIface.h +++ b/kspread/KSpreadLayoutIface.h @@ -95,7 +95,7 @@ k_dcop: //don't print text virtual void setDontPrintText ( bool _b); private: - Format *tqlayout; + Format *layout; }; } //namespace KSpread diff --git a/kspread/OASIS.txt b/kspread/OASIS.txt index 6aebbb9e..bf0feb94 100644 --- a/kspread/OASIS.txt +++ b/kspread/OASIS.txt @@ -51,7 +51,7 @@ Document/Workbook [x] Active sheet [x] Header [x] Footer - [x] Page tqlayout + [x] Page layout [x] Protection status [x] Print range [x] Print setup diff --git a/kspread/dialogs/font_cell_format.ui b/kspread/dialogs/font_cell_format.ui index 0fe6fb41..095f1188 100644 --- a/kspread/dialogs/font_cell_format.ui +++ b/kspread/dialogs/font_cell_format.ui @@ -22,7 +22,7 @@ The default font is set for all cells in the Format -> Style Manager menu wit </property> <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <grid> <property name="name"> diff --git a/kspread/dialogs/kspread_dlg_conditional.cc b/kspread/dialogs/kspread_dlg_conditional.cc index d03b72d7..9e9d47de 100644 --- a/kspread/dialogs/kspread_dlg_conditional.cc +++ b/kspread/dialogs/kspread_dlg_conditional.cc @@ -54,9 +54,9 @@ ConditionalWidget::ConditionalWidget( TQWidget* parent, const char* name, WFlags TQGroupBox * groupBox1_3 = new TQGroupBox( this, "groupBox1_3" ); groupBox1_3->setColumnLayout(0, Qt::Vertical ); - groupBox1_3->tqlayout()->setSpacing( KDialog::spacingHint() ); - groupBox1_3->tqlayout()->setMargin( KDialog::marginHint() ); - TQGridLayout * groupBox1_3Layout = new TQGridLayout( groupBox1_3->tqlayout() ); + groupBox1_3->layout()->setSpacing( KDialog::spacingHint() ); + groupBox1_3->layout()->setMargin( KDialog::marginHint() ); + TQGridLayout * groupBox1_3Layout = new TQGridLayout( groupBox1_3->layout() ); groupBox1_3Layout->setAlignment( TQt::AlignTop ); TQLabel * textLabel1_3 = new TQLabel( groupBox1_3, "textLabel1_3" ); @@ -89,10 +89,10 @@ ConditionalWidget::ConditionalWidget( TQWidget* parent, const char* name, WFlags TQGroupBox * groupBox1_2 = new TQGroupBox( this, "groupBox1_2" ); groupBox1_2->setColumnLayout(0, Qt::Vertical ); - groupBox1_2->tqlayout()->setSpacing( KDialog::spacingHint() ); - groupBox1_2->tqlayout()->setMargin( KDialog::marginHint() ); + groupBox1_2->layout()->setSpacing( KDialog::spacingHint() ); + groupBox1_2->layout()->setMargin( KDialog::marginHint() ); - TQGridLayout * groupBox1_2Layout = new TQGridLayout( groupBox1_2->tqlayout() ); + TQGridLayout * groupBox1_2Layout = new TQGridLayout( groupBox1_2->layout() ); groupBox1_2Layout->setAlignment( TQt::AlignTop ); TQLabel * textLabel1_2 = new TQLabel( groupBox1_2, "textLabel1_2" ); @@ -125,10 +125,10 @@ ConditionalWidget::ConditionalWidget( TQWidget* parent, const char* name, WFlags TQGroupBox * groupBox1_1 = new TQGroupBox( this, "groupBox1_1" ); groupBox1_1->setColumnLayout(0, Qt::Vertical ); - groupBox1_1->tqlayout()->setSpacing( KDialog::spacingHint() ); - groupBox1_1->tqlayout()->setMargin( KDialog::marginHint() ); + groupBox1_1->layout()->setSpacing( KDialog::spacingHint() ); + groupBox1_1->layout()->setMargin( KDialog::marginHint() ); - TQGridLayout * groupBox1_1Layout = new TQGridLayout( groupBox1_1->tqlayout() ); + TQGridLayout * groupBox1_1Layout = new TQGridLayout( groupBox1_1->layout() ); groupBox1_1Layout->setAlignment( TQt::AlignTop ); TQLabel * textLabel1_1 = new TQLabel( groupBox1_1, "textLabel1_2_2" ); diff --git a/kspread/dialogs/kspread_dlg_csv.cc b/kspread/dialogs/kspread_dlg_csv.cc index dcc53a77..09da5d58 100644 --- a/kspread/dialogs/kspread_dlg_csv.cc +++ b/kspread/dialogs/kspread_dlg_csv.cc @@ -89,9 +89,9 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod m_delimiterBox->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, m_delimiterBox->sizePolicy().hasHeightForWidth() ) ); m_delimiterBox->setTitle( i18n( "Delimiter" ) ); m_delimiterBox->setColumnLayout(0, Qt::Vertical ); - m_delimiterBox->tqlayout()->setSpacing( KDialog::spacingHint() ); - m_delimiterBox->tqlayout()->setMargin( KDialog::marginHint() ); - m_delimiterBoxLayout = new TQGridLayout( m_delimiterBox->tqlayout() ); + m_delimiterBox->layout()->setSpacing( KDialog::spacingHint() ); + m_delimiterBox->layout()->setMargin( KDialog::marginHint() ); + m_delimiterBoxLayout = new TQGridLayout( m_delimiterBox->layout() ); m_delimiterBoxLayout->setAlignment( TQt::AlignTop ); MyDialogLayout->addMultiCellWidget( m_delimiterBox, 0, 2, 0, 0 ); @@ -132,9 +132,9 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod m_formatBox->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, m_formatBox->sizePolicy().hasHeightForWidth() ) ); m_formatBox->setTitle( i18n( "Format" ) ); m_formatBox->setColumnLayout(0, Qt::Vertical ); - m_formatBox->tqlayout()->setSpacing( KDialog::spacingHint() ); - m_formatBox->tqlayout()->setMargin( KDialog::marginHint() ); - m_formatBoxLayout = new TQGridLayout( m_formatBox->tqlayout() ); + m_formatBox->layout()->setSpacing( KDialog::spacingHint() ); + m_formatBox->layout()->setMargin( KDialog::marginHint() ); + m_formatBoxLayout = new TQGridLayout( m_formatBox->layout() ); m_formatBoxLayout->setAlignment( TQt::AlignTop ); MyDialogLayout->addMultiCellWidget( m_formatBox, 0, 2, 1, 1 ); @@ -186,7 +186,7 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod if ( m_mode == Clipboard ) { setCaption( i18n( "Inserting From Clipboard" ) ); - TQMimeSource * mime = TQApplication::tqclipboard()->data(); + TQMimeSource * mime = TQApplication::clipboard()->data(); if ( !mime ) { KMessageBox::information( this, i18n("There is no data in the clipboard.") ); diff --git a/kspread/dialogs/kspread_dlg_find.cc b/kspread/dialogs/kspread_dlg_find.cc index 0a222654..dceca6b1 100644 --- a/kspread/dialogs/kspread_dlg_find.cc +++ b/kspread/dialogs/kspread_dlg_find.cc @@ -30,17 +30,17 @@ using namespace KSpread; FindOption::FindOption( TQWidget *parent) { - TQVBoxLayout *tqlayout = new TQVBoxLayout(parent); + TQVBoxLayout *layout = new TQVBoxLayout(parent); m_moreOptions = new TQPushButton( i18n( "More Options" ), parent ); - tqlayout->addWidget( m_moreOptions ); + layout->addWidget( m_moreOptions ); connect( m_moreOptions, TQT_SIGNAL( clicked () ), this, TQT_SLOT( slotMoreOptions() ) ); m_findExtension = new TQWidget( parent ); - tqlayout->addWidget( m_findExtension ); - TQVBoxLayout *tqlayout1 = new TQVBoxLayout( m_findExtension ); + layout->addWidget( m_findExtension ); + TQVBoxLayout *layout1 = new TQVBoxLayout( m_findExtension ); m_searchInAllSheet = new TQCheckBox( i18n( "Search entire sheet" ),m_findExtension ); - tqlayout1->addWidget( m_searchInAllSheet ); + layout1->addWidget( m_searchInAllSheet ); TQHBoxLayout *comboLayout = new TQHBoxLayout( m_findExtension ); TQLabel *label = new TQLabel( i18n( "Search in:" ), m_findExtension ); @@ -48,7 +48,7 @@ FindOption::FindOption( TQWidget *parent) m_searchIn = new TQComboBox( m_findExtension ); comboLayout->addWidget( m_searchIn ); - tqlayout1->addLayout( comboLayout ); + layout1->addLayout( comboLayout ); TQStringList lst; lst << i18n( "Cell Values" ); @@ -61,7 +61,7 @@ FindOption::FindOption( TQWidget *parent) m_searchDirection = new TQComboBox( m_findExtension ); comboLayout->addWidget( m_searchDirection ); - tqlayout1->addLayout( comboLayout ); + layout1->addLayout( comboLayout ); lst.clear(); lst << i18n( "Across then Down" ); diff --git a/kspread/dialogs/kspread_dlg_insert.cc b/kspread/dialogs/kspread_dlg_insert.cc index 8cd3f89f..6e217f24 100644 --- a/kspread/dialogs/kspread_dlg_insert.cc +++ b/kspread/dialogs/kspread_dlg_insert.cc @@ -55,7 +55,7 @@ InsertDialog::InsertDialog( View* parent, const char* name,const TQRect &_rect,M TQButtonGroup *grp = new TQButtonGroup( 1, Qt::Horizontal, i18n("Insert"),page); grp->setRadioButtonExclusive( TRUE ); - grp->tqlayout(); + grp->layout(); lay1->addWidget(grp); if( insRem==Insert) { diff --git a/kspread/dialogs/kspread_dlg_layout.cc b/kspread/dialogs/kspread_dlg_layout.cc index f7878266..ce97542d 100644 --- a/kspread/dialogs/kspread_dlg_layout.cc +++ b/kspread/dialogs/kspread_dlg_layout.cc @@ -151,15 +151,15 @@ GeneralTab::GeneralTab( TQWidget* parent, CellFormatDialog * dlg ) : TQWidget( parent ), m_dlg( dlg ) { - TQGridLayout * tqlayout = new TQGridLayout( this, 1, 1, KDialog::marginHint(), KDialog::spacingHint(), "tqlayout"); + TQGridLayout * layout = new TQGridLayout( this, 1, 1, KDialog::marginHint(), KDialog::spacingHint(), "layout"); TQGroupBox * groupBox = new TQGroupBox( this, "groupBox1" ); groupBox->setColumnLayout(0, Qt::Vertical ); groupBox->setTitle( i18n( "Style" ) ); - groupBox->tqlayout()->setSpacing( KDialog::spacingHint() ); - groupBox->tqlayout()->setMargin( KDialog::marginHint() ); + groupBox->layout()->setSpacing( KDialog::spacingHint() ); + groupBox->layout()->setMargin( KDialog::marginHint() ); - TQGridLayout * groupBoxLayout = new TQGridLayout( groupBox->tqlayout() ); + TQGridLayout * groupBoxLayout = new TQGridLayout( groupBox->layout() ); groupBoxLayout->setAlignment( TQt::AlignTop ); TQLabel * label1 = new TQLabel( groupBox, "label1" ); @@ -198,8 +198,8 @@ GeneralTab::GeneralTab( TQWidget* parent, CellFormatDialog * dlg ) TQSpacerItem * spacer = new TQSpacerItem( 20, 260, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); - tqlayout->addWidget( groupBox, 0, 0 ); - tqlayout->addItem( spacer, 1, 0 ); + layout->addWidget( groupBox, 0, 0 ); + layout->addItem( spacer, 1, 0 ); if ( m_dlg->getStyle()->type() == Style::BUILTIN ) { @@ -886,7 +886,7 @@ void CellFormatDialog::initParameters(Format *obj,int x,int y) void CellFormatDialog::init() { - TQColorGroup colorGroup = TQApplication::tqpalette().active(); + TQColorGroup colorGroup = TQApplication::palette().active(); // Did we initialize the bitmaps ? if ( formatOnlyNegSignedPixmap == 0L ) @@ -948,7 +948,7 @@ TQPixmap * CellFormatDialog::paintFormatPixmap( const char * _string1, const TQC TQPainter painter; painter.begin( pixmap ); - painter.fillRect( 0, 0, 150, 14, TQApplication::tqpalette().active().base() ); + painter.fillRect( 0, 0, 150, 14, TQApplication::palette().active().base() ); painter.setPen( _color1 ); painter.drawText( 2, 11, TQString(_string1) ); painter.setPen( _color2 ); @@ -1082,7 +1082,7 @@ CellFormatPageFloat::CellFormatPageFloat( TQWidget* parent, CellFormatDialog *_d : TQWidget ( parent ), dlg( _dlg ) { - TQVBoxLayout* tqlayout = new TQVBoxLayout( this, 6,10 ); + TQVBoxLayout* layout = new TQVBoxLayout( this, 6,10 ); TQButtonGroup *grp = new TQButtonGroup( i18n("Format"),this); TQGridLayout *grid = new TQGridLayout(grp,11,2,KDialog::marginHint(), KDialog::spacingHint()); @@ -1149,7 +1149,7 @@ CellFormatPageFloat::CellFormatPageFloat( TQWidget* parent, CellFormatDialog *_d listFormat=new TQListBox(grp); grid->addMultiCellWidget(listFormat,2,7,1,1); TQWhatsThis::add(listFormat, i18n( "Displays choices of format for the fraction, date or time formats." ) ); - tqlayout->addWidget(grp); + layout->addWidget(grp); /* *** */ @@ -1245,7 +1245,7 @@ CellFormatPageFloat::CellFormatPageFloat( TQWidget* parent, CellFormatDialog *_d format->setCurrentItem( 3 ); else if ( dlg->floatFormat == Format::AlwaysSigned && dlg->floatColor == Format::NegRed ) format->setCurrentItem( 4 ); - tqlayout->addWidget(box); + layout->addWidget(box); cellFormatType=dlg->formatType; newFormatType = cellFormatType; @@ -2678,7 +2678,7 @@ void CellFormatPageBorder::InitializeGrids() { {0,0}, {0,1},{0,2} }; /***********************/ - /* set up a tqlayout box for most of the border setting buttons */ + /* set up a layout box for most of the border setting buttons */ tmpTQGroupBox = new TQGroupBox( this, "GroupBox_1" ); tmpTQGroupBox->setFrameStyle( TQFrame::Box | TQFrame::Sunken ); tmpTQGroupBox->setTitle( i18n("Border") ); diff --git a/kspread/dialogs/kspread_dlg_paperlayout.cc b/kspread/dialogs/kspread_dlg_paperlayout.cc index 7150b017..b9e20054 100644 --- a/kspread/dialogs/kspread_dlg_paperlayout.cc +++ b/kspread/dialogs/kspread_dlg_paperlayout.cc @@ -48,11 +48,11 @@ using namespace KSpread; PaperLayout::PaperLayout( TQWidget * parent, const char * name, - const KoPageLayout & tqlayout, + const KoPageLayout & layout, const KoHeadFoot & headfoot, int tabs, KoUnit::Unit unit, Sheet * sheet, View * view) - : KoPageLayoutDia( parent, name, tqlayout, headfoot, tabs, unit, false /*no modal*/), + : KoPageLayoutDia( parent, name, layout, headfoot, tabs, unit, false /*no modal*/), m_pSheet( sheet ), m_pView( view ) { @@ -130,7 +130,7 @@ void PaperLayout::initRanges( TQWidget * tab, TQVBoxLayout * vbox ) rangeGroup->setMargin( KDialog::marginHint() ); vbox->addWidget( rangeGroup ); - TQGridLayout *grid = new TQGridLayout( rangeGroup->tqlayout(), 3, 2, KDialog::spacingHint() ); + TQGridLayout *grid = new TQGridLayout( rangeGroup->layout(), 3, 2, KDialog::spacingHint() ); TQLabel *pPrintRange = new TQLabel ( i18n("Print range:"), rangeGroup ); grid->addWidget( pPrintRange, 0, 0 ); @@ -182,7 +182,7 @@ void PaperLayout::initScaleOptions( TQWidget * tab, TQVBoxLayout * vbox ) zoomGroup->setMargin( KDialog::marginHint() ); vbox->addWidget( zoomGroup ); - TQGridLayout *grid = new TQGridLayout( zoomGroup->tqlayout(), 2, 6, + TQGridLayout *grid = new TQGridLayout( zoomGroup->layout(), 2, 6, KDialog::spacingHint() ); m_rScalingZoom = new TQRadioButton ( i18n("Zoom:"), zoomGroup ); @@ -312,7 +312,7 @@ void PaperLayout::slotOk() { SheetPrint *print = sheet->print(); - KoPageLayout pl = tqlayout(); + KoPageLayout pl = layout(); KoHeadFoot hf = headFoot(); KoUnit::Unit unit = sheet->doc()->unit(); print->setPrintGrid( pPrintGrid->isChecked() ); diff --git a/kspread/dialogs/kspread_dlg_paperlayout.h b/kspread/dialogs/kspread_dlg_paperlayout.h index c9a9e6e5..0260c1c8 100644 --- a/kspread/dialogs/kspread_dlg_paperlayout.h +++ b/kspread/dialogs/kspread_dlg_paperlayout.h @@ -42,7 +42,7 @@ class PaperLayout: public KoPageLayoutDia TQ_OBJECT public: PaperLayout( TQWidget* parent, const char* name, - const KoPageLayout& tqlayout, + const KoPageLayout& layout, const KoHeadFoot& headfoot, int tabs, KoUnit::Unit unit, Sheet * sheet, View *view); diff --git a/kspread/dialogs/kspread_dlg_pasteinsert.cc b/kspread/dialogs/kspread_dlg_pasteinsert.cc index 9b54644d..cc49afad 100644 --- a/kspread/dialogs/kspread_dlg_pasteinsert.cc +++ b/kspread/dialogs/kspread_dlg_pasteinsert.cc @@ -49,7 +49,7 @@ PasteInsertDialog::PasteInsertDialog( View* parent, const char* name,const TQRec TQButtonGroup *grp = new TQButtonGroup( 1, Qt::Horizontal, i18n("Insert"),page); grp->setRadioButtonExclusive( TRUE ); - grp->tqlayout(); + grp->layout(); lay1->addWidget(grp); rb1 = new TQRadioButton( i18n("Move towards right"), grp ); rb2 = new TQRadioButton( i18n("Move towards bottom"), grp ); diff --git a/kspread/dialogs/kspread_dlg_preference.cc b/kspread/dialogs/kspread_dlg_preference.cc index c4777a7b..d17c27e1 100644 --- a/kspread/dialogs/kspread_dlg_preference.cc +++ b/kspread/dialogs/kspread_dlg_preference.cc @@ -790,10 +790,10 @@ configureLayoutPage::configureLayoutPage( View* _view,TQVBox *box , char *name ) m_pView = _view; TQGroupBox* tmpTQGroupBox = new TQGroupBox( 0, Qt::Vertical, i18n("Default Parameters"), box, "GroupBox" ); - tmpTQGroupBox->tqlayout()->setSpacing(KDialog::spacingHint()); - tmpTQGroupBox->tqlayout()->setMargin(KDialog::marginHint()); + tmpTQGroupBox->layout()->setSpacing(KDialog::spacingHint()); + tmpTQGroupBox->layout()->setMargin(KDialog::marginHint()); - TQGridLayout *grid1 = new TQGridLayout(tmpTQGroupBox->tqlayout(),8,1); + TQGridLayout *grid1 = new TQGridLayout(tmpTQGroupBox->layout(),8,1); grid1->addRowSpacing( 0, KDialog::marginHint() ); grid1->setRowStretch( 7, 10 ); diff --git a/kspread/dialogs/kspread_dlg_reference.cc b/kspread/dialogs/kspread_dlg_reference.cc index 477cfd1c..c5ae14c7 100644 --- a/kspread/dialogs/kspread_dlg_reference.cc +++ b/kspread/dialogs/kspread_dlg_reference.cc @@ -75,7 +75,7 @@ reference::reference( View* parent, const char* name ) m_pOk = bb->addButton( KStdGuiItem::ok() ); m_pCancel = bb->addButton( KStdGuiItem::cancel() ); m_pOk->setDefault( TRUE ); - bb->tqlayout(); + bb->layout(); lay1->addWidget( bb ); TQString text; diff --git a/kspread/dialogs/kspread_dlg_sort.cc b/kspread/dialogs/kspread_dlg_sort.cc index 6a7b2abc..9a7c6e33 100644 --- a/kspread/dialogs/kspread_dlg_sort.cc +++ b/kspread/dialogs/kspread_dlg_sort.cc @@ -85,7 +85,7 @@ SortDialog::SortDialog( View * parent, const char * name, TQHButtonGroup * orientationGroup = new TQHButtonGroup( layoutGroup, "orientationGroup" ); orientationGroup->setLineWidth(0); orientationGroup->setMargin(0); - orientationGroup->tqlayout()->setMargin(0); + orientationGroup->layout()->setMargin(0); m_sortColumn = new TQRadioButton( orientationGroup, "m_sortColumn" ); m_sortColumn->setText( i18n( "Sort &Rows" ) ); @@ -108,9 +108,9 @@ SortDialog::SortDialog( View * parent, const char * name, sort1Box->setTitle( i18n( "Sort By" ) ); sort1Box->setFlat(true); sort1Box->setColumnLayout(0, Qt::Vertical ); - sort1Box->tqlayout()->setSpacing( KDialog::spacingHint() ); - sort1Box->tqlayout()->setMargin( KDialog::marginHint() ); - TQHBoxLayout * sort1BoxLayout = new TQHBoxLayout( sort1Box->tqlayout() ); + sort1Box->layout()->setSpacing( KDialog::spacingHint() ); + sort1Box->layout()->setMargin( KDialog::marginHint() ); + TQHBoxLayout * sort1BoxLayout = new TQHBoxLayout( sort1Box->layout() ); sort1BoxLayout->setAlignment( TQt::AlignTop ); m_sortKey1 = new TQComboBox( false, sort1Box, "m_sortKey1" ); @@ -127,9 +127,9 @@ SortDialog::SortDialog( View * parent, const char * name, sort2Box->setTitle( i18n( "Then By" ) ); sort2Box->setFlat(true); sort2Box->setColumnLayout(0, Qt::Vertical ); - sort2Box->tqlayout()->setSpacing( KDialog::spacingHint() ); - sort2Box->tqlayout()->setMargin( KDialog::marginHint() ); - TQHBoxLayout * sort2BoxLayout = new TQHBoxLayout( sort2Box->tqlayout() ); + sort2Box->layout()->setSpacing( KDialog::spacingHint() ); + sort2Box->layout()->setMargin( KDialog::marginHint() ); + TQHBoxLayout * sort2BoxLayout = new TQHBoxLayout( sort2Box->layout() ); sort2BoxLayout->setAlignment( TQt::AlignTop ); m_sortKey2 = new TQComboBox( false, sort2Box, "m_sortKey2" ); @@ -147,9 +147,9 @@ SortDialog::SortDialog( View * parent, const char * name, sort3Box->setTitle( i18n( "Then By" ) ); sort3Box->setFlat(true); sort3Box->setColumnLayout(0, Qt::Vertical ); - sort3Box->tqlayout()->setSpacing( KDialog::spacingHint() ); - sort3Box->tqlayout()->setMargin( KDialog::marginHint() ); - TQHBoxLayout * sort3BoxLayout = new TQHBoxLayout( sort3Box->tqlayout() ); + sort3Box->layout()->setSpacing( KDialog::spacingHint() ); + sort3Box->layout()->setMargin( KDialog::marginHint() ); + TQHBoxLayout * sort3BoxLayout = new TQHBoxLayout( sort3Box->layout() ); sort3BoxLayout->setAlignment( TQt::AlignTop ); m_sortKey3 = new TQComboBox( false, sort3Box, "m_sortKey3" ); @@ -176,9 +176,9 @@ SortDialog::SortDialog( View * parent, const char * name, TQGroupBox * firstKeyBox = new TQGroupBox( m_page2, "firstKeyBox" ); firstKeyBox->setTitle( i18n( "First Key" ) ); firstKeyBox->setColumnLayout(0, Qt::Vertical ); - firstKeyBox->tqlayout()->setSpacing( KDialog::spacingHint() ); - firstKeyBox->tqlayout()->setMargin( KDialog::marginHint() ); - TQVBoxLayout * firstKeyBoxLayout = new TQVBoxLayout( firstKeyBox->tqlayout() ); + firstKeyBox->layout()->setSpacing( KDialog::spacingHint() ); + firstKeyBox->layout()->setMargin( KDialog::marginHint() ); + TQVBoxLayout * firstKeyBoxLayout = new TQVBoxLayout( firstKeyBox->layout() ); firstKeyBoxLayout->setAlignment( TQt::AlignTop ); m_useCustomLists = new TQCheckBox( firstKeyBox, "m_useCustomLists_2" ); @@ -201,11 +201,11 @@ SortDialog::SortDialog( View * parent, const char * name, TQGroupBox * resultToBox = new TQGroupBox( m_page2, "resultToBox" ); resultToBox->setTitle( i18n( "Location to Store Sort Results" ) ); resultToBox->setColumnLayout(0, Qt::Vertical ); - resultToBox->tqlayout()->setSpacing( KDialog::spacingHint() ); - resultToBox->tqlayout()->setMargin( KDialog::marginHint() ); + resultToBox->layout()->setSpacing( KDialog::spacingHint() ); + resultToBox->layout()->setMargin( KDialog::marginHint() ); - TQHBoxLayout * resultToBoxLayout = new TQHBoxLayout( resultToBox->tqlayout() ); + TQHBoxLayout * resultToBoxLayout = new TQHBoxLayout( resultToBox->layout() ); resultToBoxLayout->setAlignment( TQt::AlignTop ); TQLabel * destinationSheet=new TQLabel(resultToBox,"destinationSheet"); diff --git a/kspread/dialogs/kspread_dlg_special.cc b/kspread/dialogs/kspread_dlg_special.cc index 3f0c27e0..510e0ad8 100644 --- a/kspread/dialogs/kspread_dlg_special.cc +++ b/kspread/dialogs/kspread_dlg_special.cc @@ -46,7 +46,7 @@ SpecialDialog::SpecialDialog( View* parent, const char* name ) TQButtonGroup *grp = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Paste What" ),page ); grp->setRadioButtonExclusive( TRUE ); - grp->tqlayout(); + grp->layout(); lay1->addWidget(grp); rb1 = new TQRadioButton( i18n("Everything"), grp ); rb2 = new TQRadioButton( i18n("Text"), grp ); @@ -59,7 +59,7 @@ SpecialDialog::SpecialDialog( View* parent, const char* name ) grp = new TQButtonGroup( 1, Qt::Horizontal, i18n("Operation"),page); grp->setRadioButtonExclusive( TRUE ); - grp->tqlayout(); + grp->layout(); lay1->addWidget(grp); @@ -71,7 +71,7 @@ SpecialDialog::SpecialDialog( View* parent, const char* name ) rb5->setChecked(true); // cb = new TQCheckBox(i18n("Transpose"),this); - // cb->tqlayout(); + // cb->layout(); // lay1->addWidget(cb); connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOk() ) ); diff --git a/kspread/dialogs/kspread_dlg_styles.cc b/kspread/dialogs/kspread_dlg_styles.cc index dd0857e3..26ec4580 100644 --- a/kspread/dialogs/kspread_dlg_styles.cc +++ b/kspread/dialogs/kspread_dlg_styles.cc @@ -42,15 +42,15 @@ using namespace KSpread; StyleWidget::StyleWidget( TQWidget * parent, const char * name, WFlags fl ) : TQWidget( parent, name, fl ) { - TQVBoxLayout * tqlayout = new TQVBoxLayout( this, 11, 6, "tqlayout"); + TQVBoxLayout * layout = new TQVBoxLayout( this, 11, 6, "layout"); m_styleList = new KListView( this, "m_styleList" ); m_styleList->addColumn( i18n( "Styles" ) ); m_styleList->setResizeMode( KListView::AllColumns ); - tqlayout->addWidget( m_styleList ); + layout->addWidget( m_styleList ); m_displayBox = new KComboBox( FALSE, this, "m_displayBox" ); - tqlayout->addWidget( m_displayBox ); + layout->addWidget( m_displayBox ); m_styleList->header()->setLabel( 0, i18n( "Styles" ) ); m_displayBox->clear(); diff --git a/kspread/dialogs/kspread_dlg_validity.cc b/kspread/dialogs/kspread_dlg_validity.cc index 79445e54..2d0b5656 100644 --- a/kspread/dialogs/kspread_dlg_validity.cc +++ b/kspread/dialogs/kspread_dlg_validity.cc @@ -54,9 +54,9 @@ DlgValidity::DlgValidity(View* parent,const char* name , const TQRect &_marker ) TQGroupBox* tmpTQButtonGroup; tmpTQButtonGroup = new TQGroupBox( 0, Qt::Vertical, i18n("Validity Criteria"), page1, "ButtonGroup_1" ); - tmpTQButtonGroup->tqlayout()->setSpacing(KDialog::spacingHint()); - tmpTQButtonGroup->tqlayout()->setMargin(KDialog::marginHint()); - TQGridLayout *grid1 = new TQGridLayout(tmpTQButtonGroup->tqlayout(),4,2); + tmpTQButtonGroup->layout()->setSpacing(KDialog::spacingHint()); + tmpTQButtonGroup->layout()->setMargin(KDialog::marginHint()); + TQGridLayout *grid1 = new TQGridLayout(tmpTQButtonGroup->layout(),4,2); TQLabel *tmpTQLabel = new TQLabel( tmpTQButtonGroup, "Label_1" ); tmpTQLabel->setText(i18n("Allow:" )); @@ -148,9 +148,9 @@ DlgValidity::DlgValidity(View* parent,const char* name , const TQRect &_marker ) lay1 = new TQVBoxLayout( page2, KDialogBase::marginHint(), KDialogBase::spacingHint() ); tmpTQButtonGroup = new TQButtonGroup( 0, Qt::Vertical, i18n("Contents"), page2, "ButtonGroup_2" ); - tmpTQButtonGroup->tqlayout()->setSpacing(KDialog::spacingHint()); - tmpTQButtonGroup->tqlayout()->setMargin(KDialog::marginHint()); - TQGridLayout *grid2 = new TQGridLayout(tmpTQButtonGroup->tqlayout(),5,2); + tmpTQButtonGroup->layout()->setSpacing(KDialog::spacingHint()); + tmpTQButtonGroup->layout()->setMargin(KDialog::marginHint()); + TQGridLayout *grid2 = new TQGridLayout(tmpTQButtonGroup->layout(),5,2); displayMessage = new TQCheckBox(i18n( "Show error message when invalid values are entered" ),tmpTQButtonGroup ); displayMessage->setChecked( true ); @@ -188,10 +188,10 @@ DlgValidity::DlgValidity(View* parent,const char* name , const TQRect &_marker ) lay1 = new TQVBoxLayout( page3, KDialogBase::marginHint(), KDialogBase::spacingHint() ); tmpTQButtonGroup = new TQButtonGroup( 0, Qt::Vertical, i18n("Contents"), page3, "ButtonGroup_2" ); - tmpTQButtonGroup->tqlayout()->setSpacing(KDialog::spacingHint()); - tmpTQButtonGroup->tqlayout()->setMargin(KDialog::marginHint()); + tmpTQButtonGroup->layout()->setSpacing(KDialog::spacingHint()); + tmpTQButtonGroup->layout()->setMargin(KDialog::marginHint()); - TQGridLayout *grid3 = new TQGridLayout(tmpTQButtonGroup->tqlayout(),5,2); + TQGridLayout *grid3 = new TQGridLayout(tmpTQButtonGroup->layout(),5,2); displayHelp = new TQCheckBox(i18n( "Show input help when cell is selected" ),tmpTQButtonGroup ); displayMessage->setChecked( false ); diff --git a/kspread/dialogs/position_cell_format.ui b/kspread/dialogs/position_cell_format.ui index ced66251..5e4af84d 100644 --- a/kspread/dialogs/position_cell_format.ui +++ b/kspread/dialogs/position_cell_format.ui @@ -55,7 +55,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <vbox> <property name="name"> @@ -271,7 +271,7 @@ When a merged cell is selected and when you uncheck this, then all cells come ba </property> <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <grid> <property name="name"> @@ -331,7 +331,7 @@ When a merged cell is selected and when you uncheck this, then all cells come ba </widget> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <grid> <property name="name"> diff --git a/kspread/dialogs/protection_cell_format.ui b/kspread/dialogs/protection_cell_format.ui index cb66f102..c9c3eb7a 100644 --- a/kspread/dialogs/protection_cell_format.ui +++ b/kspread/dialogs/protection_cell_format.ui @@ -60,7 +60,7 @@ Note that you can print it even if the cell is protected</string> </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout12</cstring> + <cstring>layout12</cstring> </property> <vbox> <property name="name"> @@ -79,7 +79,7 @@ Note that you can print it even if the cell is protected</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <hbox> <property name="name"> @@ -120,7 +120,7 @@ Note that you can print it even if the cell is protected</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <hbox> <property name="name"> diff --git a/kspread/dialogs/sheet_properties_base.ui b/kspread/dialogs/sheet_properties_base.ui index 89f314a7..d2a24d6c 100644 --- a/kspread/dialogs/sheet_properties_base.ui +++ b/kspread/dialogs/sheet_properties_base.ui @@ -47,7 +47,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment> </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -55,7 +55,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment> </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -127,7 +127,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment> </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <grid> <property name="name"> diff --git a/kspread/digest.cc b/kspread/digest.cc index ca45c35d..0d27375b 100644 --- a/kspread/digest.cc +++ b/kspread/digest.cc @@ -831,7 +831,7 @@ void rtl_digest_destroySHA1 (rtlDigest Digest) bool SHA1::getHash( TQString const & text, TQCString & hash ) { rtlDigest aDigest = rtl_digest_createSHA1(); - rtlDigestError aError = rtl_digest_updateSHA1( aDigest, text.tqunicode(), text.length() * sizeof(TQChar) ); + rtlDigestError aError = rtl_digest_updateSHA1( aDigest, text.unicode(), text.length() * sizeof(TQChar) ); if ( aError == rtl_Digest_E_None ) { diff --git a/kspread/doc/PAINTING.html b/kspread/doc/PAINTING.html index 13a674db..1f2578f2 100644 --- a/kspread/doc/PAINTING.html +++ b/kspread/doc/PAINTING.html @@ -59,10 +59,10 @@ If it doesn't, two things can happen:</p> slightly buggy.) </ol> -The tqlayout code also takes into account if the cell has vertical text, +The layout code also takes into account if the cell has vertical text, if it is angled, indented text, and so on.</p> -<p>The result of the tqlayout process is the setting of the following +<p>The result of the layout process is the setting of the following variables in a cell:</p> <table cellspacing="0" cellpadding="3" border="1"> @@ -100,7 +100,7 @@ variables in a cell:</p> </pre> </table> -<p>After the tqlayout process, paintCell() uses these +<p>After the layout process, paintCell() uses these variables to position the text within the cell and also to paint "more text" markers, etc.</p> diff --git a/kspread/formula.cc b/kspread/formula.cc index 0f70feaf..fbcf8c0e 100644 --- a/kspread/formula.cc +++ b/kspread/formula.cc @@ -134,7 +134,7 @@ Token::Op KSpread::matchOperator( const TQString& text ) if( text.length() == 1 ) { TQChar p = text[0]; - switch( p.tqunicode() ) + switch( p.unicode() ) { case '+': result = Token::Plus; break; case '-': result = Token::Minus; break; @@ -355,7 +355,7 @@ void TokenStack::ensureSpace() // helper function: return true for valid identifier character bool KSpread::isIdentifier( TQChar ch ) { - return ( ch.tqunicode() == '_' ) || (ch.tqunicode() == '$' ) || ( ch.isLetter() ); + return ( ch.unicode() == '_' ) || (ch.unicode() == '$' ) || ( ch.isLetter() ); } @@ -527,7 +527,7 @@ Tokens Formula::scan( const TQString& expr, KLocale* locale ) const } // aposthrophe (') marks sheet name for 3-d cell, e.g 'Sales Q3'!A4, or a named range - else if ( ch.tqunicode() == '\'' ) + else if ( ch.unicode() == '\'' ) { i++; state = InSheetOrAreaName; @@ -680,7 +680,7 @@ Tokens Formula::scan( const TQString& expr, KLocale* locale ) const case InSheetOrAreaName: // consume until ' - if ( ch.tqunicode() != '\'' ) + if ( ch.unicode() != '\'' ) tokenText.append( ex[i++] ); else diff --git a/kspread/kspread_canvas.cc b/kspread/kspread_canvas.cc index 4d091a3d..4ebfffea 100644 --- a/kspread/kspread_canvas.cc +++ b/kspread/kspread_canvas.cc @@ -3582,7 +3582,7 @@ void Canvas::resizeObject( ModifyType _modType, const KoPoint & point, bool keep } -void Canvas::finishResizeObject( const TQString &/*name*/, bool /*tqlayout*/ ) +void Canvas::finishResizeObject( const TQString &/*name*/, bool /*layout*/ ) { if ( d->m_resizeObject ) { @@ -3598,8 +3598,8 @@ void Canvas::finishResizeObject( const TQString &/*name*/, bool /*tqlayout*/ ) doc()->addCommand( resizeCmd ); } -// if ( tqlayout ) -// doc()->tqlayout( m_resizeObject ); +// if ( layout ) +// doc()->layout( m_resizeObject ); d->m_ratio = 0.0; d->m_isResizing = false; @@ -3775,7 +3775,7 @@ bool Canvas::createEditor( EditorType ed, bool addFocus, bool captureArrowKeys ) TQColor color = cell->format()->textColor( markerColumn(), markerRow() ); if ( !color.isValid() ) - color = TQApplication::tqpalette().active().text(); + color = TQApplication::palette().active().text(); g.setColor( TQColorGroup::Text, color); color = cell->bgColor( markerColumn(), markerRow() ); @@ -3899,7 +3899,7 @@ void Canvas::copyOasisObjects() } TQDragObject *dragObject = multiDrag; - TQApplication::tqclipboard()->setData( dragObject, TQClipboard::Clipboard ); + TQApplication::clipboard()->setData( dragObject, TQClipboard::Clipboard ); } void Canvas::closeEditor() @@ -4109,7 +4109,7 @@ void Canvas::paintUpdates() { cell = sheet->cellAt( x, y ); - // recalc and retqlayout only for non default cells + // recalc and relayout only for non default cells if (!cell->isDefault()) { if (cell->calcDirtyFlag()) cell->calc(); diff --git a/kspread/kspread_canvas.h b/kspread/kspread_canvas.h index d8411791..ea7e3dd1 100644 --- a/kspread/kspread_canvas.h +++ b/kspread/kspread_canvas.h @@ -284,7 +284,7 @@ public: */ void closeEditor(); - // Created by the view since it's tqlayout is managed there, + // Created by the view since it's layout is managed there, // but is in fact a sibling of the canvas, which needs to know about it. void setEditWidget( KSpread::EditWidget * ew ); @@ -326,7 +326,7 @@ public: /// resize the m_resizeObject void resizeObject( ModifyType _modType, const KoPoint & point, bool keepRatio ); /// create KPrResizeCmd - void finishResizeObject( const TQString &name, bool tqlayout = true ); + void finishResizeObject( const TQString &name, bool layout = true ); /** * @brief Display object above the other objects in editiong mode diff --git a/kspread/kspread_cell.cc b/kspread/kspread_cell.cc index 0cbda2b4..0c5de5e6 100644 --- a/kspread/kspread_cell.cc +++ b/kspread/kspread_cell.cc @@ -486,7 +486,7 @@ void Cell::setValue( const Value& v ) clearAllErrors(); //If the value has not changed then we don't need to do anything - //(ie. no need to retqlayout, update dependant cells etc.), + //(ie. no need to relayout, update dependant cells etc.), //unless this cell contains a formula, in which case its dependancies might have changed //even though the value has not. For example, if this cell was previously empty (and its value is //therefore empty) and a new dependency upon an empty cell has been added. The new value would still @@ -697,7 +697,7 @@ void Cell::mergeCells( int _col, int _row, int _x, int _y ) d->extra()->mergedYCells = 0; } - // Refresh the tqlayout + // Refresh the layout setFlag( Flag_LayoutDirty ); return; } @@ -717,7 +717,7 @@ void Cell::mergeCells( int _col, int _row, int _x, int _y ) } } - // Refresh the tqlayout + // Refresh the layout setFlag( Flag_LayoutDirty ); } @@ -1204,7 +1204,7 @@ void Cell::freeAllObscuredCells() // Layout -// Recalculate the entire tqlayout. This includes the following members: +// Recalculate the entire layout. This includes the following members: // // d->textX, d->textY // d->textWidth, d->textHeight @@ -1222,11 +1222,11 @@ void Cell::makeLayout( TQPainter &_painter, int _col, int _row ) { // Are _col and _row really needed ? // - // Yes they are: they are useful if this is the default tqlayout, in + // Yes they are: they are useful if this is the default layout, in // which case d->row and d->column are 0 and 0, but _col and _row // are the real coordinates of the cell. - // There is no need to remake the tqlayout if it hasn't changed. + // There is no need to remake the layout if it hasn't changed. if ( !testFlag( Flag_LayoutDirty ) ) return; @@ -1244,7 +1244,7 @@ void Cell::makeLayout( TQPainter &_painter, int _col, int _row ) d->extra()->mergedXCells, d->extra()->mergedYCells ); // If the column for this cell is hidden or the row is too low, - // there is no use in remaking the tqlayout. + // there is no use in remaking the layout. ColumnFormat *cl1 = format()->sheet()->columnFormat( _col ); RowFormat *rl1 = format()->sheet()->rowFormat( _row ); if ( cl1->isHide() @@ -1597,11 +1597,11 @@ void Cell::setOutputText() return; } - // If nothing has changed, we don't need to remake the text tqlayout. + // If nothing has changed, we don't need to remake the text layout. if ( !testFlag(Flag_TextFormatDirty) ) return; - // We don't want to remake the tqlayout unnecessarily. + // We don't want to remake the layout unnecessarily. clearFlag( Flag_TextFormatDirty ); // Display a formula if warranted. If not, display the value instead; @@ -2193,7 +2193,7 @@ void Cell::paintCell( const KoRect &rect, TQPainter & painter, double width = width0; double height = height0; - // Handle right-to-left tqlayout. + // Handle right-to-left layout. // In an RTL sheet the cells have to be painted at their opposite horizontal // location on the canvas, meaning that column A will be the rightmost column // on screen, column B will be to the left of it and so on. Here we change @@ -2257,10 +2257,10 @@ void Cell::paintCell( const KoRect &rect, TQPainter & painter, selected = false; } - // Need to make a new tqlayout ? + // Need to make a new layout ? // // FIXME: We have already used (at least) extraWidth/Height above, - // and now we are recalculating the tqlayout. This has to be + // and now we are recalculating the layout. This has to be // moved up above all uses. // // FIXME: This needs to be taken out eventually - it is done in @@ -2686,7 +2686,7 @@ void Cell::paintBackground( TQPainter& painter, const KoRect &cellRect, const TQPoint &cellRef, bool selected, TQColor &backgroundColor ) { - TQColorGroup defaultColorGroup = TQApplication::tqpalette().active(); + TQColorGroup defaultColorGroup = TQApplication::palette().active(); TQRect zoomedCellRect = sheet()->doc()->zoomRect( cellRect ); // If this is not the KS_rowMax and/or KS_colMax, then we reduce @@ -3175,7 +3175,7 @@ void Cell::paintText( TQPainter& painter, ColumnFormat *colFormat = format()->sheet()->columnFormat( cellRef.x() ); - TQColorGroup defaultColorGroup = TQApplication::tqpalette().active(); + TQColorGroup defaultColorGroup = TQApplication::palette().active(); TQColor textColorPrint = effTextColor( cellRef.x(), cellRef.y() ); // Resolve the text color if invalid (=default). @@ -3183,7 +3183,7 @@ void Cell::paintText( TQPainter& painter, if ( painter.device()->isExtDev() ) textColorPrint = TQt::black; else - textColorPrint = TQApplication::tqpalette().active().text(); + textColorPrint = TQApplication::palette().active().text(); } TQPen tmpPen( textColorPrint ); @@ -3209,7 +3209,7 @@ void Cell::paintText( TQPainter& painter, // Check for blue color, for hyperlink. if ( !link().isEmpty() ) { - tmpPen.setColor( TQApplication::tqpalette().active().link() ); + tmpPen.setColor( TQApplication::palette().active().link() ); TQFont f = painter.font(); f.setUnderline( true ); painter.setFont( f ); @@ -4704,7 +4704,7 @@ TQString Cell::link() const void Cell::update() { - /* those obscuring us need to redo their tqlayout cause they can't obscure us + /* those obscuring us need to redo their layout cause they can't obscure us now that we've got text. This includes cells obscuring cells that we are obscuring */ diff --git a/kspread/kspread_cell.h b/kspread/kspread_cell.h index 500804f3..fd100c45 100644 --- a/kspread/kspread_cell.h +++ b/kspread/kspread_cell.h @@ -265,7 +265,7 @@ public: /** * Moves around the cell. It cares about obscured and obscuring cells and - * forces, retqlayout, calculation and redrawing of the cell. + * forces, relayout, calculation and redrawing of the cell. */ void move( int column, int row ); @@ -807,7 +807,7 @@ public: void clearAllErrors(); /** - * Calculates the tqlayout of the cell, i,e, determines what should be shown + * Calculates the layout of the cell, i,e, determines what should be shown * for this cell, m_strOutText. */ void makeLayout( TQPainter &_painter, int _col, int _row ); @@ -900,9 +900,9 @@ public: * In that case the cell usually displays "#####" * * LayoutDirty - * Flag showing whether the current tqlayout is OK. + * Flag showing whether the current layout is OK. * If you change for example the fonts point size, set this flag. When the - * cell must draw itself on the screen it will first recalculate its tqlayout. + * cell must draw itself on the screen it will first recalculate its layout. * * CalcDirty * Shows whether recalculation is necessary. @@ -925,7 +925,7 @@ public: * If this flag is set, then it is known that this cell has to be updated * on the display. This means that somewhere in the calling stack there is a * function which will call @ref Sheet::updateCell once it retains - * the control. If a function changes the contents/tqlayout of this cell and this + * the control. If a function changes the contents/layout of this cell and this * flag is not set, then the function must set it at once. After the changes * are done the function must call <tt>m_pSheet->updateCell(...). * The flag is cleared by the function format()->sheet()->updateCell. diff --git a/kspread/kspread_cluster.cc b/kspread/kspread_cluster.cc index 21fe0ef0..318ee758 100644 --- a/kspread/kspread_cluster.cc +++ b/kspread/kspread_cluster.cc @@ -1039,7 +1039,7 @@ bool ColumnCluster::insertColumn( int col ) int cx = col / KSPREAD_CLUSTER_LEVEL2; int dx = col % KSPREAD_CLUSTER_LEVEL2; - // Is there a column tqlayout at the right most position ? + // Is there a column layout at the right most position ? // In this case the shift is impossible. ColumnFormat** cl = m_cluster[ KSPREAD_CLUSTER_LEVEL1 - 1 ]; if ( cl && cl[ KSPREAD_CLUSTER_LEVEL2 - 1 ] ) @@ -1356,7 +1356,7 @@ bool RowCluster::insertRow( int row ) int cx = row / KSPREAD_CLUSTER_LEVEL2; int dx = row % KSPREAD_CLUSTER_LEVEL2; - // Is there a row tqlayout at the bottom most position ? + // Is there a row layout at the bottom most position ? // In this case the shift is impossible. RowFormat** cl = m_cluster[ KSPREAD_CLUSTER_LEVEL1 - 1 ]; if ( cl && cl[ KSPREAD_CLUSTER_LEVEL2 - 1 ] ) diff --git a/kspread/kspread_doc.cc b/kspread/kspread_doc.cc index 8a580ecb..ea698845 100644 --- a/kspread/kspread_doc.cc +++ b/kspread/kspread_doc.cc @@ -941,7 +941,7 @@ void Doc::saveOasisDocumentStyles( KoStore* store, KoGenStyles& mainStyles ) con styles = mainStyles.styles( KoGenStyle::STYLE_PAGELAYOUT ); it = styles.begin(); for ( ; it != styles.end() ; ++it ) { - (*it).style->writeStyle( stylesWriter, mainStyles, "style:page-tqlayout", (*it).name, "style:page-tqlayout-properties", false /*don't close*/ ); + (*it).style->writeStyle( stylesWriter, mainStyles, "style:page-layout", (*it).name, "style:page-layout-properties", false /*don't close*/ ); stylesWriter->endElement(); } @@ -1179,7 +1179,7 @@ bool Doc::loadXML( TQIODevice *, const TQDomDocument& doc ) return false; } - //Backwards compatibility with older versions for paper tqlayout + //Backwards compatibility with older versions for paper layout if ( d->syntaxVersion < 1 ) { TQDomElement paper = spread.namedItem( "paper" ).toElement(); @@ -1549,7 +1549,7 @@ void Doc::setZoomAndResolution( int zoom, int dpiX, int dpiY ) void Doc::newZoomAndResolution( bool updateViews, bool /*forPrint*/ ) { -/* tqlayout(); +/* layout(); updateAllFrames();*/ if ( updateViews ) { diff --git a/kspread/kspread_editors.cc b/kspread/kspread_editors.cc index 44a3d178..7f0fa282 100644 --- a/kspread/kspread_editors.cc +++ b/kspread/kspread_editors.cc @@ -1455,7 +1455,7 @@ EditWidget::EditWidget( TQWidget *_parent, Canvas *_canvas, m_pCanvas = _canvas; Q_ASSERT(m_pCanvas != NULL); // Those buttons are created by the caller, so that they are inserted - // properly in the tqlayout - but they are then managed here. + // properly in the layout - but they are then managed here. m_pCancelButton = cancelButton; m_pOkButton = okButton; isArray = false; diff --git a/kspread/kspread_functions_conversion.cc b/kspread/kspread_functions_conversion.cc index dc15cddc..23f2ca01 100644 --- a/kspread/kspread_functions_conversion.cc +++ b/kspread/kspread_functions_conversion.cc @@ -179,7 +179,7 @@ Value func_roman (valVector args, ValueCalc *calc, FuncExtra *) // return < 0 if invalid int func_arabic_helper (TQChar c) { - switch (c.upper().tqunicode()) + switch (c.upper().unicode()) { case 'M': return 1000; case 'D': return 500; diff --git a/kspread/kspread_functions_text.cc b/kspread/kspread_functions_text.cc index 1f661d27..e61aff93 100644 --- a/kspread/kspread_functions_text.cc +++ b/kspread/kspread_functions_text.cc @@ -188,7 +188,7 @@ Value func_code (valVector args, ValueCalc *calc, FuncExtra *) if (str.length() <= 0) return Value::errorVALUE(); - return Value (str[0].tqunicode()); + return Value (str[0].unicode()); } // Function: COMPARE @@ -496,11 +496,11 @@ Value func_rot (valVector args, ValueCalc *calc, FuncExtra *) for( unsigned i=0; i<text.length(); i++ ) { - unsigned c = text[i].upper().tqunicode(); + unsigned c = text[i].upper().unicode(); if( ( c >= 'A' ) && ( c <= 'M' ) ) - text[i] = TQChar( text[i].tqunicode() + 13); + text[i] = TQChar( text[i].unicode() + 13); if( ( c >= 'N' ) && ( c <= 'Z' ) ) - text[i] = TQChar( text[i].tqunicode() - 13); + text[i] = TQChar( text[i].unicode() - 13); } return Value (text); diff --git a/kspread/kspread_generalProperty.cpp b/kspread/kspread_generalProperty.cpp index d2518494..d15c79c8 100644 --- a/kspread/kspread_generalProperty.cpp +++ b/kspread/kspread_generalProperty.cpp @@ -38,11 +38,11 @@ GeneralProperty::GeneralProperty( TQWidget *parent, const char *name, GeneralVal , m_generalValue( generalValue ) , m_unit( unit ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); - tqlayout->addWidget( m_ui = new KoGeneralPropertyUI( this ) ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); + layout->addWidget( m_ui = new KoGeneralPropertyUI( this ) ); TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); - tqlayout->addItem( spacer ); + layout->addItem( spacer ); if ( m_generalValue.m_name.isNull() ) { diff --git a/kspread/kspread_sheet.cc b/kspread/kspread_sheet.cc index a888a392..8d6cf77b 100644 --- a/kspread/kspread_sheet.cc +++ b/kspread/kspread_sheet.cc @@ -3940,7 +3940,7 @@ void Sheet::swapCells( int x1, int y1, int x2, int y2, bool cpFormat ) } // Dummy cell used for swapping cells. - // In fact we copy only content and no tqlayout + // In fact we copy only content and no layout // information. Imagine sorting in a sheet. Swapping // the format while sorting is not what you would expect // as a user. @@ -5088,7 +5088,7 @@ void Sheet::copySelection( Selection* selectionInfo ) kd->setPlain( copyAsText(selectionInfo) ); kd->setKSpread( buffer.buffer() ); - TQApplication::tqclipboard()->setData( kd ); + TQApplication::clipboard()->setData( kd ); } void Sheet::cutSelection( Selection* selectionInfo ) @@ -5107,7 +5107,7 @@ void Sheet::cutSelection( Selection* selectionInfo ) kd->setPlain( copyAsText(selectionInfo) ); kd->setKSpread( buffer.buffer() ); - TQApplication::tqclipboard()->setData( kd ); + TQApplication::clipboard()->setData( kd ); deleteSelection( selectionInfo, true ); } @@ -5117,7 +5117,7 @@ void Sheet::paste( const TQRect& pasteArea, bool makeUndo, bool insert, int insertTo, bool pasteFC, TQClipboard::Mode clipboardMode ) { - TQMimeSource * mime = TQApplication::tqclipboard()->data( clipboardMode ); + TQMimeSource * mime = TQApplication::clipboard()->data( clipboardMode ); if ( !mime ) return; @@ -5131,7 +5131,7 @@ void Sheet::paste( const TQRect& pasteArea, bool makeUndo, { // Note: TQClipboard::text() seems to do a better job than encodedData( "text/plain" ) // In particular it handles charsets (in the mimetype). Copied from KPresenter ;-) - TQString _text = TQApplication::tqclipboard()->text( clipboardMode ); + TQString _text = TQApplication::clipboard()->text( clipboardMode ); doc()->emitBeginOperation(); pasteTextPlain( _text, pasteArea ); emit sig_updateView( this ); @@ -5523,7 +5523,7 @@ void Sheet::loadSelectionUndo(const TQDomDocument& d, const TQRect& loadArea, bool Sheet::testAreaPasteInsert()const { - TQMimeSource* mime = TQApplication::tqclipboard()->data( TQClipboard::Clipboard ); + TQMimeSource* mime = TQApplication::clipboard()->data( TQClipboard::Clipboard ); if ( !mime ) return false; @@ -6418,16 +6418,16 @@ bool Sheet::loadOasis( const TQDomElement& sheetElement, KoOasisLoadingContext& if ( masterStyle ) { loadSheetStyleFormat( masterStyle ); - if ( masterStyle->hasAttributeNS( KoXmlNS::style, "page-tqlayout-name" ) ) + if ( masterStyle->hasAttributeNS( KoXmlNS::style, "page-layout-name" ) ) { - TQString masterPageLayoutStyleName = masterStyle->attributeNS( KoXmlNS::style, "page-tqlayout-name", TQString() ); + TQString masterPageLayoutStyleName = masterStyle->attributeNS( KoXmlNS::style, "page-layout-name", TQString() ); //kdDebug()<<"masterPageLayoutStyleName :"<<masterPageLayoutStyleName<<endl; const TQDomElement *masterLayoutStyle = oasisContext.oasisStyles().findStyle( masterPageLayoutStyleName ); if ( masterLayoutStyle ) { //kdDebug()<<"masterLayoutStyle :"<<masterLayoutStyle<<endl; KoStyleStack styleStack; - styleStack.setTypeProperties( "page-tqlayout" ); + styleStack.setTypeProperties( "page-layout" ); styleStack.push( *masterLayoutStyle ); loadOasisMasterLayoutPage( styleStack ); } @@ -6564,7 +6564,7 @@ void Sheet::loadOasisMasterLayoutPage( KoStyleStack &styleStack ) 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( KoXmlNS::fo, "page-width" ) ) @@ -6717,7 +6717,7 @@ bool Sheet::loadColumnFormat(const TQDomElement& column, const KoOasisStyles& oa kdDebug() << "Repeated: " << number << endl; } - Format tqlayout( this , doc()->styleManager()->defaultStyle() ); + Format layout( this , doc()->styleManager()->defaultStyle() ); if ( column.hasAttributeNS( KoXmlNS::table, "default-cell-style-name" ) ) { const TQString styleName = column.attributeNS( KoXmlNS::table, "default-cell-style-name", TQString() ); @@ -6726,7 +6726,7 @@ bool Sheet::loadColumnFormat(const TQDomElement& column, const KoOasisStyles& oa Style* const style = styleMap[ styleName ]; if ( style ) { - tqlayout.setStyle( style ); + layout.setStyle( style ); isNonDefaultColumn = true; } } @@ -6799,7 +6799,7 @@ bool Sheet::loadColumnFormat(const TQDomElement& column, const KoOasisStyles& oa { columnFormat = this->columnFormat( indexCol ); } - columnFormat->copy( tqlayout ); + columnFormat->copy( layout ); ++indexCol; } @@ -6828,7 +6828,7 @@ bool Sheet::loadRowFormat( const TQDomElement& row, int &rowIndex, KoOasisLoadin } styleStack.setTypeProperties( "table-row" ); - Format tqlayout( this , doc()->styleManager()->defaultStyle() ); + Format layout( this , doc()->styleManager()->defaultStyle() ); if ( row.hasAttributeNS( KoXmlNS::table,"default-cell-style-name" ) ) { const TQString styleName = row.attributeNS( KoXmlNS::table, "default-cell-style-name", TQString() ); @@ -6837,7 +6837,7 @@ bool Sheet::loadRowFormat( const TQDomElement& row, int &rowIndex, KoOasisLoadin Style* const style = styleMap[ styleName ]; if ( style ) { - tqlayout.setStyle( style ); + layout.setStyle( style ); isNonDefaultRow = true; } } @@ -6908,7 +6908,7 @@ bool Sheet::loadRowFormat( const TQDomElement& row, int &rowIndex, KoOasisLoadin { rowFormat = this->rowFormat( rowIndex ); } - rowFormat->copy( tqlayout ); + rowFormat->copy( layout ); ++rowIndex; } @@ -7355,7 +7355,7 @@ TQString Sheet::saveOasisSheetStyleName( KoGenStyles &mainStyles ) KoGenStyle pageStyle( Doc::STYLE_PAGE, "table"/*FIXME I don't know if name is sheet*/ ); KoGenStyle pageMaster( Doc::STYLE_PAGEMASTER ); - pageMaster.addAttribute( "style:page-tqlayout-name", d->print->saveOasisSheetStyleLayout( mainStyles ) ); + pageMaster.addAttribute( "style:page-layout-name", d->print->saveOasisSheetStyleLayout( mainStyles ) ); TQBuffer buffer; buffer.open( IO_WriteOnly ); @@ -7391,7 +7391,7 @@ void Sheet::saveOasisColRowCell( KoXmlWriter& xmlWriter, KoGenStyles &mainStyles currentColumnStyle.addPropertyPt( "style:column-width", column->dblWidth() ); currentColumnStyle.addProperty( "fo:break-before", "auto" );/*FIXME auto or not ?*/ - //style default tqlayout for column + //style default layout for column KoGenStyle currentDefaultCellStyle; // the type is determined in saveOasisCellStyle TQString currentDefaultCellStyleName = column->saveOasisCellStyle( currentDefaultCellStyle, mainStyles ); @@ -7774,7 +7774,7 @@ bool Sheet::loadXML( const TQDomElement& sheet ) // we just ignore 'ok' - if it didn't work, go on } - // Load the paper tqlayout + // Load the paper layout TQDomElement paper = sheet.namedItem( "paper" ).toElement(); if ( !paper.isNull() ) { diff --git a/kspread/kspread_sheet.h b/kspread/kspread_sheet.h index ff6272ac..6ac0fcb9 100644 --- a/kspread/kspread_sheet.h +++ b/kspread/kspread_sheet.h @@ -305,13 +305,13 @@ public: void unifyObjectName( EmbeddedObject *object ); /** - * Returns the tqlayout direction of the sheet. + * Returns the layout direction of the sheet. */ LayoutDirection layoutDirection() const; /** - * Sets the tqlayout direction of the sheet. For example, for Arabic or Hebrew - * documents, it is possibly to tqlayout the sheet from right to left. + * Sets the layout direction of the sheet. For example, for Arabic or Hebrew + * documents, it is possibly to layout the sheet from right to left. */ void setLayoutDirection( LayoutDirection dir ); @@ -1064,7 +1064,7 @@ public: #endif /** - * Calculates the cell if necessary, makes its tqlayout if necessary, + * Calculates the cell if necessary, makes its layout if necessary, * and force redraw. * Then it sets the cell's @ref Cell::m_bDisplayDirtyFlag to false. */ diff --git a/kspread/kspread_sheetprint.h b/kspread/kspread_sheetprint.h index 94affb99..1f22dc7d 100644 --- a/kspread/kspread_sheetprint.h +++ b/kspread/kspread_sheetprint.h @@ -148,12 +148,12 @@ public: void setPaperOrientation(KoOrientation _orient); /** - * Returns the page tqlayout + * Returns the page layout */ KoPageLayout paperLayout() const; /** - * Changes the paper tqlayout and repaints the currently displayed Sheet. + * Changes the paper layout and repaints the currently displayed Sheet. */ void setPaperLayout( float _leftBorder, float _topBorder, float _rightBorder, float _bottomBoder, KoFormat _paper, KoOrientation orientation ); diff --git a/kspread/kspread_style.cc b/kspread/kspread_style.cc index af5b91a1..dc8b7add 100644 --- a/kspread/kspread_style.cc +++ b/kspread/kspread_style.cc @@ -134,7 +134,7 @@ bool Style::operator == (const Style& style) const if ( m_type != style.m_type ) return false; // NOTE Stefan: Only compare the values of the set features. - if ( // tqlayout (4) + if ( // layout (4) ( m_featuresSet & SAlignX ) && ( m_alignX != style.m_alignX ) || ( m_featuresSet & SAlignY ) && ( m_alignY != style.m_alignY ) || ( m_featuresSet & SAngle ) && ( m_rotateAngle != style.m_rotateAngle ) || diff --git a/kspread/kspread_undo.cc b/kspread/kspread_undo.cc index 6036344c..28f59265 100644 --- a/kspread/kspread_undo.cc +++ b/kspread/kspread_undo.cc @@ -266,7 +266,7 @@ UndoRemoveColumn::UndoRemoveColumn( Doc *_doc, Sheet *_sheet, int _column,int _n TQTextStream str( &buffer, IO_WriteOnly ); str << doc; - // This is a terrible hack to store tqunicode + // This is a terrible hack to store unicode // data in a TQCString in a way that // TQCString::length() == TQCString().size(). // This allows us to treat the TQCString like a TQByteArray later on. @@ -385,7 +385,7 @@ UndoRemoveRow::UndoRemoveRow( Doc *_doc, Sheet *_sheet, int _row,int _nbRow) : TQTextStream str( &buffer, IO_WriteOnly ); str << doc; - // This is a terrible hack to store tqunicode + // This is a terrible hack to store unicode // data in a TQCString in a way that // TQCString::length() == TQCString().size(). // This allows us to treat the TQCString like a TQByteArray later on. @@ -942,20 +942,20 @@ void UndoCellFormat::copyFormat(TQValueList<layoutCell> & list, /* Don't need to go through the loop twice... for (int i = range.left(); i <= right; ++i) { - layoutColumn tmptqlayout; - tmptqlayout.col = i; - tmptqlayout.l = new ColumnFormat( sheet, i ); - tmptqlayout.l->copy( *(sheet->columnFormat( i )) ); - listCol.append(tmptqlayout); + layoutColumn tmplayout; + tmplayout.col = i; + tmplayout.l = new ColumnFormat( sheet, i ); + tmplayout.l->copy( *(sheet->columnFormat( i )) ); + listCol.append(tmplayout); } */ for ( int c = range.left(); c <= right; ++c ) { - layoutColumn tmptqlayout; - tmptqlayout.col = c; - tmptqlayout.l = new ColumnFormat( sheet, c ); - tmptqlayout.l->copy( *(sheet->columnFormat( c )) ); - listCol.append(tmptqlayout); + layoutColumn tmplayout; + tmplayout.col = c; + tmplayout.l = new ColumnFormat( sheet, c ); + tmplayout.l->copy( *(sheet->columnFormat( c )) ); + listCol.append(tmplayout); cell = sheet->getFirstCellColumn( c ); while ( cell ) @@ -966,12 +966,12 @@ void UndoCellFormat::copyFormat(TQValueList<layoutCell> & list, continue; } - layoutCell tmptqlayout; - tmptqlayout.col = c; - tmptqlayout.row = cell->row(); - tmptqlayout.l = new Format( sheet, 0 ); - tmptqlayout.l->copy( *(sheet->cellAt( tmptqlayout.col, tmptqlayout.row )->format()) ); - list.append(tmptqlayout); + layoutCell tmplayout; + tmplayout.col = c; + tmplayout.row = cell->row(); + tmplayout.l = new Format( sheet, 0 ); + tmplayout.l->copy( *(sheet->cellAt( tmplayout.col, tmplayout.row )->format()) ); + list.append(tmplayout); cell = sheet->getNextCellDown( c, cell->row() ); } @@ -984,12 +984,12 @@ void UndoCellFormat::copyFormat(TQValueList<layoutCell> & list, if ( range.left() <= col && right >= col && !c->isPartOfMerged()) { - layoutCell tmptqlayout; - tmptqlayout.col = c->column(); - tmptqlayout.row = c->row(); - tmptqlayout.l = new Format( sheet, 0 ); - tmptqlayout.l->copy( *(sheet->cellAt( tmptqlayout.col, tmptqlayout.row )) ); - list.append(tmptqlayout); + layoutCell tmplayout; + tmplayout.col = c->column(); + tmplayout.row = c->row(); + tmplayout.l = new Format( sheet, 0 ); + tmplayout.l->copy( *(sheet->cellAt( tmplayout.col, tmplayout.row )) ); + list.append(tmplayout); } } */ @@ -998,11 +998,11 @@ void UndoCellFormat::copyFormat(TQValueList<layoutCell> & list, { for ( int row = range.top(); row <= bottom; ++row ) { - layoutRow tmptqlayout; - tmptqlayout.row = row; - tmptqlayout.l = new RowFormat( sheet, row ); - tmptqlayout.l->copy( *(sheet->rowFormat( row )) ); - listRow.append(tmptqlayout); + layoutRow tmplayout; + tmplayout.row = row; + tmplayout.l = new RowFormat( sheet, row ); + tmplayout.l->copy( *(sheet->rowFormat( row )) ); + listRow.append(tmplayout); cell = sheet->getFirstCellRow( row ); while ( cell ) @@ -1012,12 +1012,12 @@ void UndoCellFormat::copyFormat(TQValueList<layoutCell> & list, cell = sheet->getNextCellRight( cell->column(), row ); continue; } - layoutCell tmptqlayout; - tmptqlayout.col = cell->column(); - tmptqlayout.row = row; - tmptqlayout.l = new Format( sheet, 0 ); - tmptqlayout.l->copy( *(sheet->cellAt( cell->column(), row )->format()) ); - list.append(tmptqlayout); + layoutCell tmplayout; + tmplayout.col = cell->column(); + tmplayout.row = row; + tmplayout.l = new Format( sheet, 0 ); + tmplayout.l->copy( *(sheet->cellAt( cell->column(), row )->format()) ); + list.append(tmplayout); cell = sheet->getNextCellRight( cell->column(), row ); } @@ -1030,12 +1030,12 @@ void UndoCellFormat::copyFormat(TQValueList<layoutCell> & list, if ( range.top() <= row && bottom >= row && !c->isPartOfMerged()) { - layoutCell tmptqlayout; - tmptqlayout.col = c->column(); - tmptqlayout.row = c->row(); - tmptqlayout.l = new Format( sheet, 0 ); - tmptqlayout.l->copy( *(sheet->cellAt( tmptqlayout.col, tmptqlayout.row )) ); - list.append(tmptqlayout); + layoutCell tmplayout; + tmplayout.col = c->column(); + tmplayout.row = c->row(); + tmplayout.l = new Format( sheet, 0 ); + tmplayout.l->copy( *(sheet->cellAt( tmplayout.col, tmplayout.row )) ); + list.append(tmplayout); } } */ @@ -1048,12 +1048,12 @@ void UndoCellFormat::copyFormat(TQValueList<layoutCell> & list, Cell * cell = sheet->nonDefaultCell( x, y ); if ( !cell->isPartOfMerged() ) { - layoutCell tmptqlayout; - tmptqlayout.col = x; - tmptqlayout.row = y; - tmptqlayout.l = new Format( sheet, 0 ); - tmptqlayout.l->copy( *(sheet->cellAt( x, y )->format()) ); - list.append(tmptqlayout); + layoutCell tmplayout; + tmplayout.col = x; + tmplayout.row = y; + tmplayout.l = new Format( sheet, 0 ); + tmplayout.l->copy( *(sheet->cellAt( x, y )->format()) ); + list.append(tmplayout); } } } @@ -1265,24 +1265,24 @@ void UndoSort::copyAll(TQValueList<layoutTextCell> & list, TQValueList<layoutCol Cell * c; for (int col = m_rctRect.left(); col <= m_rctRect.right(); ++col) { - layoutColumn tmptqlayout; - tmptqlayout.col = col; - tmptqlayout.l = new ColumnFormat( sheet, col ); - tmptqlayout.l->copy( *(sheet->columnFormat( col )) ); - listCol.append(tmptqlayout); + layoutColumn tmplayout; + tmplayout.col = col; + tmplayout.l = new ColumnFormat( sheet, col ); + tmplayout.l->copy( *(sheet->columnFormat( col )) ); + listCol.append(tmplayout); c = sheet->getFirstCellColumn( col ); while ( c ) { if ( !c->isPartOfMerged() ) { - layoutTextCell tmptqlayout; - tmptqlayout.col = col; - tmptqlayout.row = c->row(); - tmptqlayout.l = new Format( sheet, 0 ); - tmptqlayout.l->copy( *(sheet->cellAt( tmptqlayout.col, tmptqlayout.row )->format()) ); - tmptqlayout.text = c->text(); - list.append(tmptqlayout); + layoutTextCell tmplayout; + tmplayout.col = col; + tmplayout.row = c->row(); + tmplayout.l = new Format( sheet, 0 ); + tmplayout.l->copy( *(sheet->cellAt( tmplayout.col, tmplayout.row )->format()) ); + tmplayout.text = c->text(); + list.append(tmplayout); } c = sheet->getNextCellDown( col, c->row() ); @@ -1294,24 +1294,24 @@ void UndoSort::copyAll(TQValueList<layoutTextCell> & list, TQValueList<layoutCol Cell * c; for ( int row = m_rctRect.top(); row <= m_rctRect.bottom(); ++row) { - layoutRow tmptqlayout; - tmptqlayout.row = row; - tmptqlayout.l = new RowFormat( sheet, row ); - tmptqlayout.l->copy( *(sheet->rowFormat( row )) ); - listRow.append(tmptqlayout); + layoutRow tmplayout; + tmplayout.row = row; + tmplayout.l = new RowFormat( sheet, row ); + tmplayout.l->copy( *(sheet->rowFormat( row )) ); + listRow.append(tmplayout); c = sheet->getFirstCellRow( row ); while ( c ) { if ( !c->isPartOfMerged() ) { - layoutTextCell tmptqlayout; - tmptqlayout.col = c->column(); - tmptqlayout.row = row; - tmptqlayout.l = new Format( sheet, 0 ); - tmptqlayout.l->copy( *(sheet->cellAt( tmptqlayout.col, tmptqlayout.row )->format()) ); - tmptqlayout.text = c->text(); - list.append(tmptqlayout); + layoutTextCell tmplayout; + tmplayout.col = c->column(); + tmplayout.row = row; + tmplayout.l = new Format( sheet, 0 ); + tmplayout.l->copy( *(sheet->cellAt( tmplayout.col, tmplayout.row )->format()) ); + tmplayout.text = c->text(); + list.append(tmplayout); } c = sheet->getNextCellRight( c->column(), row ); } @@ -1328,13 +1328,13 @@ void UndoSort::copyAll(TQValueList<layoutTextCell> & list, TQValueList<layoutCol cell = sheet->nonDefaultCell( x, y ); if (!cell->isPartOfMerged()) { - layoutTextCell tmptqlayout; - tmptqlayout.col = x; - tmptqlayout.row = y; - tmptqlayout.l = new Format( sheet, 0 ); - tmptqlayout.l->copy( *(sheet->cellAt( x, y )->format()) ); - tmptqlayout.text = cell->text(); - list.append(tmptqlayout); + layoutTextCell tmplayout; + tmplayout.col = x; + tmplayout.row = y; + tmplayout.l = new Format( sheet, 0 ); + tmplayout.l->copy( *(sheet->cellAt( x, y )->format()) ); + tmplayout.text = cell->text(); + list.append(tmplayout); } } } @@ -1557,7 +1557,7 @@ void UndoDelete::createListCell( TQCString &listCell,TQValueList<columnSize> &li TQTextStream str( &buffer, IO_WriteOnly ); str << doc; - // This is a terrible hack to store tqunicode + // This is a terrible hack to store unicode // data in a TQCString in a way that // TQCString::length() == TQCString().size(). // This allows us to treat the TQCString like a TQByteArray later on. @@ -2243,7 +2243,7 @@ void UndoAutofill::createListCell( TQCString &list, Sheet* sheet ) TQTextStream str( &buffer, IO_WriteOnly ); str << doc; - // This is a terrible hack to store tqunicode + // This is a terrible hack to store unicode // data in a TQCString in a way that // TQCString::length() == TQCString().size(). // This allows us to treat the TQCString like a TQByteArray later on. @@ -2400,7 +2400,7 @@ UndoRemoveCellRow::UndoRemoveCellRow( Doc *_doc, Sheet *_sheet, const TQRect &re TQTextStream str( &buffer, IO_WriteOnly ); str << doc; - // This is a terrible hack to store tqunicode + // This is a terrible hack to store unicode // data in a TQCString in a way that // TQCString::length() == TQCString().size(). // This allows us to treat the TQCString like a TQByteArray later on. @@ -2459,7 +2459,7 @@ UndoRemoveCellCol::UndoRemoveCellCol( Doc *_doc, Sheet *_sheet, const TQRect &_r TQTextStream str( &buffer, IO_WriteOnly ); str << doc; - // This is a terrible hack to store tqunicode + // This is a terrible hack to store unicode // data in a TQCString in a way that // TQCString::length() == TQCString().size(). // This allows us to treat the TQCString like a TQByteArray later on. @@ -2529,7 +2529,7 @@ void UndoConditional::createListCell( TQCString &list, Sheet* sheet ) TQDomDocument doc = sheet->saveCellRegion( m_region ); str << doc; - // This is a terrible hack to store tqunicode + // This is a terrible hack to store unicode // data in a TQCString in a way that // TQCString::length() == TQCString().size(). // This allows us to treat the TQCString like a TQByteArray later on. @@ -2671,7 +2671,7 @@ void UndoCellPaste::createListCell(TQCString& listCell, TQTextStream str( &buffer, IO_WriteOnly ); str << doc; - // This is a terrible hack to store tqunicode + // This is a terrible hack to store unicode // data in a TQCString in a way that // TQCString::length() == TQCString().size(). // This allows us to treat the TQCString like a TQByteArray later on. diff --git a/kspread/kspread_util.cc b/kspread/kspread_util.cc index 2bbbd0a0..e84f1d47 100644 --- a/kspread/kspread_util.cc +++ b/kspread/kspread_util.cc @@ -53,7 +53,7 @@ bool KSpread::formatIsFraction (FormatType fmt) //used in Point::init, Cell::encodeFormula and -// dialogs/kspread_dlg_papertqlayout.cc +// dialogs/kspread_dlg_paperlayout.cc int KSpread::util_decodeColumnLabelText( const TQString &_col ) { int col = 0; @@ -72,7 +72,7 @@ int KSpread::util_decodeColumnLabelText( const TQString &_col ) return col; } -//used in dialogs/kspread_dlg_papertqlayout.cc +//used in dialogs/kspread_dlg_paperlayout.cc TQString KSpread::util_rangeColumnName( const TQRect &_area) { return TQString("%1:%2") @@ -80,7 +80,7 @@ TQString KSpread::util_rangeColumnName( const TQRect &_area) .arg( Cell::columnName(_area.right())); } -//used in dialogs/kspread_dlg_papertqlayout.cc +//used in dialogs/kspread_dlg_paperlayout.cc TQString KSpread::util_rangeRowName( const TQRect &_area) { return TQString("%1:%2") @@ -1065,7 +1065,7 @@ TQString KSpread::Oasis::decodeFormula(const TQString& expr, const KLocale* loca } // [ marks sheet name for 3-d cell, e.g ['Sales Q3'.A4] - else if ( ch.tqunicode() == '[' ) + else if ( ch.unicode() == '[' ) { ++i; state = InReference; diff --git a/kspread/kspread_view.cc b/kspread/kspread_view.cc index b54932da..02bd1407 100644 --- a/kspread/kspread_view.cc +++ b/kspread/kspread_view.cc @@ -911,7 +911,7 @@ void View::Private::initActions() actions->paperLayout = new KAction( i18n("Page Layout..."), 0, TQT_TQOBJECT(view), TQT_SLOT( paperLayoutDlg() ), ac, "paperLayout" ); - actions->paperLayout->setToolTip(i18n("Specify the tqlayout of the spreadsheet for a printout.")); + actions->paperLayout->setToolTip(i18n("Specify the layout of the spreadsheet for a printout.")); actions->definePrintRange = new KAction( i18n("Define Print Range"), 0, TQT_TQOBJECT(view), TQT_SLOT( definePrintRange() ), ac, "definePrintRange" ); @@ -4135,7 +4135,7 @@ void View::paste() if (!koDocument()->isReadWrite()) // don't paste into a read only document return; - TQMimeSource *data = TQApplication::tqclipboard()->data( TQClipboard::Clipboard ); + TQMimeSource *data = TQApplication::clipboard()->data( TQClipboard::Clipboard ); for ( int i=0; data->format(i) != 0; i++ ) kdDebug() << "format:" << data->format(i) << endl; @@ -4206,7 +4206,7 @@ void View::paste() else { //TODO: What if the clipboard data is available in both pixmap and OASIS format? (ie. for embedded parts) - TQPixmap clipboardPixmap = TQApplication::tqclipboard()->pixmap( TQClipboard::Clipboard ); + TQPixmap clipboardPixmap = TQApplication::clipboard()->pixmap( TQClipboard::Clipboard ); if (!clipboardPixmap.isNull()) { d->activeSheet->insertPicture( markerDocumentPosition() , clipboardPixmap ); @@ -4914,7 +4914,7 @@ void View::setupPrinter( KPrinter &prt ) SheetPrint* print = d->activeSheet->print(); - //apply page tqlayout parameters + //apply page layout parameters KoFormat pageFormat = print->paperFormat(); prt.setPageSize( static_cast<KPrinter::PageSize>( KoPageFormat::printerPageSize( pageFormat ) ) ); diff --git a/kspread/manipulator.cc b/kspread/manipulator.cc index 57e52fcf..f1a5838b 100644 --- a/kspread/manipulator.cc +++ b/kspread/manipulator.cc @@ -445,20 +445,20 @@ void FormatManipulator::copyFormat(TQValueList<layoutCell> & list, /* Don't need to go through the loop twice... for (int i = range.left(); i <= right; ++i) { - layoutColumn tmptqlayout; - tmptqlayout.col = i; - tmptqlayout.l = new ColumnFormat( m_sheet, i ); - tmptqlayout.l->copy( *(m_sheet->columnFormat( i )) ); - listCol.append(tmptqlayout); + layoutColumn tmplayout; + tmplayout.col = i; + tmplayout.l = new ColumnFormat( m_sheet, i ); + tmplayout.l->copy( *(m_sheet->columnFormat( i )) ); + listCol.append(tmplayout); } */ for ( int col = range.left(); col <= right; ++col ) { - layoutColumn tmptqlayout; - tmptqlayout.col = col; - tmptqlayout.l = new ColumnFormat( m_sheet, col ); - tmptqlayout.l->copy( *(m_sheet->columnFormat( col )) ); - listCol.append(tmptqlayout); + layoutColumn tmplayout; + tmplayout.col = col; + tmplayout.l = new ColumnFormat( m_sheet, col ); + tmplayout.l->copy( *(m_sheet->columnFormat( col )) ); + listCol.append(tmplayout); cell = m_sheet->getFirstCellColumn( col ); while ( cell ) @@ -469,12 +469,12 @@ void FormatManipulator::copyFormat(TQValueList<layoutCell> & list, continue; } - layoutCell tmptqlayout; - tmptqlayout.col = col; - tmptqlayout.row = cell->row(); - tmptqlayout.l = new Format( m_sheet, 0 ); - tmptqlayout.l->copy( *(m_sheet->cellAt( tmptqlayout.col, tmptqlayout.row )->format()) ); - list.append(tmptqlayout); + layoutCell tmplayout; + tmplayout.col = col; + tmplayout.row = cell->row(); + tmplayout.l = new Format( m_sheet, 0 ); + tmplayout.l->copy( *(m_sheet->cellAt( tmplayout.col, tmplayout.row )->format()) ); + list.append(tmplayout); cell = m_sheet->getNextCellDown( col, cell->row() ); } @@ -487,12 +487,12 @@ void FormatManipulator::copyFormat(TQValueList<layoutCell> & list, if ( range.left() <= col && right >= col && !cell->isPartOfMerged()) { - layoutCell tmptqlayout; - tmptqlayout.col = cell->column(); - tmptqlayout.row = cell->row(); - tmptqlayout.l = new Format( m_sheet, 0 ); - tmptqlayout.l->copy( *(m_sheet->cellAt( tmptqlayout.col, tmptqlayout.row )) ); - list.append(tmptqlayout); + layoutCell tmplayout; + tmplayout.col = cell->column(); + tmplayout.row = cell->row(); + tmplayout.l = new Format( m_sheet, 0 ); + tmplayout.l->copy( *(m_sheet->cellAt( tmplayout.col, tmplayout.row )) ); + list.append(tmplayout); } } */ @@ -501,11 +501,11 @@ void FormatManipulator::copyFormat(TQValueList<layoutCell> & list, { for ( int row = range.top(); row <= bottom; ++row ) { - layoutRow tmptqlayout; - tmptqlayout.row = row; - tmptqlayout.l = new RowFormat( m_sheet, row ); - tmptqlayout.l->copy( *(m_sheet->rowFormat( row )) ); - listRow.append(tmptqlayout); + layoutRow tmplayout; + tmplayout.row = row; + tmplayout.l = new RowFormat( m_sheet, row ); + tmplayout.l->copy( *(m_sheet->rowFormat( row )) ); + listRow.append(tmplayout); cell = m_sheet->getFirstCellRow( row ); while ( cell ) @@ -515,12 +515,12 @@ void FormatManipulator::copyFormat(TQValueList<layoutCell> & list, cell = m_sheet->getNextCellRight( cell->column(), row ); continue; } - layoutCell tmptqlayout; - tmptqlayout.col = cell->column(); - tmptqlayout.row = row; - tmptqlayout.l = new Format( m_sheet, 0 ); - tmptqlayout.l->copy( *(m_sheet->cellAt( cell->column(), row )->format()) ); - list.append(tmptqlayout); + layoutCell tmplayout; + tmplayout.col = cell->column(); + tmplayout.row = row; + tmplayout.l = new Format( m_sheet, 0 ); + tmplayout.l->copy( *(m_sheet->cellAt( cell->column(), row )->format()) ); + list.append(tmplayout); cell = m_sheet->getNextCellRight( cell->column(), row ); } @@ -533,12 +533,12 @@ void FormatManipulator::copyFormat(TQValueList<layoutCell> & list, if ( range.top() <= row && bottom >= row && !cell->isPartOfMerged()) { - layoutCell tmptqlayout; - tmptqlayout.col = cell->column(); - tmptqlayout.row = cell->row(); - tmptqlayout.l = new Format( m_sheet, 0 ); - tmptqlayout.l->copy( *(m_sheet->cellAt( tmptqlayout.col, tmptqlayout.row )) ); - list.append(tmptqlayout); + layoutCell tmplayout; + tmplayout.col = cell->column(); + tmplayout.row = cell->row(); + tmplayout.l = new Format( m_sheet, 0 ); + tmplayout.l->copy( *(m_sheet->cellAt( tmplayout.col, tmplayout.row )) ); + list.append(tmplayout); } } */ @@ -551,12 +551,12 @@ void FormatManipulator::copyFormat(TQValueList<layoutCell> & list, Cell * cell = m_sheet->nonDefaultCell( col, row ); if ( !cell->isPartOfMerged() ) { - layoutCell tmptqlayout; - tmptqlayout.col = col; - tmptqlayout.row = row; - tmptqlayout.l = new Format( m_sheet, 0 ); - tmptqlayout.l->copy( *(m_sheet->cellAt( col, row )->format()) ); - list.append(tmptqlayout); + layoutCell tmplayout; + tmplayout.col = col; + tmplayout.row = row; + tmplayout.l = new Format( m_sheet, 0 ); + tmplayout.l->copy( *(m_sheet->cellAt( col, row )->format()) ); + list.append(tmplayout); } } } diff --git a/kspread/plugins/calculator/configdlg.cpp b/kspread/plugins/calculator/configdlg.cpp index cec64193..28ab2646 100644 --- a/kspread/plugins/calculator/configdlg.cpp +++ b/kspread/plugins/calculator/configdlg.cpp @@ -48,10 +48,10 @@ ConfigDlg::ConfigDlg(TQWidget *parent, const char *name, DefStruct *defstruct) lay1->setSpacing( KDialog::spacingHint() ); box = new TQGroupBox(0, Qt::Vertical, i18n("Defaults"), this, "box"); - box->tqlayout()->setSpacing(KDialog::spacingHint()); - box->tqlayout()->setMargin(KDialog::marginHint()); + box->layout()->setSpacing(KDialog::spacingHint()); + box->layout()->setMargin(KDialog::marginHint()); - TQGridLayout *grid1 = new TQGridLayout(box->tqlayout(),8,2); + TQGridLayout *grid1 = new TQGridLayout(box->layout(),8,2); label1 = new TQLabel(box); label1->setText(i18n("Foreground color:")); grid1->addWidget(label1,0,0); diff --git a/kspread/plugins/calculator/kcalc.cpp b/kspread/plugins/calculator/kcalc.cpp index e1a1d4c3..75051b17 100644 --- a/kspread/plugins/calculator/kcalc.cpp +++ b/kspread/plugins/calculator/kcalc.cpp @@ -390,12 +390,12 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char mainLayout->addLayout(btnLayout); mainLayout->addLayout(statusLayout); - // button tqlayout + // button layout btnLayout->addWidget(mSmallPage,0,AlignTop); btnLayout->addSpacing(mInternalSpacing); btnLayout->addWidget(mLargePage,0,AlignTop); - // small button tqlayout + // small button layout smallBtnLayout->addWidget(pbhyp, 0, 0); smallBtnLayout->addWidget(pbinv, 0, 1); smallBtnLayout->addWidget(pbA, 0, 2); @@ -427,7 +427,7 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char smallBtnLayout->setRowStretch(4, 0); smallBtnLayout->setRowStretch(5, 0); - // large button tqlayout + // large button layout largeBtnLayout->addWidget(pbEE, 0, 0); largeBtnLayout->addWidget(pbMR, 0, 1); largeBtnLayout->addWidget(pbMplusminus, 0, 2); @@ -472,11 +472,11 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char topLayout->addWidget(calc_display, 10); - // radiobutton tqlayout + // radiobutton layout radioLayout->addWidget(base_group); radioLayout->addWidget(angle_group); - // status tqlayout + // status layout statusLayout->addWidget(statusINVLabel); statusLayout->addWidget(statusHYPLabel); statusLayout->addWidget(statusERRORLabel, 10); @@ -1465,9 +1465,9 @@ void TQtCalculator::configclicked(){ lay1->setSpacing( KDialog::spacingHint() ); TQGroupBox *box = new TQGroupBox(0,Qt::Vertical,about,"box"); - box->tqlayout()->setSpacing(KDialog::spacingHint()); - box->tqlayout()->setMargin(KDialog::marginHint()); - TQGridLayout *grid1 = new TQGridLayout(box->tqlayout(),2,2); + box->layout()->setSpacing(KDialog::spacingHint()); + box->layout()->setMargin(KDialog::marginHint()); + TQGridLayout *grid1 = new TQGridLayout(box->layout(),2,2); TQLabel *label = new TQLabel(box,"label"); TQLabel *label2 = new TQLabel(box,"label2"); @@ -1628,7 +1628,7 @@ void TQtCalculator::display_selected(){ if(calc_display->isLit()){ - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); cb->setText(calc_display->text()); selection_timer->start(100); @@ -1643,7 +1643,7 @@ void TQtCalculator::display_selected(){ } else{ - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); CALCAMNT result; result = (CALCAMNT) cb->text().toDouble(); diff --git a/kspread/plugins/scripting/scripts/exporthtml/ExportHtml.py b/kspread/plugins/scripting/scripts/exporthtml/ExportHtml.py index a34a4dd1..529a2d26 100755 --- a/kspread/plugins/scripting/scripts/exporthtml/ExportHtml.py +++ b/kspread/plugins/scripting/scripts/exporthtml/ExportHtml.py @@ -30,11 +30,11 @@ class Dialog(qt.QDialog): import qt qt.QDialog.__init__(self, parent, "Dialog", 1, qt.Qt.WDestructiveClose) self.setCaption("Export to HTML File") - tqlayout = qt.QVBoxLayout(self) + layout = qt.QVBoxLayout(self) box = qt.QVBox(self) box.setMargin(10) box.setSpacing(10) - tqlayout.addWidget(box) + layout.addWidget(box) sheetbox = qt.QHBox(box) sheetbox.setSpacing(6) diff --git a/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py b/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py index e3d6237c..c6da1fe2 100755 --- a/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py +++ b/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py @@ -763,11 +763,11 @@ class SampleDialog(qt.QDialog): import qt qt.QDialog.__init__(self, parent, "SampleDialog", 1) - tqlayout = qt.QVBoxLayout(self) + layout = qt.QVBoxLayout(self) box = qt.QVBox(self) box.setMargin(4) box.setSpacing(10) - tqlayout.addWidget(box) + layout.addWidget(box) self.scrollview = qt.QScrollView(box) self.scrollview.setResizePolicy(qt.QScrollView.AutoOne) @@ -829,11 +829,11 @@ class MainDialog(qt.QDialog): qt.QDialog.__init__(self, parent, "MainDialog", 1, qt.Qt.WDestructiveClose) self.setCaption("Script Editor") - tqlayout = qt.QVBoxLayout(self) + layout = qt.QVBoxLayout(self) box = qt.QVBox(self) box.setMargin(4) box.setSpacing(10) - tqlayout.addWidget(box) + layout.addWidget(box) menu = qt.QMenuBar(box) diff --git a/kspread/tests/testrunner.cc b/kspread/tests/testrunner.cc index 5b4864ad..d16dc166 100644 --- a/kspread/tests/testrunner.cc +++ b/kspread/tests/testrunner.cc @@ -58,23 +58,23 @@ TestRunner::TestRunner(): d = new Private; TQFrame* mainWidget = plainPage(); - TQGridLayout* tqlayout = new TQGridLayout( mainWidget, 3, 4, marginHint(), spacingHint() ); + TQGridLayout* layout = new TQGridLayout( mainWidget, 3, 4, marginHint(), spacingHint() ); setMinimumSize( 360, 230 ); TQLabel* typeLabel = new TQLabel( "Type of Test:", mainWidget ); - tqlayout->addWidget( typeLabel, 0, 0 ); + layout->addWidget( typeLabel, 0, 0 ); d->testType = new KComboBox( mainWidget ); - tqlayout->addWidget( d->testType, 0, 1 ); + layout->addWidget( d->testType, 0, 1 ); TQSpacerItem* spacerItem = new TQSpacerItem( 10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); - tqlayout->addItem( spacerItem, 0, 2 ); + layout->addItem( spacerItem, 0, 2 ); d->runButton = new KPushButton( "Run", mainWidget ); - tqlayout->addWidget( d->runButton, 0, 3 ); + layout->addWidget( d->runButton, 0, 3 ); d->logView = new TQTextEdit( mainWidget ); - tqlayout->addMultiCellWidget( d->logView, 2, 2, 0, 3 ); + layout->addMultiCellWidget( d->logView, 2, 2, 0, 3 ); d->logView->setTextFormat( TQt::LogText ); TQObject::connect( d->runButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( runTest() ) ); diff --git a/kugar/lib/mreportengine.cpp b/kugar/lib/mreportengine.cpp index 2263ba61..ca747b3e 100644 --- a/kugar/lib/mreportengine.cpp +++ b/kugar/lib/mreportengine.cpp @@ -689,7 +689,7 @@ void MReportEngine::recalcAttribute( const TQString& name, TQDomNamedNodeMap att } } -/** Walks the document tree, setting the report tqlayout */ +/** Walks the document tree, setting the report layout */ void MReportEngine::initTemplate() { heightOfDetails = 0; @@ -748,7 +748,7 @@ void MReportEngine::initTemplate() } } -/** Sets the main tqlayout attributes for the report */ +/** Sets the main layout attributes for the report */ void MReportEngine::setReportAttributes( TQDomNode* report ) { // Get the attributes for the report @@ -792,7 +792,7 @@ int MReportEngine::scaleDeltaHeight( int height ) const return f > 1 ? int( f + 0.5 ) : ceil( f ); } -/** Sets the tqlayout attributes for the given report section */ +/** Sets the layout attributes for the given report section */ void MReportEngine::setSectionAttributes( MReportSection* section, TQDomNode* report ) { // Get the attributes for the section @@ -852,7 +852,7 @@ void MReportEngine::setSectionAttributes( MReportSection* section, TQDomNode* re } } -/** Sets the tqlayout attributes for the detail headers and footers */ +/** Sets the layout attributes for the detail headers and footers */ void MReportEngine::setDetMiscAttributes( MReportSection* section, TQDomNode* report ) { // Get the attributes for the section @@ -866,7 +866,7 @@ void MReportEngine::setDetMiscAttributes( MReportSection* section, TQDomNode* re } -/** Sets the tqlayout attributes for the detail section */ +/** Sets the layout attributes for the detail section */ void MReportEngine::setDetailAttributes( TQDomNode* report ) { // Get the attributes for the detail section @@ -923,7 +923,7 @@ void MReportEngine::setDetailAttributes( TQDomNode* report ) details.append( detail ); } -/** Sets a line's tqlayout attributes */ +/** Sets a line's layout attributes */ void MReportEngine::setLineAttributes( MLineObject* line, TQDomNamedNodeMap* attr ) { line->setLine( scaleDeltaWidth( attr->namedItem( "X1" ).nodeValue().toInt() ), @@ -941,7 +941,7 @@ void MReportEngine::setLineAttributes( MLineObject* line, TQDomNamedNodeMap* att line->setStyle( attr->namedItem( "Style" ).nodeValue().toInt() ); } -/** Sets a label's tqlayout attributes */ +/** Sets a label's layout attributes */ void MReportEngine::setLabelAttributes( MLabelObject* label, TQDomNamedNodeMap* attr ) { TQString tmp; @@ -986,7 +986,7 @@ void MReportEngine::setLabelAttributes( MLabelObject* label, TQDomNamedNodeMap* label->setWordWrap( attr->namedItem( "WordWrap" ).nodeValue().toInt() == 0 ? false : true ); } -/** Sets a special field's tqlayout attributes */ +/** Sets a special field's layout attributes */ void MReportEngine::setSpecialAttributes( MSpecialObject* field, TQDomNamedNodeMap* attr ) { field->setType( attr->namedItem( "Type" ).nodeValue().toInt() ); @@ -995,7 +995,7 @@ void MReportEngine::setSpecialAttributes( MSpecialObject* field, TQDomNamedNodeM setLabelAttributes( ( MLabelObject * ) field, attr ); } -/** Sets a field's tqlayout attributes */ +/** Sets a field's layout attributes */ void MReportEngine::setFieldAttributes( MFieldObject* field, TQDomNamedNodeMap* attr ) { field->setFieldName( attr->namedItem( "Field" ).nodeValue() ); @@ -1015,7 +1015,7 @@ void MReportEngine::setFieldAttributes( MFieldObject* field, TQDomNamedNodeMap* setLabelAttributes( ( MLabelObject * ) field, attr ); } -/** Sets a calculated field's tqlayout attributes */ +/** Sets a calculated field's layout attributes */ void MReportEngine::setCalculatedFieldAttributes( MCalcObject* field, TQDomNamedNodeMap* attr ) { field->setCalculationType( attr->namedItem( "CalculationType" ).nodeValue().toInt() ); diff --git a/kugar/lib/mreportengine.h b/kugar/lib/mreportengine.h index aaf36107..846d0a3a 100644 --- a/kugar/lib/mreportengine.h +++ b/kugar/lib/mreportengine.h @@ -170,27 +170,27 @@ private: void initData(); void initTemplate(); - /** Sets the main tqlayout attributes for the report */ + /** Sets the main layout attributes for the report */ void setReportAttributes( TQDomNode* report ); int scaleDeltaWidth( int width ) const; int scaleDeltaHeight( int width ) const; - /** Sets the tqlayout attributes for the given report section */ + /** Sets the layout attributes for the given report section */ void setSectionAttributes( MReportSection* section, TQDomNode* report ); - /** Sets the tqlayout attributes for the detail headers and footers */ + /** Sets the layout attributes for the detail headers and footers */ void setDetMiscAttributes( MReportSection* section, TQDomNode* report ); - /** Sets the tqlayout attributes for the detail section */ + /** Sets the layout attributes for the detail section */ void setDetailAttributes( TQDomNode* report ); - /** Sets a line's tqlayout attributes */ + /** Sets a line's layout attributes */ void setLineAttributes( MLineObject* line, TQDomNamedNodeMap* attr ); - /** Sets a label's tqlayout attributes */ + /** Sets a label's layout attributes */ void setLabelAttributes( MLabelObject* label, TQDomNamedNodeMap* attr ); - /** Sets a special field's tqlayout attributes */ + /** Sets a special field's layout attributes */ void setSpecialAttributes( MSpecialObject* field, TQDomNamedNodeMap* attr ); - /** Sets a field's tqlayout attributes */ + /** Sets a field's layout attributes */ void setFieldAttributes( MFieldObject* field, TQDomNamedNodeMap* attr ); - /** Sets a calculated field's tqlayout attributes */ + /** Sets a calculated field's layout attributes */ void setCalculatedFieldAttributes( MCalcObject* field, TQDomNamedNodeMap* attr ); /** Copies member data from one object to another. diff --git a/kword/DESIGN b/kword/DESIGN index a920c8db..6a01ae28 100644 --- a/kword/DESIGN +++ b/kword/DESIGN @@ -38,7 +38,7 @@ cell, we contain the cells in their own KWTextFrameset. is defined by m_zOrder in KWFrame. This number is relative to the other frames *on the same page*. -Frame tqlayout and pages +Frame layout and pages ====================== Generally, the user is free to position frames where he/she wants to. @@ -63,10 +63,10 @@ In WP mode, removing pages is automatically done by KWDocument::tryRemovingPages In DTP mode pages are user-controlled (insert and delete page actions), but overflowing text can still create a new page as well. -The difficulty with frame tqlayout is that in most cases the frame size and -number depends on the text inside, and the text tqlayout depends on the frames -(frame width, frames on top, etc.). This is why text tqlayout (formatMore()) -and frame tqlayout (e.g. KWFrameLayout) often call each other, resulting in +The difficulty with frame layout is that in most cases the frame size and +number depends on the text inside, and the text layout depends on the frames +(frame width, frames on top, etc.). This is why text layout (formatMore()) +and frame layout (e.g. KWFrameLayout) often call each other, resulting in infinite loops when some code goes wrong. Editing diff --git a/kword/HACKING b/kword/HACKING index c808ac27..e0ce97a5 100644 --- a/kword/HACKING +++ b/kword/HACKING @@ -59,7 +59,7 @@ DIRECTORIES: various QTSQL interface implementation files to handle table selection and mailmerge data templates: - various page tqlayout templates + various page layout templates make_template.pl - Perl script to create XML templates - from KWord-saved XML files subdirectories @@ -89,7 +89,7 @@ FILES: main.cc - the main kwaboutdata.h - the appname, authors... - shared between main.cc and kwfactory.cc - kword.rc - xml-gui tqlayout + kword.rc - xml-gui layout kword.desktop - application .desktop file main document data structures: diff --git a/kword/KWAnchor.cpp b/kword/KWAnchor.cpp index 6e99f0c9..a291999e 100644 --- a/kword/KWAnchor.cpp +++ b/kword/KWAnchor.cpp @@ -70,7 +70,7 @@ void KWAnchor::finalize() void KWAnchor::draw( TQPainter* p, int x, int y, int cx, int cy, int cw, int ch, const TQColorGroup& cg, bool selected ) { // (x,y) is the position of the inline item (in Layout Units) - // (cx,cy,cw,ch) is the rectangle to be painted, in tqlayout units too + // (cx,cy,cw,ch) is the rectangle to be painted, in layout units too if ( m_deleted ) return; diff --git a/kword/KWCanvas.cpp b/kword/KWCanvas.cpp index 58baa44b..4a469cca 100644 --- a/kword/KWCanvas.cpp +++ b/kword/KWCanvas.cpp @@ -305,7 +305,7 @@ void KWCanvas::drawFrameSet( KWFrameSet * frameset, TQPainter * painter, if ( painter->device()->devType() == TQInternal::Printer ) focus = false; - TQColorGroup gb = TQApplication::tqpalette().active(); + TQColorGroup gb = TQApplication::palette().active(); if ( focus && m_currentFrameSetEdit && frameset == m_currentFrameSetEdit->frameSet() ) // Currently edited frameset m_currentFrameSetEdit->drawContents( painter, crect, gb, onlyChanged, resetChanged, viewMode, m_frameViewManager ); @@ -543,9 +543,9 @@ void KWCanvas::contentsMousePressEvent( TQMouseEvent *e ) if ( e->button() == Qt::MidButton ) { if ( m_doc->isReadWrite() && m_currentFrameSetEdit && m_mouseMode == MM_EDIT ) { - TQApplication::tqclipboard()->setSelectionMode( true ); + TQApplication::clipboard()->setSelectionMode( true ); m_currentFrameSetEdit->paste(); - TQApplication::tqclipboard()->setSelectionMode( false ); + TQApplication::clipboard()->setSelectionMode( false ); } } else if ( e->button() == Qt::RightButton ) { @@ -1032,7 +1032,7 @@ void KWCanvas::mrCreateTable() emit docStructChanged(Tables); } m_doc->updateAllFrames(); - m_doc->tqlayout(); + m_doc->layout(); repaintAll(); } diff --git a/kword/KWCommand.cpp b/kword/KWCommand.cpp index 8c1d0e69..20a4c918 100644 --- a/kword/KWCommand.cpp +++ b/kword/KWCommand.cpp @@ -145,14 +145,14 @@ KoTextCursor * KWPasteTextCommand::execute( KoTextCursor *c ) break; } TQDomElement paragElem = *it; - // First line (if appending to non-empty line) : apply offset to formatting, don't apply parag tqlayout + // First line (if appending to non-empty line) : apply offset to formatting, don't apply parag layout if ( item == 0 && m_idx > 0 ) { // First load the default format, but only apply it to our new chars - TQDomElement tqlayout = paragElem.namedItem( "LAYOUT" ).toElement(); - if ( !tqlayout.isNull() ) + TQDomElement layout = paragElem.namedItem( "LAYOUT" ).toElement(); + if ( !layout.isNull() ) { - TQDomElement formatElem = tqlayout.namedItem( "FORMAT" ).toElement(); + TQDomElement formatElem = layout.namedItem( "FORMAT" ).toElement(); if ( !formatElem.isNull() ) { KoTextFormat f = parag->loadFormat( formatElem, 0L, TQFont(), KGlobal::locale()->language(),false ); @@ -167,7 +167,7 @@ KoTextCursor * KWPasteTextCommand::execute( KoTextCursor *c ) } else { - if ( item == 0 ) // This paragraph existed, store its parag tqlayout + if ( item == 0 ) // This paragraph existed, store its parag layout { delete m_oldParagLayout; m_oldParagLayout = new KoParagLayout( parag->paragLayout() ); @@ -913,7 +913,7 @@ KWFrameMoveCommand::KWFrameMoveCommand( const TQString &name, void KWFrameMoveCommand::execute() { - bool needRetqlayout = false; + bool needRelayout = false; KWDocument * doc = 0L; TQValueList<FrameMoveStruct>::Iterator moveIt = m_frameMove.begin(); TQValueList<FrameIndex>::Iterator tmp = m_indexFrame.begin(); @@ -925,13 +925,13 @@ void KWFrameMoveCommand::execute() frame->moveTopLeft( (*moveIt).newPos ); frame->updateRulerHandles(); - needRetqlayout = needRetqlayout || ( frame->runAround() != KWFrame::RA_NO ); + needRelayout = needRelayout || ( frame->runAround() != KWFrame::RA_NO ); } if ( doc ) { doc->updateAllFrames(); - if ( needRetqlayout ) - doc->tqlayout(); + if ( needRelayout ) + doc->layout(); doc->updateRulerFrameStartEnd(); doc->repaintAllViews(); @@ -940,7 +940,7 @@ void KWFrameMoveCommand::execute() void KWFrameMoveCommand::unexecute() { - bool needRetqlayout = false; + bool needRelayout = false; KWDocument * doc = 0L; TQValueList<FrameMoveStruct>::Iterator moveIt = m_frameMove.begin(); TQValueList<FrameIndex>::Iterator tmp = m_indexFrame.begin(); @@ -952,14 +952,14 @@ void KWFrameMoveCommand::unexecute() frame->moveTopLeft( (*moveIt).oldPos ); frame->updateRulerHandles(); - needRetqlayout = needRetqlayout || ( frame->runAround() != KWFrame::RA_NO ); + needRelayout = needRelayout || ( frame->runAround() != KWFrame::RA_NO ); } if ( doc ) { doc->updateAllFrames(); - if ( needRetqlayout ) - doc->tqlayout(); + if ( needRelayout ) + doc->layout(); doc->updateRulerFrameStartEnd(); doc->repaintAllViews(); } @@ -995,7 +995,7 @@ void KWFramePropertiesCommand::execute() { doc->frameChanged( frame ); doc->updateAllFrames(); - doc->tqlayout(); + doc->layout(); doc->repaintAllViews(); doc->updateRulerFrameStartEnd(); } @@ -1016,7 +1016,7 @@ void KWFramePropertiesCommand::unexecute() { doc->frameChanged( frame ); doc->updateAllFrames(); - doc->tqlayout(); + doc->layout(); doc->repaintAllViews(); doc->updateRulerFrameStartEnd(); } @@ -1226,7 +1226,7 @@ void KWDeleteTableCommand::execute() doc->refreshDocStructure((int)Tables); doc->updateAllFrames(); m_pTable->updateFrames(); // not in the doc list anymore, so the above call didn't do it! - doc->tqlayout(); + doc->layout(); doc->repaintAllViews(); doc->updateRulerFrameStartEnd(); @@ -1240,7 +1240,7 @@ void KWDeleteTableCommand::unexecute() doc->addFrameSet(m_pTable); doc->refreshDocStructure((int)Tables); doc->updateAllFrames(); - doc->tqlayout(); + doc->layout(); doc->repaintAllViews(); doc->updateRulerFrameStartEnd(); } @@ -1284,7 +1284,7 @@ void KWInsertColumnCommand::execute() } Q_ASSERT(m_pTable->boundingRect().right() <= m_maxRight); doc->updateAllFrames(); - doc->tqlayout(); + doc->layout(); doc->repaintAllViews(); } @@ -1300,7 +1300,7 @@ void KWInsertColumnCommand::unexecute() m_pTable->resizeWidth(m_oldWidth); } doc->updateAllFrames(); - doc->tqlayout(); + doc->layout(); doc->repaintAllViews(); } @@ -1332,7 +1332,7 @@ void KWInsertRowCommand::execute() m_pTable->insertNewRow(m_rowPos); //only happens the first time } doc->updateAllFrames(); - doc->tqlayout(); + doc->layout(); doc->repaintAllViews(); } @@ -1345,7 +1345,7 @@ void KWInsertRowCommand::unexecute() m_pTable->deleteRow( m_rowPos, *m_rr); doc->updateAllFrames(); - doc->tqlayout(); + doc->layout(); } @@ -1372,7 +1372,7 @@ void KWRemoveRowCommand::execute() m_pTable->deleteRow( m_rowPos, *m_rr); doc->updateAllFrames(); - doc->tqlayout(); + doc->layout(); } void KWRemoveRowCommand::unexecute() @@ -1381,7 +1381,7 @@ void KWRemoveRowCommand::unexecute() KWDocument * doc = m_pTable->kWordDocument(); m_pTable->reInsertRow(*m_rr); doc->updateAllFrames(); - doc->tqlayout(); + doc->layout(); doc->repaintAllViews(); } @@ -1407,7 +1407,7 @@ void KWRemoveColumnCommand::execute() m_pTable->deleteColumn( m_colPos, *m_rc); doc->updateAllFrames(); - doc->tqlayout(); + doc->layout(); } void KWRemoveColumnCommand::unexecute() @@ -1416,7 +1416,7 @@ void KWRemoveColumnCommand::unexecute() KWDocument * doc = m_pTable->kWordDocument(); m_pTable->reInsertColumn(*m_rc); doc->updateAllFrames(); - doc->tqlayout(); + doc->layout(); doc->repaintAllViews(); } @@ -1441,7 +1441,7 @@ void KWSplitCellCommand::execute() //kdDebug()<<"split Cell m_colBegin :"<<m_colBegin<<" m_colEnd :"<<m_colEnd<<" m_rowBegin :"<<m_rowBegin<<" m_colEnd :"<<m_colEnd<<endl; m_pTable->splitCell(m_rowEnd, m_colEnd,m_colBegin,m_rowBegin,m_ListFrameSet); doc->updateAllFrames(); - doc->tqlayout(); + doc->layout(); } void KWSplitCellCommand::unexecute() @@ -1478,7 +1478,7 @@ void KWSplitCellCommand::unexecute() m_rowBegin+m_rowEnd-1+cell->rowSpan()-1); doc->updateAllFrames(); - doc->tqlayout(); + doc->layout(); } @@ -1507,7 +1507,7 @@ void KWJoinCellCommand::execute() doc->terminateEditing(m_pTable); m_pTable->joinCells(m_colBegin,m_rowBegin,m_colEnd,m_rowEnd); doc->updateAllFrames(); - doc->tqlayout(); + doc->layout(); } void KWJoinCellCommand::unexecute() @@ -1517,7 +1517,7 @@ void KWJoinCellCommand::unexecute() doc->terminateEditing(m_pTable); m_pTable->splitCell(m_rowEnd-m_rowBegin+1, m_colEnd-m_colBegin+1,m_colBegin,m_rowBegin,m_ListFrameSet,m_copyFrame); doc->updateAllFrames(); - doc->tqlayout(); + doc->layout(); } @@ -1986,7 +1986,7 @@ void KWChangeFootNoteParametersCommand::changeVariableParameter( FootNoteParamet if ( frameset) frameset->renumberFootNotes(); - // Re-tqlayout the footnote/endnote frame + // Re-layout the footnote/endnote frame KWFrame* footNoteFrame = m_var->frameSet()->frame( 0 ); int framePage = footNoteFrame->pageNumber(); m_doc->recalcFrames( framePage, -1 ); @@ -2061,14 +2061,14 @@ KWResizeColumnCommand::KWResizeColumnCommand( KWTableFrameSet *table, int col, d void KWResizeColumnCommand::execute() { m_table->resizeColumn(m_col, m_newSize); - m_table->kWordDocument()->tqlayout(); + m_table->kWordDocument()->layout(); m_table->kWordDocument()->repaintAllViews(); } void KWResizeColumnCommand::unexecute() { m_table->resizeColumn(m_col, m_oldSize); - m_table->kWordDocument()->tqlayout(); + m_table->kWordDocument()->layout(); m_table->kWordDocument()->repaintAllViews(); } diff --git a/kword/KWCommand.h b/kword/KWCommand.h index 7c905fb3..71d13f1f 100644 --- a/kword/KWCommand.h +++ b/kword/KWCommand.h @@ -380,7 +380,7 @@ protected: bool m_oldValue; }; -///////////////////////////////tqlayout command/////////////////////////// +///////////////////////////////layout command/////////////////////////// struct KWPageLayoutStruct { KWPageLayoutStruct( const KoPageLayout& pgLayout, const KoColumns& cl, const KoKWHeaderFooter& hf ) : _pgLayout(pgLayout), _cl(cl), _hf(hf) { @@ -391,7 +391,7 @@ struct KWPageLayoutStruct { }; /** - * Command created when changing the page tqlayout + * Command created when changing the page layout */ class KWPageLayoutCommand : public KNamedCommand { diff --git a/kword/KWConfig.cpp b/kword/KWConfig.cpp index b368af2e..e3a56ac4 100644 --- a/kword/KWConfig.cpp +++ b/kword/KWConfig.cpp @@ -217,7 +217,7 @@ ConfigureSpellPage::ConfigureSpellPage( KWView *view, TQVBox *box, char *name ) config = KWFactory::instance()->config(); m_spellConfigWidget = new ConfigWidget( view->broker(), box ); m_spellConfigWidget->setBackgroundCheckingButtonShown( true ); - m_spellConfigWidget->tqlayout()->setMargin( 0 ); + m_spellConfigWidget->layout()->setMargin( 0 ); } void ConfigureSpellPage::apply() @@ -655,7 +655,7 @@ KCommand *ConfigureMiscPage::apply() } if ( needRepaint ) { - doc->tqlayout(); + doc->layout(); doc->repaintAllViews(); } return macroCmd; diff --git a/kword/KWConfigFootNoteDia.cpp b/kword/KWConfigFootNoteDia.cpp index d15c78c0..ee235c9b 100644 --- a/kword/KWConfigFootNoteDia.cpp +++ b/kword/KWConfigFootNoteDia.cpp @@ -81,7 +81,7 @@ void KWConfigFootNoteDia::setupTab3() "of the three alignments."); TQWhatsThis::add(positionGroupBox, comment); positionGroupBox->setColumnLayout(0, Qt::Vertical ); - TQVBoxLayout *positionLayout = new TQVBoxLayout( positionGroupBox->tqlayout() ); + TQVBoxLayout *positionLayout = new TQVBoxLayout( positionGroupBox->layout() ); positionLayout->setAlignment( TQt::AlignTop ); // i18n context information necessary for gender considerations (e.g. in Polish) @@ -106,35 +106,35 @@ void KWConfigFootNoteDia::setupTab3() break; } - TQGridLayout *tqlayout = new TQGridLayout( 0, 1, 1, 0, KDialog::spacingHint()); + TQGridLayout *layout = new TQGridLayout( 0, 1, 1, 0, KDialog::spacingHint()); spWidth = new KoUnitDoubleSpinBox(page, 0, 5, 0.5, m_doc->footNoteSeparatorLineWidth(), m_doc->unit(), 1); - tqlayout->addWidget( spWidth, 1, 1 ); + layout->addWidget( spWidth, 1, 1 ); spLength = new KIntNumInput( page, "spLength" ); spLength->setRange( 1, 100, 1,false ); spLength->setValue( m_doc->footNoteSeparatorLineLength()); spLength->setSuffix(i18n(" %")); - tqlayout->addWidget( spLength, 0, 1 ); + layout->addWidget( spLength, 0, 1 ); TQLabel *lSize = new TQLabel( i18n( "&Width:"), page ); lSize->setBuddy( spWidth ); comment= i18n ("The width is the thickness of the separator line, set to 0 for no separator line."); TQWhatsThis::add(lSize, comment); TQWhatsThis::add(spWidth, comment); - tqlayout->addWidget( lSize, 1, 0 ); + layout->addWidget( lSize, 1, 0 ); TQSpacerItem* spacer = new TQSpacerItem( 0, 0, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); - tqlayout->addMultiCell( spacer, 0, 1, 2, 2 ); + layout->addMultiCell( spacer, 0, 1, 2, 2 ); TQLabel *lWidth = new TQLabel( i18n("&Size on page:"), page, "lWidth" ); lWidth->setBuddy( spLength ); comment= i18n ("The size of the separator line can be defined as a percentage of the width of the page."); TQWhatsThis::add(spLength, comment); TQWhatsThis::add(lWidth, comment); - tqlayout->addWidget( lWidth, 0, 0 ); - pageLayout->addLayout( tqlayout ); + layout->addWidget( lWidth, 0, 0 ); + pageLayout->addLayout( layout ); TQHBoxLayout *styleLayout = new TQHBoxLayout( 0, 0, KDialog::spacingHint(), "styleLayout"); diff --git a/kword/KWCreateBookmarkDiaBase.ui b/kword/KWCreateBookmarkDiaBase.ui index 0d164ed4..e789ac28 100644 --- a/kword/KWCreateBookmarkDiaBase.ui +++ b/kword/KWCreateBookmarkDiaBase.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> diff --git a/kword/KWDocument.cpp b/kword/KWDocument.cpp index 271359ba..55f5f351 100644 --- a/kword/KWDocument.cpp +++ b/kword/KWDocument.cpp @@ -483,8 +483,8 @@ void KWDocument::newZoomAndResolution( bool updateViews, bool forPrint ) // First recalc all frames (including the kotextdocument width) updateAllFrames(); - // Then retqlayout the text inside the frames - tqlayout(); + // Then relayout the text inside the frames + layout(); if ( updateViews ) { emit newContentsSize(); @@ -617,9 +617,9 @@ KoPageLayout KWDocument::pageLayout(int pageNumber /* = 0 */) const return pageManager()->pageLayout(pageNumber); } -void KWDocument::setPageLayout( const KoPageLayout& tqlayout, const KoColumns& cl, const KoKWHeaderFooter& hf, bool updateViews ) +void KWDocument::setPageLayout( const KoPageLayout& layout, const KoColumns& cl, const KoKWHeaderFooter& hf, bool updateViews ) { - m_pageLayout = tqlayout; + m_pageLayout = layout; if ( m_processingType == WP ) { m_pageColumns = cl; } @@ -643,8 +643,8 @@ void KWDocument::setPageLayout( const KoPageLayout& tqlayout, const KoColumns& c if ( updateViews ) { - // Invalidate document tqlayout, for proper repaint - this->tqlayout(); + // Invalidate document layout, for proper repaint + this->layout(); emit pageLayoutChanged( m_pageLayout ); updateContentsSize(); } @@ -953,10 +953,10 @@ void KWDocument::recalcFrames( int fromPage, int toPage /*-1 for all*/, uint fla if ( fromPage > toPage ) // this can happen with "endnotes only" pages :) // ### really? fromPage = toPage; // ie. start at the last real page KWFrameLayout frameLayout( this, headerFooterList, footnotesHFList, endnotesHFList ); - frameLayout.tqlayout( frameset, m_pageColumns.columns, fromPage, toPage, flags ); + frameLayout.layout( frameset, m_pageColumns.columns, fromPage, toPage, flags ); // If the number of pages changed, update views and variables etc. - // (now that the frame tqlayout has been done) + // (now that the frame layout has been done) if ( pageCount() != oldPages && !m_bGeneratingPreview ) { // Very much like the end of appendPage, but we don't want to call recalcFrames ;) @@ -1072,7 +1072,7 @@ bool KWDocument::loadOasis( const TQDomDocument& doc, KoOasisStyles& oasisStyles // In theory the page format is the style:master-page-name of the first paragraph... // But, hmm, in a doc with only a table there was no reference to the master page at all... - // So we load the standard page tqlayout to start with, and in KWTextParag + // So we load the standard page layout to start with, and in KWTextParag // we might overwrite it with another one. m_loadingInfo->m_currentMasterPage = "Standard"; if ( !loadOasisPageLayout( m_loadingInfo->m_currentMasterPage, context ) ) @@ -1133,12 +1133,12 @@ bool KWDocument::loadOasis( const TQDomDocument& doc, KoOasisStyles& oasisStyles // load padding, background and borders for the main frame const TQDomElement* masterPage = context.oasisStyles().masterPages()[ m_loadingInfo->m_currentMasterPage ]; - const TQDomElement *masterPageStyle = masterPage ? context.oasisStyles().findStyle(masterPage->attributeNS( KoXmlNS::style, "page-tqlayout-name", TQString() ) ) : 0; + const TQDomElement *masterPageStyle = masterPage ? context.oasisStyles().findStyle(masterPage->attributeNS( KoXmlNS::style, "page-layout-name", TQString() ) ) : 0; if ( masterPageStyle ) { KoStyleStack styleStack; styleStack.push( *masterPageStyle ); - styleStack.setTypeProperties( "page-tqlayout" ); + styleStack.setTypeProperties( "page-layout" ); frame->loadBorderProperties( styleStack ); } fs->renumberFootNotes( false /*no repaint*/ ); @@ -1152,7 +1152,7 @@ bool KWDocument::loadOasis( const TQDomDocument& doc, KoOasisStyles& oasisStyles const TQString localName = tag.localName(); if ( localName == "page-sequence" && tag.namespaceURI() == KoXmlNS::text ) { - // We don't have support for changing the page tqlayout yet, so just take the + // We don't have support for changing the page layout yet, so just take the // number of pages int pages=1; TQDomElement page; @@ -1205,14 +1205,14 @@ bool KWDocument::loadOasisPageLayout( const TQString& masterPageName, KoOasisCon const KoOasisStyles& oasisStyles = context.oasisStyles(); const TQDomElement* masterPage = oasisStyles.masterPages()[ masterPageName ]; Q_ASSERT( masterPage ); - const TQDomElement *masterPageStyle = masterPage ? oasisStyles.findStyle( masterPage->attributeNS( KoXmlNS::style, "page-tqlayout-name", TQString() ) ) : 0; + const TQDomElement *masterPageStyle = masterPage ? oasisStyles.findStyle( masterPage->attributeNS( KoXmlNS::style, "page-layout-name", TQString() ) ) : 0; Q_ASSERT( masterPageStyle ); if ( masterPageStyle ) { m_pageLayout.loadOasis( *masterPageStyle ); pageManager()->setDefaultPage(m_pageLayout); - const TQDomElement properties( KoDom::namedItemNS( *masterPageStyle, KoXmlNS::style, "page-tqlayout-properties" ) ); + const TQDomElement properties( KoDom::namedItemNS( *masterPageStyle, KoXmlNS::style, "page-layout-properties" ) ); const TQDomElement footnoteSep = KoDom::namedItemNS( properties, KoXmlNS::style, "footnote-sep" ); if ( !footnoteSep.isNull() ) { // style:width="0.018cm" style:distance-before-sep="0.101cm" @@ -1292,19 +1292,19 @@ bool KWDocument::loadMasterPageStyle( const TQString& masterPageName, KoOasisCon const KoOasisStyles& oasisStyles = context.oasisStyles(); const TQDomElement* masterPage = oasisStyles.masterPages()[ masterPageName ]; Q_ASSERT( masterPage ); - const TQDomElement *masterPageStyle = masterPage ? oasisStyles.findStyle( masterPage->attributeNS( KoXmlNS::style, "page-tqlayout-name", TQString() ) ) : 0; + const TQDomElement *masterPageStyle = masterPage ? oasisStyles.findStyle( masterPage->attributeNS( KoXmlNS::style, "page-layout-name", TQString() ) ) : 0; Q_ASSERT( masterPageStyle ); // This check is done here and not in loadOasisPageLayout in case the Standard master-page // has no page information but the first paragraph points to a master-page that does (#129585) if ( m_pageLayout.ptWidth <= 1e-13 || m_pageLayout.ptHeight <= 1e-13 ) { - // Loading page tqlayout failed, try to see why. - TQDomElement properties( KoDom::namedItemNS( *masterPageStyle, KoXmlNS::style, "page-tqlayout-properties" ) ); + // Loading page layout failed, try to see why. + TQDomElement properties( KoDom::namedItemNS( *masterPageStyle, KoXmlNS::style, "page-layout-properties" ) ); //if ( properties.isNull() ) - // setErrorMessage( i18n( "Invalid document. No page tqlayout properties were found. The application which produced this document isn't OASIS-compliant." ) ); + // setErrorMessage( i18n( "Invalid document. No page layout properties were found. The application which produced this document isn't OASIS-compliant." ) ); //else if ( properties.hasAttributeNS( KoXmlNS::fo, "page-width" ) ) - // setErrorMessage( i18n( "Invalid document. Page tqlayout has no page width. The application which produced this document isn't OASIS-compliant." ) ); + // setErrorMessage( i18n( "Invalid document. Page layout has no page width. The application which produced this document isn't OASIS-compliant." ) ); //else if ( properties.hasAttributeNS( "http://www.w3.org/1999/XSL/Format", "page-width" ) ) setErrorMessage( i18n( "Invalid document. 'fo' has the wrong namespace. The application which produced this document is not OASIS-compliant." ) ); @@ -2705,7 +2705,7 @@ void KWDocument::completePasting() processAnchorRequests(); if ( processFootNoteRequests() ) { - // We pasted footnotes. Retqlayout frames. + // We pasted footnotes. Relayout frames. recalcFrames(); } @@ -2837,7 +2837,7 @@ bool KWDocument::saveOasisHelper( KoStore* store, KoXmlWriter* manifestWriter, S } // Header and footers save their content into master-styles/master-page, and their - // styles into the page-tqlayout automatic-style. + // styles into the page-layout automatic-style. // However the paragraph styles used by header/footers need to be known before // hand, to promote them to styles.xml. So we collect them first, which means // storing the content into a buffer. @@ -3251,8 +3251,8 @@ void KWDocument::saveOasisDocumentStyles( KoStore* store, KoGenStyles& mainStyle // if there's more than one pagemaster we need to rethink all this pageLayoutName = mainStyles.lookup( pageLayout, "pm" ); - pageLayout.writeStyle( stylesWriter, mainStyles, "style:page-tqlayout", pageLayoutName, - "style:page-tqlayout-properties", false /*don't close*/ ); + pageLayout.writeStyle( stylesWriter, mainStyles, "style:page-layout", pageLayoutName, + "style:page-layout-properties", false /*don't close*/ ); // Ouch another problem: there is only one header style in oasis // ##### can't have different borders for even/odd headers... @@ -3301,7 +3301,7 @@ void KWDocument::saveOasisDocumentStyles( KoStore* store, KoGenStyles& mainStyle stylesWriter->endElement(); // header-style } } - stylesWriter->endElement(); // style:page-tqlayout + stylesWriter->endElement(); // style:page-layout // Headers and footers might have created new automatic parag/text styles -> save those KWOasisSaver::writeAutomaticStyles( *stylesWriter, mainStyles, true ); @@ -3313,7 +3313,7 @@ void KWDocument::saveOasisDocumentStyles( KoStore* store, KoGenStyles& mainStyle 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 ); if ( isHeaderVisible() || isFooterVisible() ) { // ### TODO save them even when hidden (and not empty)? stylesWriter->addCompleteElement( headerFooterContent.data() ); @@ -3779,7 +3779,7 @@ void KWDocument::paintContent( TQPainter& painter, const TQRect& rectangle, bool viewMode->setDrawFrameBackground( !transparent ); viewMode->setDrawSelections( false ); - TQColorGroup cg = TQApplication::tqpalette().active(); + TQColorGroup cg = TQApplication::palette().active(); if (!transparent) { @@ -3810,7 +3810,7 @@ TQPixmap KWDocument::generatePreview( const TQSize& size ) double oldZoomX = zoomedResolutionX(); double oldZoomY = zoomedResolutionY(); - // Sometimes (due to the different resolution?) the tqlayout creates a new page + // Sometimes (due to the different resolution?) the layout creates a new page // while saving the preview. If this happens, we don't want to repaint the real views // (due to KWCanvas::slotNewContentsSize) // ##### One day when we have real doc/view separation in kotextparag, we shouldn't mess with @@ -4364,7 +4364,7 @@ void KWDocument::setHeaderVisible( bool h ) m_headerVisible = h; recalcFrames(); updateAllFrames(); - tqlayout(); + layout(); setModified(true); repaintAllViews( true ); } @@ -4374,7 +4374,7 @@ void KWDocument::setFooterVisible( bool f ) m_footerVisible = f; recalcFrames(); updateAllFrames(); - tqlayout(); + layout(); setModified(true); repaintAllViews( true ); } @@ -4457,9 +4457,9 @@ void KWDocument::setMailMergeRecord( int r ) slRecordNum = r; } -void KWDocument::getPageLayout( KoPageLayout& tqlayout, KoColumns& cl, KoKWHeaderFooter& hf ) +void KWDocument::getPageLayout( KoPageLayout& layout, KoColumns& cl, KoKWHeaderFooter& hf ) { - tqlayout = m_pageLayout; + layout = m_pageLayout; cl = m_pageColumns; hf = m_pageHeaderFooter; } @@ -4560,12 +4560,12 @@ void KWDocument::printDebug() } #endif -void KWDocument::tqlayout() +void KWDocument::layout() { TQPtrListIterator<KWFrameSet> it = framesetsIterator(); for (; it.current(); ++it ) if ( it.current()->isVisible() ) - it.current()->tqlayout(); + it.current()->layout(); } void KWDocument::invalidate(const KWFrameSet *skipThisFrameSet) @@ -5083,7 +5083,7 @@ void KWDocument::setTabStopValue ( double tabStop ) KWTextFrameSet *frm; for ( frm=textFramesets.first(); frm != 0; frm=textFramesets.next() ){ frm->textDocument()->setTabStops( ptToLayoutUnitPixX( tabStop )); - frm->tqlayout(); + frm->layout(); } repaintAllViews(); } @@ -5120,11 +5120,11 @@ void KWDocument::switchViewMode( const TQString& newViewModeType ) (*it)->switchModeView(); emit newContentsSize(); - // Since the text tqlayout depends on the view mode, we need to redo it + // Since the text layout depends on the view mode, we need to redo it // But after telling the canvas about the new viewmode, otherwise stuff like // slotNewContentsSize will crash. updateAllFrames(); - tqlayout(); + layout(); repaintAllViews( true ); for( TQValueList<KWView *>::Iterator it = m_lstViews.begin(); it != m_lstViews.end(); ++it ) @@ -5466,15 +5466,15 @@ void KWDocument::FramesChangedHandler::execute() { KWFrameSet *fs = *iter; fs->updateFrames(); if(!m_needLayout) - fs->tqlayout(); + fs->layout(); } KWFrameList::recalcAllFrames(m_parent); } - // If frame with text flowing around it -> re-tqlayout all frames + // If frame with text flowing around it -> re-layout all frames if ( m_needLayout) - m_parent->tqlayout(); + m_parent->layout(); //m_parent->repaintAllViewsExcept( 0 ); m_parent->repaintAllViews(); m_parent->updateRulerFrameStartEnd(); diff --git a/kword/KWDocument.h b/kword/KWDocument.h index 26cfe37a..1a9aa16e 100644 --- a/kword/KWDocument.h +++ b/kword/KWDocument.h @@ -214,9 +214,9 @@ public: /// because KoDocument:insertChild is protected. KWDocumentChild* createChildDoc( const KoRect& rect, KoDocument* childDoc ); - void setPageLayout( const KoPageLayout& tqlayout, const KoColumns& cl, const KoKWHeaderFooter& hf, bool updateViews = true ); + void setPageLayout( const KoPageLayout& layout, const KoColumns& cl, const KoKWHeaderFooter& hf, bool updateViews = true ); - void getPageLayout( KoPageLayout& tqlayout, KoColumns& cl, KoKWHeaderFooter& hf ); + void getPageLayout( KoPageLayout& layout, KoColumns& cl, KoKWHeaderFooter& hf ); KWTextFrameSet * textFrameSet ( unsigned int num ) const; /// Return the frameset number @p num @@ -273,7 +273,7 @@ public: void delayedRepaintAllViews(); /** - * schedule a frame tqlayout (e.g. for footnotes) but don't execute immediately + * schedule a frame layout (e.g. for footnotes) but don't execute immediately */ void delayedRecalcFrames( int fromPage ); @@ -437,7 +437,7 @@ public: //int applyStyleChangeMask() { return styleMask; } //void setApplyStyleChangeMask( int f ) { styleMask = f; } - // paragLayoutChanged is a set of flags for the parag tqlayout - see the enum in KWParagLayout + // paragLayoutChanged is a set of flags for the parag layout - see the enum in KWParagLayout // formatChanged is a set of flags from KoTextFormat // If both are -1, it means the style has been deleted. void applyStyleChange( KoStyleChangeDefMap changed ); @@ -519,7 +519,7 @@ public: void newZoomAndResolution( bool updateViews, bool forPrint ); /** - * Due to the way the text formatter works (it caches tqlayout information in + * Due to the way the text formatter works (it caches layout information in * the paragraphs and characters), we currently can't have one viewmode per view. * It has to be the same for all views. */ @@ -565,8 +565,8 @@ public: void printDebug(); #endif - /** calls tqlayout() on all framesets */ - void tqlayout(); + /** calls layout() on all framesets */ + void layout(); // This settings has to be here [instead of KWView] because we need to // format paragraphs slightly differently (to add room for the CR char) @@ -764,7 +764,7 @@ public: KWBgSpellCheck* backSpeller() const { return m_bgSpellCheck; } - /// Load the given page tqlayout; public for KWTextParag + /// Load the given page layout; public for KWTextParag bool loadOasisPageLayout( const TQString& masterPageName, KoOasisContext& context ); // end of public methods @@ -773,7 +773,7 @@ signals: /// This is emitted by setPageLayout if updateViews=true void pageLayoutChanged( const KoPageLayout& ); - /// Emitted when the scrollview contents must be resized (e.g. new page, new tqlayout...) + /// Emitted when the scrollview contents must be resized (e.g. new page, new layout...) void newContentsSize(); /** This is emitted when the height of the text in the main frameset changes diff --git a/kword/KWEditPersonnalExpression.cpp b/kword/KWEditPersonnalExpression.cpp index 281bf033..4a870af7 100644 --- a/kword/KWEditPersonnalExpression.cpp +++ b/kword/KWEditPersonnalExpression.cpp @@ -40,23 +40,23 @@ KWEditPersonnalExpression::KWEditPersonnalExpression( TQWidget *parent, const ch setMainWidget(page); TQGridLayout* form1Layout = new TQGridLayout( page, 1, 1, 0, KDialog::spacingHint(), "form1Layout"); - TQHBoxLayout *hortqlayout1 = new TQHBoxLayout( 0, 0, KDialog::spacingHint(), "hortqlayout1"); + TQHBoxLayout *horlayout1 = new TQHBoxLayout( 0, 0, KDialog::spacingHint(), "horlayout1"); TQLabel *groupnameLabel = new TQLabel(i18n("Group name:"), page, "groupnameLabel" ); - hortqlayout1->addWidget( groupnameLabel ); + horlayout1->addWidget( groupnameLabel ); m_groupLineEdit = new TQLineEdit( page, "groupLineEdit" ); - hortqlayout1->addWidget( m_groupLineEdit ); + horlayout1->addWidget( m_groupLineEdit ); - form1Layout->addLayout( hortqlayout1, 0, 1 ); + form1Layout->addLayout( horlayout1, 0, 1 ); TQGroupBox *expressionGroupBox = new TQGroupBox( page, "expressionGroupBox" ); expressionGroupBox->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 1, 0, expressionGroupBox->sizePolicy().hasHeightForWidth() ) ); expressionGroupBox->setTitle( i18n( "Expressions" ) ); expressionGroupBox->setColumnLayout(0, Qt::Vertical ); - expressionGroupBox->tqlayout()->setSpacing( KDialog::spacingHint() ); - expressionGroupBox->tqlayout()->setMargin( KDialog::marginHint() ); - TQVBoxLayout *expressionGroupBoxLayout = new TQVBoxLayout( expressionGroupBox->tqlayout() ); + expressionGroupBox->layout()->setSpacing( KDialog::spacingHint() ); + expressionGroupBox->layout()->setMargin( KDialog::marginHint() ); + TQVBoxLayout *expressionGroupBoxLayout = new TQVBoxLayout( expressionGroupBox->layout() ); expressionGroupBoxLayout->setAlignment( TQt::AlignTop ); m_ExpressionsList = new TQListBox( expressionGroupBox, "listOfExpressions" ); @@ -66,36 +66,36 @@ KWEditPersonnalExpression::KWEditPersonnalExpression( TQWidget *parent, const ch m_expressionLineEdit = new TQLineEdit( expressionGroupBox, "expressionLineEdit" ); expressionGroupBoxLayout->addWidget( m_expressionLineEdit ); - TQHBoxLayout *hortqlayout2 = new TQHBoxLayout( 0, 0, KDialog::spacingHint(), "hortqlayout2"); + TQHBoxLayout *horlayout2 = new TQHBoxLayout( 0, 0, KDialog::spacingHint(), "horlayout2"); TQSpacerItem* spacer = new TQSpacerItem( 0, 0, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); - hortqlayout2->addItem( spacer ); + horlayout2->addItem( spacer ); m_addExpression = new TQPushButton( i18n("&New"), expressionGroupBox, "m_addExpression" ); - hortqlayout2->addWidget( m_addExpression ); + horlayout2->addWidget( m_addExpression ); m_delExpression = new TQPushButton( i18n("&Delete"), expressionGroupBox, "m_delExpression" ); - hortqlayout2->addWidget( m_delExpression ); - expressionGroupBoxLayout->addLayout( hortqlayout2 ); + horlayout2->addWidget( m_delExpression ); + expressionGroupBoxLayout->addLayout( horlayout2 ); form1Layout->addWidget( expressionGroupBox, 1, 1 ); - TQVBoxLayout *verttqlayout = new TQVBoxLayout( 0, 0, KDialog::spacingHint(), "verttqlayout"); + TQVBoxLayout *vertlayout = new TQVBoxLayout( 0, 0, KDialog::spacingHint(), "vertlayout"); m_groupList = new TQListBox( page, "groupList" ); m_groupList->insertItem( "group1" ); m_groupList->setMaximumSize( TQSize( 200, 32767 ) ); - verttqlayout->addWidget( m_groupList ); + vertlayout->addWidget( m_groupList ); - TQHBoxLayout *hortqlayout3 = new TQHBoxLayout( 0, 0, KDialog::spacingHint(), "hortqlayout3"); + TQHBoxLayout *horlayout3 = new TQHBoxLayout( 0, 0, KDialog::spacingHint(), "horlayout3"); m_addGroup = new TQPushButton( i18n("New"), page, "m_addGroup" ); - hortqlayout3->addWidget( m_addGroup ); + horlayout3->addWidget( m_addGroup ); m_delGroup = new TQPushButton(i18n("Delete"), page, "m_delGroup" ); - hortqlayout3->addWidget( m_delGroup ); - verttqlayout->addLayout( hortqlayout3 ); + horlayout3->addWidget( m_delGroup ); + vertlayout->addLayout( horlayout3 ); - form1Layout->addMultiCellLayout( verttqlayout, 0, 1, 0, 0 ); + form1Layout->addMultiCellLayout( vertlayout, 0, 1, 0, 0 ); loadFile(); if(listExpression.count() == 0) diff --git a/kword/KWFormulaFrameSet.cpp b/kword/KWFormulaFrameSet.cpp index f8d597e8..f54942a4 100644 --- a/kword/KWFormulaFrameSet.cpp +++ b/kword/KWFormulaFrameSet.cpp @@ -219,7 +219,7 @@ void KWFormulaFrameSet::slotFormulaChanged( double width, double height ) m_frames.first()->setHeight( height ); updateFrames(); - kWordDocument()->tqlayout(); + kWordDocument()->layout(); if ( ( oldWidth != width ) || ( oldHeight != height ) ) { kWordDocument()->repaintAllViews( false ); kWordDocument()->updateRulerFrameStartEnd(); diff --git a/kword/KWFrame.h b/kword/KWFrame.h index 88552259..76e17da2 100644 --- a/kword/KWFrame.h +++ b/kword/KWFrame.h @@ -221,7 +221,7 @@ public: /** The "internal Y" is the offset (in pt) of the real frame showed in this one * ("real" means "the last that isn't a copy") * This offset in pt is the sum of the height of the frames before that one. - * For text frames, this is equivalent to the tqlayout units (after multiplication). */ + * For text frames, this is equivalent to the layout units (after multiplication). */ void setInternalY( double y ) { m_internalY = y; } double internalY() const { return m_internalY; } diff --git a/kword/KWFrameDia.cpp b/kword/KWFrameDia.cpp index ba6f6276..6c7fa4b2 100644 --- a/kword/KWFrameDia.cpp +++ b/kword/KWFrameDia.cpp @@ -614,8 +614,8 @@ void KWFrameDia::setupTab2() { // TAB Text Runaround // First groupbox m_runGroup = new TQButtonGroup( i18n( "Layout of Text in Other Frames" ), m_tab2); m_runGroup->setColumnLayout( 0, Qt::Vertical ); - m_runGroup->tqlayout()->setSpacing( KDialog::spacingHint() ); - TQGridLayout *groupBox1Layout = new TQGridLayout( m_runGroup->tqlayout() ); + m_runGroup->layout()->setSpacing( KDialog::spacingHint() ); + TQGridLayout *groupBox1Layout = new TQGridLayout( m_runGroup->layout() ); groupBox1Layout->setAlignment( TQt::AlignTop ); m_rRunNo = new TQRadioButton( i18n( "Text will run &through this frame" ), m_runGroup ); @@ -650,9 +650,9 @@ void KWFrameDia::setupTab2() { // TAB Text Runaround // Second groupbox m_runSideGroup = new TQButtonGroup( i18n( "Run Around Side" ), m_tab2); m_runSideGroup->setColumnLayout( 0, Qt::Vertical ); - m_runSideGroup->tqlayout()->setSpacing( KDialog::spacingHint() ); - m_runSideGroup->tqlayout()->setMargin( KDialog::marginHint() ); - TQGridLayout *runSideLayout = new TQGridLayout( m_runSideGroup->tqlayout() ); + m_runSideGroup->layout()->setSpacing( KDialog::spacingHint() ); + m_runSideGroup->layout()->setMargin( KDialog::marginHint() ); + TQGridLayout *runSideLayout = new TQGridLayout( m_runSideGroup->layout() ); runSideLayout->setAlignment( TQt::AlignTop ); m_rRunLeft = new TQRadioButton( i18n( "Run Around", "&Left" ), m_runSideGroup ); @@ -803,9 +803,9 @@ void KWFrameDia::setupTab3(){ // TAB Frameset myGroup->insert(m_rExistingFrameset,1); connect (m_rExistingFrameset, TQT_SIGNAL( toggled(bool)), this, TQT_SLOT(ensureValidFramesetSelected())); - TQHBoxLayout *tqlayout2 = new TQHBoxLayout( 0, 0, 6); + TQHBoxLayout *layout2 = new TQHBoxLayout( 0, 0, 6); TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); - tqlayout2->addItem( spacer ); + layout2->addItem( spacer ); m_lFrameSList = new TQListView( m_tab3, "m_lFrameSList" ); m_lFrameSList->addColumn( i18n("No.") ); @@ -815,8 +815,8 @@ void KWFrameDia::setupTab3(){ // TAB Frameset connect( m_lFrameSList, TQT_SIGNAL(selectionChanged ()),this,TQT_SLOT(selectExistingFrameset ()) ); connect (m_lFrameSList, TQT_SIGNAL( selectionChanged()), this, TQT_SLOT(ensureValidFramesetSelected())); - tqlayout2->addWidget( m_lFrameSList ); - tabLayout->addLayout( tqlayout2 ); + layout2->addWidget( m_lFrameSList ); + tabLayout->addLayout( layout2 ); m_rNewFrameset = new TQRadioButton( m_tab3); m_rNewFrameset->setText( i18n( "Create a new frameset" ) ); @@ -829,14 +829,14 @@ void KWFrameDia::setupTab3(){ // TAB Frameset line1->setFrameShape( TQFrame::HLine ); tabLayout->addWidget( line1 ); - TQHBoxLayout *tqlayout1 = new TQHBoxLayout( 0, 0, 6 ); + TQHBoxLayout *layout1 = new TQHBoxLayout( 0, 0, 6 ); TQLabel *textLabel1 = new TQLabel( m_tab3 ); textLabel1->setText( i18n( "Name of frameset:" ) ); - tqlayout1->addWidget( textLabel1 ); + layout1->addWidget( textLabel1 ); m_eFrameSetName = new TQLineEdit( m_tab3 ); - tqlayout1->addWidget( m_eFrameSetName ); - tabLayout->addLayout( tqlayout1 ); + layout1->addWidget( m_eFrameSetName ); + tabLayout->addLayout( layout1 ); int amount=0; // now fill the gui. @@ -1290,10 +1290,10 @@ void KWFrameDia::setupTab6() // Border style TQGroupBox *grp=new TQGroupBox( 0, Qt::Vertical, i18n( "Preview" ), m_tab6, "previewgrp" ); grid->addMultiCellWidget( grp , 0, 7, 1, 1 ); - grp->tqlayout()->setSpacing(KDialog::spacingHint()); - grp->tqlayout()->setMargin(KDialog::marginHint()); + grp->layout()->setSpacing(KDialog::spacingHint()); + grp->layout()->setMargin(KDialog::marginHint()); m_prev3 = new KoBorderPreview( grp ); - TQVBoxLayout *lay1 = new TQVBoxLayout( grp->tqlayout() ); + TQVBoxLayout *lay1 = new TQVBoxLayout( grp->layout() ); lay1->addWidget(m_prev3); connect( m_prev3, TQT_SIGNAL( choosearea(TQMouseEvent * ) ), @@ -2330,7 +2330,7 @@ bool KWFrameDia::applyChanges() void KWFrameDia::updateFrames() { m_doc->updateAllFrames(); - m_doc->tqlayout(); + m_doc->layout(); m_doc->repaintAllViews(); } diff --git a/kword/KWFrameLayout.cpp b/kword/KWFrameLayout.cpp index 685f81e6..8db6227a 100644 --- a/kword/KWFrameLayout.cpp +++ b/kword/KWFrameLayout.cpp @@ -38,7 +38,7 @@ KWFrameLayout::HeaderFooterFrameset::HeaderFooterFrameset( KWTextFrameSet* fs, i if ( fs->frameCount() > 0 ) m_height = fs->frame(0)->height(); else - m_height = 20; // whatever. The text tqlayout will resize it. + m_height = 20; // whatever. The text layout will resize it. Q_ASSERT( m_height > 0 ); } @@ -129,13 +129,13 @@ int KWFrameLayout::HeaderFooterFrameset::frameNumberForPage( int page ) const ///// -void KWFrameLayout::tqlayout( KWFrameSet* mainTextFrameSet, int numColumns, +void KWFrameLayout::layout( KWFrameSet* mainTextFrameSet, int numColumns, int fromPage, int toPage, uint flags ) { - //kdDebug(32002) << "KWFrameLayout::tqlayout " << kdBacktrace() << endl; + //kdDebug(32002) << "KWFrameLayout::layout " << kdBacktrace() << endl; // Just debug stuff #ifdef DEBUG_FRAMELAYOUT - kdDebug(32002) << "KWFrameLayout::tqlayout " << fromPage << " to " << toPage << endl; + kdDebug(32002) << "KWFrameLayout::layout " << fromPage << " to " << toPage << endl; Q_ASSERT( toPage >= fromPage ); TQPtrListIterator<HeaderFooterFrameset> itdbg( m_headersFooters ); for ( ; itdbg.current() ; ++itdbg ) @@ -493,8 +493,8 @@ void KWFrameLayout::tqlayout( KWFrameSet* mainTextFrameSet, int numColumns, // Not right now, this could be called during formatting... //m_doc->invalidate(); - // ### This means the tqlayout will be done during painting. Not good. - // What about mainTextFrameSet->invalidate() or even tqlayout()? + // ### This means the layout will be done during painting. Not good. + // What about mainTextFrameSet->invalidate() or even layout()? //TQTimer::singleShot( 0, m_doc, TQT_SLOT( invalidate() ) ); // Invalidate main textframeset only, and from top of page only. @@ -549,8 +549,8 @@ void KWFrameLayout::resizeOrCreateHeaderFooter( KWTextFrameSet* headerFooter, ui m_framesetsToUpdate.insert( headerFooter, true ); } -// Called at beginning and end of the tqlayout for a given page, -// to determine if the main-text-frame tqlayout really changed or not. +// Called at beginning and end of the layout for a given page, +// to determine if the main-text-frame layout really changed or not. // Testing in resizeMainTextFrame doesn't work, we call it several times, // once for each footnote, so it can't detect the "no change" case. KoRect KWFrameLayout::firstColumnRect( KWFrameSet* mainTextFrameSet, int pageNum, int numColumns ) const diff --git a/kword/KWFrameLayout.h b/kword/KWFrameLayout.h index 18089ee5..c4b3f7eb 100644 --- a/kword/KWFrameLayout.h +++ b/kword/KWFrameLayout.h @@ -68,7 +68,7 @@ public: // frame number for the given page.... -1 if no frame on that page // The first frame is number 0. int frameNumberForPage( int page ) const; - // The last frame we need (0-based), tqlayout() will delete any frame after that + // The last frame we need (0-based), layout() will delete any frame after that int lastFrameNumber( int lastPage ) const; void debug(); @@ -89,14 +89,14 @@ public: enum { DontRemovePages = 1 }; /** - * The main method of this file. Do the frame tqlayout. + * The main method of this file. Do the frame layout. * @param mainTextFrameSet if set, its frames will be resized. Usually: set in WP mode, not set in DTP mode. * @param numColumns number of columns to create for the main textframeset. Only relevant if mainTextFrameSet!=0. - * @param fromPage first page to tqlayout ( 0-based ) - * @param toPage last page to tqlayout ( 0-based ) + * @param fromPage first page to layout ( 0-based ) + * @param toPage last page to layout ( 0-based ) * @param flags see enum above */ - void tqlayout( KWFrameSet* mainTextFrameSet, int numColumns, + void layout( KWFrameSet* mainTextFrameSet, int numColumns, int fromPage, int toPage, uint flags ); protected: diff --git a/kword/KWFrameSet.cpp b/kword/KWFrameSet.cpp index 9a1d43ba..ec5cf7db 100644 --- a/kword/KWFrameSet.cpp +++ b/kword/KWFrameSet.cpp @@ -292,7 +292,7 @@ void KWFrameSet::setFloating() frameSet->findPosition( dPoint, parag, index ); // Create anchor. TODO: refcount the anchors! setAnchored( frameSet, parag, index ); - frameSet->tqlayout(); + frameSet->layout(); m_doc->frameChanged( m_frames.first() ); return; } diff --git a/kword/KWFrameSet.h b/kword/KWFrameSet.h index 50294045..67cad0da 100644 --- a/kword/KWFrameSet.h +++ b/kword/KWFrameSet.h @@ -310,8 +310,8 @@ public: /** Allows to detect that updateFrames() hasn't been called yet (e.g. on loading) */ bool hasFramesInPageArray() const { return !m_framesInPage.isEmpty(); } - /** retqlayout text in frames, so that it flows correctly around other frames */ - virtual void tqlayout() {} + /** relayout text in frames, so that it flows correctly around other frames */ + virtual void layout() {} virtual void invalidate() {} /// save to XML - when saving diff --git a/kword/KWFrameStyleManager.cpp b/kword/KWFrameStyleManager.cpp index 19ad2b00..b9ccbe16 100644 --- a/kword/KWFrameStyleManager.cpp +++ b/kword/KWFrameStyleManager.cpp @@ -235,9 +235,9 @@ void KWFrameStyleManager::addGeneralTab() tabLayout->setMargin( KDialog::marginHint() ); previewBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Preview" ), tab ); - previewBox->tqlayout()->setSpacing(KDialog::spacingHint()); - previewBox->tqlayout()->setMargin(KDialog::marginHint()); - TQGridLayout *previewLayout = new TQGridLayout( previewBox->tqlayout() ); + previewBox->layout()->setSpacing(KDialog::spacingHint()); + previewBox->layout()->setMargin(KDialog::marginHint()); + TQGridLayout *previewLayout = new TQGridLayout( previewBox->layout() ); preview = new KWFrameStylePreview( previewBox ); preview->resize(preview->sizeHint()); diff --git a/kword/KWImportStyleDia.cpp b/kword/KWImportStyleDia.cpp index 1b2666df..93ec0334 100644 --- a/kword/KWImportStyleDia.cpp +++ b/kword/KWImportStyleDia.cpp @@ -99,7 +99,7 @@ void KWImportStyleDia::loadFile() TQDomElement styleElem = listStyles.item( item ).toElement(); KoParagStyle *sty = new KoParagStyle( TQString() ); - // Load the paragtqlayout from the <STYLE> element + // Load the paraglayout from the <STYLE> element sty->loadStyle( styleElem, m_doc->syntaxVersion() ); //#### wrong syntaxVersion! TQString name = sty->displayName(); diff --git a/kword/KWInsertPageDia.cpp b/kword/KWInsertPageDia.cpp index 28d0cd34..42ca6b22 100644 --- a/kword/KWInsertPageDia.cpp +++ b/kword/KWInsertPageDia.cpp @@ -34,7 +34,7 @@ KWInsertPageDia::KWInsertPageDia( TQWidget *parent, const char* name ) TQButtonGroup *grp = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Insert Page" ),page ); grp->setRadioButtonExclusive( TRUE ); - grp->tqlayout(); + grp->layout(); m_after = new TQRadioButton( i18n("After"), grp ); m_before = new TQRadioButton( i18n("Before"), grp ); diff --git a/kword/KWInsertTOCCommand.cpp b/kword/KWInsertTOCCommand.cpp index 33cb2399..ebf6c480 100644 --- a/kword/KWInsertTOCCommand.cpp +++ b/kword/KWInsertTOCCommand.cpp @@ -80,7 +80,7 @@ KoTextCursor * KWInsertTOCCommand::execute( KoTextCursor *c ) prevTOCParag->setPageBreaking( prevTOCParag->pageBreaking() | KWParagLayout::HardFrameBreakAfter ); // Format paragraphs, to take this page break into account and update page numbers - fs->tqlayout(); + fs->layout(); fs->updateFrames(); //kdDebug() << "KWInsertTOCCommand::execute layouting done, setting page numbers" << endl; diff --git a/kword/KWMailMergeDataBase.cpp b/kword/KWMailMergeDataBase.cpp index 9ee21416..b2e2bc73 100644 --- a/kword/KWMailMergeDataBase.cpp +++ b/kword/KWMailMergeDataBase.cpp @@ -329,7 +329,7 @@ KWMailMergeChoosePluginDialog::KWMailMergeChoosePluginDialog( KTrader::OfferList /*parent*/ 0, "", true ), pluginOffers( offers ) { TQWidget *back = plainPage(); - TQVBoxLayout *tqlayout = new TQVBoxLayout( back, 0, spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( back, 0, spacingHint() ); TQLabel *label = new TQLabel( i18n( "&Available sources:" ), back ); chooser = new TQComboBox( false, back ); @@ -354,10 +354,10 @@ KWMailMergeChoosePluginDialog::KWMailMergeChoosePluginDialog( KTrader::OfferList connect( chooser, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( pluginChanged( int ) ) ); - tqlayout->addWidget( label ); - tqlayout->addWidget( chooser ); - tqlayout->addWidget( descriptionLabel ); - tqlayout->addStretch( 1 ); + layout->addWidget( label ); + layout->addWidget( chooser ); + layout->addWidget( descriptionLabel ); + layout->addStretch( 1 ); pluginChanged( 0 ); } @@ -387,41 +387,41 @@ KWMailMergeConfigDialog::KWMailMergeConfigDialog(TQWidget *parent,KWMailMergeDat { db_=db; TQWidget *back = plainPage(); - TQVBoxLayout *tqlayout=new TQVBoxLayout(back); + TQVBoxLayout *layout=new TQVBoxLayout(back); // TQVBox *back = new TQVBox( page ); - tqlayout->setSpacing( KDialog::spacingHint() ); + layout->setSpacing( KDialog::spacingHint() ); // TQVBox *row1 = new TQVBox( back ); // row1->setSpacing( KDialog::spacingHint() ); TQLabel *l = new TQLabel( i18n( "Datasource:" ),back ); // l->setMaximumHeight( l->sizeHint().height() ); - tqlayout->addWidget(l); + layout->addWidget(l); TQHBox *row1=new TQHBox(back); - tqlayout->addWidget(row1); + layout->addWidget(row1); row1->setSpacing( KDialog::spacingHint() ); edit=new TQPushButton(i18n("Edit Current..."),row1); create=new TQPushButton(i18n("Create New..."),row1); open=new TQPushButton(i18n("Open Existing..."),row1); KSeparator *separator1 = new KSeparator(back); - tqlayout->addWidget(separator1); + layout->addWidget(separator1); l = new TQLabel( i18n( "Merging:" ),back ); - tqlayout->addWidget(l); + layout->addWidget(l); // l->setMaximumHeight( l->sizeHint().height() ); TQHBox *row2=new TQHBox(back); - tqlayout->addWidget(row2); + layout->addWidget(row2); row2->setSpacing( KDialog::spacingHint() ); preview=new TQPushButton(i18n("Print Preview..."),row2); document=new TQPushButton(i18n("Create New Document"),row2); document->hide(); (void) new TQWidget(row2); - tqlayout->addStretch(); + layout->addStretch(); KSeparator *separator2 = new KSeparator(back); - tqlayout->addWidget(separator2); + layout->addWidget(separator2); enableDisableEdit(); @@ -516,8 +516,8 @@ KWMailMergeVariableInsertDia::KWMailMergeVariableInsertDia( TQWidget *parent, KW m_db=db; TQWidget *page = plainPage(); - TQVBoxLayout *tqlayout = new TQVBoxLayout( page, marginHint(), spacingHint() ); - tqlayout->setAutoAdd( true ); + TQVBoxLayout *layout = new TQVBoxLayout( page, marginHint(), spacingHint() ); + layout->setAutoAdd( true ); TQLabel *l = new TQLabel( i18n( "Name:" ), page ); l->setMaximumHeight( l->sizeHint().height() ); diff --git a/kword/KWMailMergeLabelAction.cpp b/kword/KWMailMergeLabelAction.cpp index facb6e9d..1487da45 100644 --- a/kword/KWMailMergeLabelAction.cpp +++ b/kword/KWMailMergeLabelAction.cpp @@ -72,10 +72,10 @@ protected: void drawButton( TQPainter * p ) { // Draw the background - tqstyle().drawComplexControl( TQStyle::CC_ToolButton, p, this, rect(), colorGroup(), + style().drawComplexControl( TQStyle::CC_ToolButton, p, this, rect(), colorGroup(), TQStyle::Style_Enabled, TQStyle::SC_ToolButton ); // Draw the label - tqstyle().drawControl( TQStyle::CE_ToolButtonLabel, p, this, rect(), colorGroup(), + style().drawControl( TQStyle::CE_ToolButtonLabel, p, this, rect(), colorGroup(), TQStyle::Style_Enabled ); } void enterEvent( TQEvent* ) {}; diff --git a/kword/KWOasisLoader.cpp b/kword/KWOasisLoader.cpp index 42d72b5e..daaa8502 100644 --- a/kword/KWOasisLoader.cpp +++ b/kword/KWOasisLoader.cpp @@ -182,7 +182,7 @@ static KWFrameSet::Info headerTypeToFrameInfo( const TQString& localName, bool / return KWFrameSet::FI_EVEN_FOOTER; // ######## KWord extension, because I'm too lazy. - // TODO: the real solution is a separate page tqlayout for the first page. + // TODO: the real solution is a separate page layout for the first page. if ( localName == "header-first" ) // NOT OASIS COMPLIANT return KWFrameSet::FI_FIRST_HEADER; if ( localName == "footer-first" ) // NOT OASIS COMPLIANT diff --git a/kword/KWPageManager.cpp b/kword/KWPageManager.cpp index 9dc797a6..e13d4099 100644 --- a/kword/KWPageManager.cpp +++ b/kword/KWPageManager.cpp @@ -196,8 +196,8 @@ void KWPageManager::removePage(KWPage *page) { m_pageList.remove(page); } -void KWPageManager::setDefaultPage(const KoPageLayout &tqlayout) { - m_defaultPageLayout = tqlayout; +void KWPageManager::setDefaultPage(const KoPageLayout &layout) { + m_defaultPageLayout = layout; // make sure we have 1 default, either pageBound or left/right bound. if(m_defaultPageLayout.ptLeft < 0 || m_defaultPageLayout.ptRight < 0) { m_defaultPageLayout.ptLeft = -1; diff --git a/kword/KWPageManager.h b/kword/KWPageManager.h index 869a68f3..8f09b577 100644 --- a/kword/KWPageManager.h +++ b/kword/KWPageManager.h @@ -111,7 +111,7 @@ public: /// return the effective pageLayout of @p pageNumber combining the default and the page specific ones const KoPageLayout pageLayout(int pageNumber) const; - void setDefaultPage(const KoPageLayout &tqlayout); + void setDefaultPage(const KoPageLayout &layout); /** * Returns the argument point, with altered coordinats if the point happens to be diff --git a/kword/KWSortDia.cpp b/kword/KWSortDia.cpp index 047dcf93..fe1f2c7f 100644 --- a/kword/KWSortDia.cpp +++ b/kword/KWSortDia.cpp @@ -34,7 +34,7 @@ KWSortDia::KWSortDia( TQWidget *parent, const char* name ) TQButtonGroup *grp = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Sort" ),page ); grp->setRadioButtonExclusive( TRUE ); - grp->tqlayout(); + grp->layout(); m_increase = new TQRadioButton( i18n("Increase"), grp ); m_decrease = new TQRadioButton( i18n("Decrease"), grp ); diff --git a/kword/KWStartupWidget.cpp b/kword/KWStartupWidget.cpp index 60dab02b..0499a427 100644 --- a/kword/KWStartupWidget.cpp +++ b/kword/KWStartupWidget.cpp @@ -55,9 +55,9 @@ KWStartupWidget::KWStartupWidget(TQWidget *parent, KWDocument *doc, const KoColu connect (m_WpStyleCheckbox, TQT_SIGNAL(toggled(bool)), m_columnsWidget, TQT_SLOT(setEnableColumns(bool))); } -void KWStartupWidget::sizeUpdated(KoPageLayout &tqlayout) { - m_layout = tqlayout; - m_columnsWidget->setLayout(tqlayout); +void KWStartupWidget::sizeUpdated(KoPageLayout &layout) { + m_layout = layout; + m_columnsWidget->setLayout(layout); } void KWStartupWidget::columnsUpdated(KoColumns &columns) { diff --git a/kword/KWStartupWidget.h b/kword/KWStartupWidget.h index 8202488c..22460eed 100644 --- a/kword/KWStartupWidget.h +++ b/kword/KWStartupWidget.h @@ -43,7 +43,7 @@ public: KWStartupWidget(TQWidget *parent, KWDocument *doc, const KoColumns &columns); private slots: - void sizeUpdated(KoPageLayout &tqlayout); + void sizeUpdated(KoPageLayout &layout); void columnsUpdated(KoColumns &columns); void buttonClicked(); diff --git a/kword/KWTableFrameSet.cpp b/kword/KWTableFrameSet.cpp index 2c27dc04..902d5a78 100644 --- a/kword/KWTableFrameSet.cpp +++ b/kword/KWTableFrameSet.cpp @@ -2183,10 +2183,10 @@ void KWTableFrameSet::finalize( ) { KWFrameSet::finalize(); } -void KWTableFrameSet::tqlayout() +void KWTableFrameSet::layout() { for (TableIter cells(this) ; cells ; ++cells) - cells->tqlayout(); + cells->layout(); } void KWTableFrameSet::invalidate() diff --git a/kword/KWTableFrameSet.h b/kword/KWTableFrameSet.h index f2a5803c..d5fdea1a 100644 --- a/kword/KWTableFrameSet.h +++ b/kword/KWTableFrameSet.h @@ -473,7 +473,7 @@ public: virtual void finalize(); virtual void invalidate(); - virtual void tqlayout(); + virtual void layout(); virtual void updateFrames( int flags = 0xff ); diff --git a/kword/KWTableStyleManager.cpp b/kword/KWTableStyleManager.cpp index a08a6bc7..de0a8b1b 100644 --- a/kword/KWTableStyleManager.cpp +++ b/kword/KWTableStyleManager.cpp @@ -130,7 +130,7 @@ void KWTableStylePreview::drawContents( TQPainter *p ) p->setClipRect( textRect.intersect( fr ) ); p->translate( textRect.x(), textRect.y() ); - TQColorGroup cg = TQApplication::tqpalette().active(); + TQColorGroup cg = TQApplication::palette().active(); cg.setBrush( TQColorGroup::Base, tableStyle->frameStyle()->backgroundColor() ); m_textdoc->drawWYSIWYG( p, 1, 0, textRect.width() - 1, textRect.height(), cg, m_zoomHandler ); @@ -293,9 +293,9 @@ void KWTableStyleManager::setupMain() mainLayout->addWidget( nameLabel, 0, 0 ); TQGroupBox *adjustBox = new TQGroupBox( 0, Qt::Vertical, i18n("Adjust"), main); - adjustBox->tqlayout()->setSpacing(KDialog::spacingHint()); - adjustBox->tqlayout()->setMargin(KDialog::marginHint()); - TQGridLayout *adjustLayout = new TQGridLayout( adjustBox->tqlayout() ); + adjustBox->layout()->setSpacing(KDialog::spacingHint()); + adjustBox->layout()->setMargin(KDialog::marginHint()); + TQGridLayout *adjustLayout = new TQGridLayout( adjustBox->layout() ); TQLabel *frameStyleLabel = new TQLabel( adjustBox ); frameStyleLabel->setText( i18n( "Framestyle:" ) ); diff --git a/kword/KWTableTemplateSelector.cpp b/kword/KWTableTemplateSelector.cpp index e99083c4..f219b086 100644 --- a/kword/KWTableTemplateSelector.cpp +++ b/kword/KWTableTemplateSelector.cpp @@ -207,7 +207,7 @@ void KWTableTemplatePreview::drawCell( TQPainter *p, const KWTableStyle *ts, con p->setClipRect( textRect.intersect( globalRect ) ); p->translate( textRect.x(), textRect.y() ); - TQColorGroup cg = TQApplication::tqpalette().active(); + TQColorGroup cg = TQApplication::palette().active(); cg.setBrush( TQColorGroup::Base, ts->frameStyle()->backgroundColor() ); m_textdoc->drawWYSIWYG( p, 1, 0, textRect.width() - 1, textRect.height(), cg, m_zoomHandler ); diff --git a/kword/KWTextFrameSet.cpp b/kword/KWTextFrameSet.cpp index 54f9f97d..540794f1 100644 --- a/kword/KWTextFrameSet.cpp +++ b/kword/KWTextFrameSet.cpp @@ -396,7 +396,7 @@ KWFrame * KWTextFrameSet::internalToDocumentWithHint( const TQPoint &iPoint, KoP kdDebug() << "ITD: r=" << r << " iPoint=" << iPoint.x() << "," << iPoint.y() << endl; #endif // r is the frame in qrt coords - if ( r.contains( iPoint ) ) // both r and p are in tqlayout units (aka internal) + if ( r.contains( iPoint ) ) // both r and p are in layout units (aka internal) { dPoint = internalToDocumentKnowingFrame( iPoint, theFrame ); #ifdef DEBUG_ITD @@ -757,7 +757,7 @@ void KWTextFrameSet::drawCursor( TQPainter *p, KoTextCursor *cursor, bool cursor #endif p->save(); - TQColorGroup cg = TQApplication::tqpalette().active(); + TQColorGroup cg = TQApplication::palette().active(); if ( hasFrames ) { @@ -824,7 +824,7 @@ void KWTextFrameSet::drawCursor( TQPainter *p, KoTextCursor *cursor, bool cursor m_currentDrawnFrame = 0L; } -void KWTextFrameSet::tqlayout() +void KWTextFrameSet::layout() { invalidate(); // Get the thing going though, repainting doesn't call formatMore @@ -835,7 +835,7 @@ void KWTextFrameSet::invalidate() { //kdDebug() << "KWTextFrameSet::invalidate " << name() << endl; m_textobj->setLastFormattedParag( textDocument()->firstParag() ); - textDocument()->invalidate(); // lazy tqlayout, real update follows upon next repaint + textDocument()->invalidate(); // lazy layout, real update follows upon next repaint } void KWTextFrameSet::slotRepaintChanged() @@ -960,7 +960,7 @@ void KWTextFrameSet::getMargins( int yp, int h, int reqMinWidth, if ( validHeight ) *validHeight = h; // TODO - // Everything from there is in tqlayout units + // Everything from there is in layout units // Note: it is very important that this method works in internal coordinates. // Otherwise, parags broken at the line-level (e.g. between two columns) are seen // as still in one piece, and we miss the frames in the 2nd column. @@ -1984,7 +1984,7 @@ bool KWTextFrameSet::slotAfterFormattingNeedMoreSpace( int bottom, KoTextParag * frmBehavior = KWFrame::Ignore; } - int difference = ( bottom + 2 ) - availHeight; // in tqlayout unit pixels + int difference = ( bottom + 2 ) - availHeight; // in layout unit pixels #ifdef DEBUG_FORMAT_MORE kdDebug(32002) << "AutoExtendFrame bottom=" << bottom << " availHeight=" << availHeight << " => difference = " << difference << endl; @@ -2484,7 +2484,7 @@ void KWTextFrameSet::frameResized( KWFrame *theFrame, bool invalidateLayout ) m_doc->recalcFrames( theFrame->pageNumber(), -1 ); // warning this can delete theFrame! // m_doc->frameChanged( theFrame ); - // Warning, can't call tqlayout() (frameChanged calls it) + // Warning, can't call layout() (frameChanged calls it) // from here, since it calls formatMore() ! if ( invalidateLayout ) m_doc->invalidate(this); @@ -2770,7 +2770,7 @@ bool KWTextFrameSet::minMaxInternalOnPage( int pageNum, int& topLU, int& bottomL topPt = TQMIN( topPt, y ); bottomPt = TQMAX( bottomPt, y + frameIt.current()->height() ); } - // Convert to tqlayout units + // Convert to layout units topLU = m_doc->ptToLayoutUnitPixY( topPt ); bottomLU = m_doc->ptToLayoutUnitPixY( bottomPt ); return true; @@ -3146,7 +3146,7 @@ void KWTextFrameSetEdit::slotFrameDeleted( KWFrame *frm ) void KWTextFrameSetEdit::paste() { - TQMimeSource *data = TQApplication::tqclipboard()->data(); + TQMimeSource *data = TQApplication::clipboard()->data(); int provides = KWView::checkClipboard( data ); pasteData( data, provides, false ); } @@ -3163,7 +3163,7 @@ void KWTextFrameSetEdit::pasteData( TQMimeSource* data, int provides, bool drop { // Note: TQClipboard::text() seems to do a better job than encodedData( "text/plain" ) // In particular it handles charsets (in the mimetype). - const TQString text = TQApplication::tqclipboard()->text(); + const TQString text = TQApplication::clipboard()->text(); const bool removeSelected = !drop; if ( !text.isEmpty() ) textObject()->pasteText( cursor(), text, currentFormat(), removeSelected ); @@ -3208,7 +3208,7 @@ void KWTextFrameSetEdit::copy() { if ( textDocument()->hasSelection( KoTextDocument::Standard ) ) { TQDragObject *drag = newDrag( 0 ); - TQApplication::tqclipboard()->setData( drag ); + TQApplication::clipboard()->setData( drag ); } } @@ -3652,9 +3652,9 @@ void KWTextFrameSetEdit::dropEvent( TQDropEvent * e, const TQPoint & nPoint, con cmd = pasteOasisCommand( e ); if ( cmd ) macroCmd->addCommand(cmd); - //retqlayout textframeset after a dnd otherwise autoextend + //relayout textframeset after a dnd otherwise autoextend //frameset is not re-layouted - textFrameSet()->tqlayout(); + textFrameSet()->layout(); frameSet()->kWordDocument()->addCommand( macroCmd ); } return; diff --git a/kword/KWTextFrameSet.h b/kword/KWTextFrameSet.h index 7cc4efb5..aee28007 100644 --- a/kword/KWTextFrameSet.h +++ b/kword/KWTextFrameSet.h @@ -93,14 +93,14 @@ public: void clearUndoRedoInfo(); /** Convert the @p dPoint in the normal coordinate system (and in pt) - * into a point (@p iPoint) in the internal qtextdoc coordinates (in tqlayout units). */ + * into a point (@p iPoint) in the internal qtextdoc coordinates (in layout units). */ KWFrame * documentToInternal( const KoPoint &dPoint, TQPoint &iPoint ) const; /// used by documentToInternalMouseSelection() enum RelativePosition { InsideFrame, LeftOfFrame, TopOfFrame, AtEnd }; KWFrame * documentToInternalMouseSelection( const KoPoint &dPoint, TQPoint &iPoint, RelativePosition& relPos, KWViewMode *viewMode ) const; - /** Convert the @p in the internal qtextdoc coordinates (in tqlayout units) + /** Convert the @p in the internal qtextdoc coordinates (in layout units) * into a point in the document coordinate system (in pt). * Also returns the frame in which this point is. */ KWFrame * internalToDocument( const KoPoint &relPoint, KoPoint &dPoint ) const; @@ -125,7 +125,7 @@ public: KoPoint internalToDocumentKnowingFrame( const TQPoint &iPoint, KWFrame* theFrame ) const; /** Implementation of Ctrl+PageUp/PageDown - * Returns a point in tqlayout units (for placing the cursor) */ + * Returns a point in layout units (for placing the cursor) */ TQPoint moveToPage( int currentPgNum, short int direction ) const; /** Return the available height in pixels (sum of all frames' height, with zoom applied) @@ -237,7 +237,7 @@ public: #endif /** Invalidate all paragraphs and start re-formatting */ - virtual void tqlayout(); + virtual void layout(); /** Invalidate all paragraphs (causes a re-flow of the text upon next redraw) */ virtual void invalidate(); @@ -275,13 +275,13 @@ public: /** Let KoTextFormatInterface set the modified format */ virtual KCommand *setFormatCommand( const KoTextFormat * newFormat, int flags, bool zoomFont = false ); - /** Let KoTextFormatInterface access the current parag tqlayout */ + /** Let KoTextFormatInterface access the current parag layout */ virtual const KoParagLayout * currentParagLayoutFormat() const; virtual bool rtl() const ; - /** Let KoTextFormatInterface set a modified current parag tqlayout */ + /** Let KoTextFormatInterface set a modified current parag layout */ virtual KCommand *setParagLayoutFormatCommand( KoParagLayout *newLayout, int flags, int marginIndex=-1); virtual KCommand *setChangeCaseOfTextCommand(KoChangeCaseDia::TypeOfCase _type); diff --git a/kword/KWTextParag.cpp b/kword/KWTextParag.cpp index 0b1aaa9b..41d1749a 100644 --- a/kword/KWTextParag.cpp +++ b/kword/KWTextParag.cpp @@ -552,16 +552,16 @@ KoTextFormat KWTextParag::loadFormat( TQDomElement &formatElem, KoTextFormat * r void KWTextParag::loadLayout( TQDomElement & attributes ) { - TQDomElement tqlayout = attributes.namedItem( "LAYOUT" ).toElement(); - if ( !tqlayout.isNull() ) + TQDomElement layout = attributes.namedItem( "LAYOUT" ).toElement(); + if ( !layout.isNull() ) { KWDocument * doc = kwTextDocument()->textFrameSet()->kWordDocument(); - KoParagLayout paragLayout = loadParagLayout( tqlayout, doc, true ); + KoParagLayout paragLayout = loadParagLayout( layout, doc, true ); setParagLayout( paragLayout ); // Load default format from style. KoTextFormat *defaultFormat = style() ? &style()->format() : 0L; - TQDomElement formatElem = tqlayout.namedItem( "FORMAT" ).toElement(); + TQDomElement formatElem = layout.namedItem( "FORMAT" ).toElement(); if ( !formatElem.isNull() ) { // Load paragraph format @@ -577,7 +577,7 @@ void KWTextParag::loadLayout( TQDomElement & attributes ) else { // Even the simplest import filter should do <LAYOUT><NAME value="Standard"/></LAYOUT> - kdWarning(32001) << "No LAYOUT tag in PARAGRAPH, dunno what tqlayout to apply" << endl; + kdWarning(32001) << "No LAYOUT tag in PARAGRAPH, dunno what layout to apply" << endl; } } @@ -639,7 +639,7 @@ void KWTextParag::loadFormatting( TQDomElement &attributes, int offset, bool loa // However, as it is an invalid XML character, we must replace it // or it will be written out while save the file. KoTextStringChar& ch = string()->at(index); - if (ch.c.tqunicode()==1) + if (ch.c.unicode()==1) { kdDebug() << "Replacing TQChar(1) (in KWTextParag::loadFormatting)" << endl; ch.c='#'; @@ -740,12 +740,12 @@ void KWTextParag::loadFormatting( TQDomElement &attributes, int offset, bool loa } } -void KWTextParag::setParagLayout( const KoParagLayout & tqlayout, int flags, int marginIndex ) +void KWTextParag::setParagLayout( const KoParagLayout & layout, int flags, int marginIndex ) { - KoTextParag::setParagLayout( tqlayout, flags, marginIndex ); + KoTextParag::setParagLayout( layout, flags, marginIndex ); if ( flags & KoParagLayout::PageBreaking ) - setPageBreaking( tqlayout.pageBreaking ); + setPageBreaking( layout.pageBreaking ); } ////////// @@ -753,7 +753,7 @@ void KWTextParag::setParagLayout( const KoParagLayout & tqlayout, int flags, int // Create a KoParagLayout from XML. KoParagLayout KWTextParag::loadParagLayout( TQDomElement & parentElem, KWDocument *doc, bool findStyle ) { - KoParagLayout tqlayout; + KoParagLayout layout; // Only when loading paragraphs, not when loading styles if ( findStyle ) @@ -779,12 +779,12 @@ KoParagLayout KWTextParag::loadParagLayout( TQDomElement & parentElem, KWDocumen style = doc->styleCollection()->findStyle( "Standard" ); } Q_ASSERT(style); - tqlayout.style = style; + layout.style = style; } - KoParagLayout::loadParagLayout( tqlayout, parentElem, doc->syntaxVersion() ); + KoParagLayout::loadParagLayout( layout, parentElem, doc->syntaxVersion() ); - return tqlayout; + return layout; } void KWTextParag::join( KoTextParag *parag ) @@ -808,10 +808,10 @@ void KWTextParag::loadOasis( const TQDomElement& paragElement, KoOasisContext& c const TQDomElement* paragraphStyle = context.oasisStyles().findStyle( styleName, "paragraph" ); TQString masterPageName = paragraphStyle ? paragraphStyle->attributeNS( KoXmlNS::style, "master-page-name", TQString() ) : TQString(); - // In KWord we don't support sections so the first paragraph is the one that determines the page tqlayout. + // In KWord we don't support sections so the first paragraph is the one that determines the page layout. if ( prev() == 0 ) { if ( masterPageName.isEmpty() ) - masterPageName = "Standard"; // Seems to be a builtin name for the default tqlayout... + masterPageName = "Standard"; // Seems to be a builtin name for the default layout... currentMasterPageRef = masterPageName; // do this first to avoid recursion context.styleStack().save(); context.styleStack().setTypeProperties( "paragraph" ); @@ -822,18 +822,18 @@ void KWTextParag::loadOasis( const TQDomElement& paragElement, KoOasisContext& c doc->variableCollection()->variableSetting()->setStartingPageNumber( pageNumber.toInt() ); context.styleStack().restore(); - doc->loadOasisPageLayout( masterPageName, context ); // page tqlayout + doc->loadOasisPageLayout( masterPageName, context ); // page layout } else if ( !masterPageName.isEmpty() // empty means no change && masterPageName != currentMasterPageRef ) { - // Detected a change in the master page -> this means we have to use a new page tqlayout + // Detected a change in the master page -> this means we have to use a new page layout // and insert a frame break if not on the first paragraph. kdDebug(32001) << "KWTextParag::loadOasis: change of master page detected: from " << currentMasterPageRef << " to " << masterPageName << " -> inserting page break" << endl; currentMasterPageRef = masterPageName; // [see also KoParagLayout for the 'normal' way to insert page breaks] m_layout.pageBreaking |= KoParagLayout::HardFrameBreakBefore; - // We have no way to load/use the new page tqlayout, KWord doesn't have "sections". + // We have no way to load/use the new page layout, KWord doesn't have "sections". } } } diff --git a/kword/KWTextParag.h b/kword/KWTextParag.h index b0a9d044..de484a48 100644 --- a/kword/KWTextParag.h +++ b/kword/KWTextParag.h @@ -46,7 +46,7 @@ public: KWTextDocument * kwTextDocument() const; - virtual void setParagLayout( const KoParagLayout &tqlayout, int flags = KoParagLayout::All, int marginIndex = -1 ); + virtual void setParagLayout( const KoParagLayout &layout, int flags = KoParagLayout::All, int marginIndex = -1 ); /** The type of page-breaking behaviour */ void setPageBreaking( int pb ); // warning this sets all the flags! @@ -73,7 +73,7 @@ public: /** Load (from KWord-1.3 XML) and apply \<FORMAT\> tags (used by KWTextParag::load and by KWPasteCommand) */ void loadFormatting( TQDomElement &attributes, int offset = 0, bool loadFootNote=true ); - /** Load (from KWord-1.3 XML) and apply paragraph tqlayout */ + /** Load (from KWord-1.3 XML) and apply paragraph layout */ void loadLayout( TQDomElement & attributes ); /** Load (from KWord-1.3 XML), optionally using styles from document. */ diff --git a/kword/KWVariable.cpp b/kword/KWVariable.cpp index 304d5191..80666965 100644 --- a/kword/KWVariable.cpp +++ b/kword/KWVariable.cpp @@ -532,7 +532,7 @@ void KWFootNoteVariable::finalize() fs->textObject()->abortFormatting(); // abortFormatting is a bool in kotextobject. So we need to return there before - // starting text tqlayout again. + // starting text layout again. m_doc->delayedRecalcFrames( TQMIN( pageNum, framePage ) ); m_doc->delayedRepaintAllViews(); } @@ -596,7 +596,7 @@ void KWFootNoteVariable::setDeleted( bool del ) m_doc->recalcFrames(); if (!del) - m_frameset->tqlayout(); // format its text, so that it resizes the frame + m_frameset->layout(); // format its text, so that it resizes the frame KoVariable::setDeleted( del ); // Does this compress? Probably not. m_doc->delayedRepaintAllViews(); @@ -617,7 +617,7 @@ double KWFootNoteVariable::varY() const if ( !fs->hasFramesInPageArray() ) // we need it for internalToDocument { kdDebug(32001) << "KWFootNoteVariable::varY too early, no updateFrames yet" << endl; - return 0; // this happens on loading - frame tqlayout is done before text tqlayout + return 0; // this happens on loading - frame layout is done before text layout } // What we need is "has never been formatted". Not "has just been invalidated"... //if ( !paragraph()->isValid() ) diff --git a/kword/KWView.cpp b/kword/KWView.cpp index b39cac7f..832711d1 100644 --- a/kword/KWView.cpp +++ b/kword/KWView.cpp @@ -339,7 +339,7 @@ KWView::KWView( const TQString& viewMode, TQWidget *parent, const char *name, KW connect( frameViewManager(), TQT_SIGNAL(sigFrameSetRenamed()), TQT_TQOBJECT(this), TQT_SLOT( updateFrameStatusBarItem())); - connect( TQApplication::tqclipboard(), TQT_SIGNAL( dataChanged() ), + connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ), TQT_TQOBJECT(this), TQT_SLOT( clipboardDataChanged() ) ); connect( m_gui->canvasWidget(), TQT_SIGNAL(currentFrameSetEditChanged()), @@ -640,7 +640,7 @@ void KWView::setupActions() TQT_TQOBJECT(this), TQT_SLOT( viewTextMode() ), actionCollection(), "view_textmode" ); m_actionViewTextMode->setToolTip( i18n( "Only show the text of the document." ) ); - m_actionViewTextMode->setWhatsThis( i18n( "Do not show any pictures, formatting or tqlayout. KWord will display only the text for editing." ) ); + m_actionViewTextMode->setWhatsThis( i18n( "Do not show any pictures, formatting or layout. KWord will display only the text for editing." ) ); m_actionViewTextMode->setExclusiveGroup( "viewmodes" ); m_actionViewPageMode = new KToggleAction( i18n( "&Page Mode" ), 0, @@ -1718,12 +1718,12 @@ void KWView::clipboardDataChanged() } KWFrameSetEdit * edit = m_gui->canvasWidget()->currentFrameSetEdit(); // Is there plain text in the clipboard ? - if ( edit && !TQApplication::tqclipboard()->text().isEmpty() ) + if ( edit && !TQApplication::clipboard()->text().isEmpty() ) { m_actionEditPaste->setEnabled(true); return; } - TQMimeSource *data = TQApplication::tqclipboard()->data(); + TQMimeSource *data = TQApplication::clipboard()->data(); const int provides = checkClipboard( data ); if ( provides & ( ProvidesImage | ProvidesOasis | ProvidesFormula ) ) m_actionEditPaste->setEnabled( true ); @@ -2365,7 +2365,7 @@ void KWView::editCut() edit->cut(); else { TQDragObject *drag = m_doc->dragSelected( frameViewManager()->selectedFrames() ); - TQApplication::tqclipboard()->setData( drag ); + TQApplication::clipboard()->setData( drag ); deleteFrame(false); } } @@ -2377,13 +2377,13 @@ void KWView::editCopy() edit->copy(); else { TQDragObject *drag = m_doc->dragSelected( frameViewManager()->selectedFrames() ); - TQApplication::tqclipboard()->setData( drag ); + TQApplication::clipboard()->setData( drag ); } } void KWView::editPaste() { - TQMimeSource *data = TQApplication::tqclipboard()->data(); + TQMimeSource *data = TQApplication::clipboard()->data(); pasteData( data, false ); } @@ -2423,7 +2423,7 @@ void KWView::pasteData( TQMimeSource* data, bool drop ) provides = ProvidesPlainText; } if ( !drop ) // get it again, to avoid crashes - data = TQApplication::tqclipboard()->data(); + data = TQApplication::clipboard()->data(); } KWTextFrameSetEdit * edit = currentTextEdit(); if ( edit && ( provides & ProvidesPlainText ) ) { @@ -2629,7 +2629,7 @@ void KWView::adjustZOrderOfSelectedFrames(MoveFrameType moveType) { // Calling updateFrames() on the selected frames' framesets isn't enough, // we also need other framesets to notice the new frames on top. m_doc->updateAllFrames(); - m_doc->tqlayout(); + m_doc->layout(); m_doc->repaintAllViews(); } @@ -3110,7 +3110,7 @@ void KWView::showZoom( const TQString& zoom ) void KWView::slotViewFormattingChars() { m_doc->setViewFormattingChars(m_actionViewFormattingChars->isChecked()); - m_doc->tqlayout(); // Due to the different formatting when this option is activated + m_doc->layout(); // Due to the different formatting when this option is activated m_doc->repaintAllViews(); } @@ -4370,7 +4370,7 @@ void KWView::tableJoinCells() return; } m_doc->addCommand(cmd); - m_doc->tqlayout(); + m_doc->layout(); } void KWView::tableSplitCells() { @@ -4405,7 +4405,7 @@ void KWView::tableSplitCells(int cols, int rows) } m_doc->addCommand(cmd); m_doc->updateAllFrames(); - m_doc->tqlayout(); + m_doc->layout(); frameViewManager()->view(cell->frame(0))->setSelected(true); } @@ -4980,10 +4980,10 @@ void KWView::setSpacing( KoParagLayout::SpacingType spacing, const TQString& com KMacroCommand* macroCmd = 0L; for ( ; it.current() ; ++it ) { - KoParagLayout tqlayout( *it.current()->currentParagLayoutFormat() ); - tqlayout.lineSpacingType = spacing; + KoParagLayout layout( *it.current()->currentParagLayoutFormat() ); + layout.lineSpacingType = spacing; - KCommand *cmd = it.current()->setParagLayoutFormatCommand( &tqlayout, KoParagLayout::LineSpacing ); + KCommand *cmd = it.current()->setParagLayoutFormatCommand( &layout, KoParagLayout::LineSpacing ); if (cmd) { if ( !macroCmd ) @@ -5167,8 +5167,8 @@ void KWView::textIncreaseIndent() m_doc->addCommand(macroCmd); if(!lst.isEmpty()) { - const KoParagLayout *tqlayout=lst.first()->currentParagLayoutFormat(); - showRulerIndent( tqlayout->margins[TQStyleSheetItem::MarginLeft], tqlayout->margins[TQStyleSheetItem::MarginFirstLine], tqlayout->margins[TQStyleSheetItem::MarginRight], lst.first()->rtl()); + const KoParagLayout *layout=lst.first()->currentParagLayoutFormat(); + showRulerIndent( layout->margins[TQStyleSheetItem::MarginLeft], layout->margins[TQStyleSheetItem::MarginFirstLine], layout->margins[TQStyleSheetItem::MarginRight], lst.first()->rtl()); } #if 0 @@ -5216,8 +5216,8 @@ void KWView::textDecreaseIndent() m_doc->addCommand(macroCmd); if(!lst.isEmpty()) { - const KoParagLayout *tqlayout=lst.first()->currentParagLayoutFormat(); - showRulerIndent( tqlayout->margins[TQStyleSheetItem::MarginLeft], tqlayout->margins[TQStyleSheetItem::MarginFirstLine], tqlayout->margins[TQStyleSheetItem::MarginRight], lst.first()->rtl()); + const KoParagLayout *layout=lst.first()->currentParagLayoutFormat(); + showRulerIndent( layout->margins[TQStyleSheetItem::MarginLeft], layout->margins[TQStyleSheetItem::MarginFirstLine], layout->margins[TQStyleSheetItem::MarginRight], lst.first()->rtl()); } @@ -5445,7 +5445,7 @@ void KWView::tabListChanged( const KoTabulatorList & tabList ) m_doc->addCommand(macroCmd); } -void KWView::newPageLayout( const KoPageLayout &tqlayout ) +void KWView::newPageLayout( const KoPageLayout &layout ) { TQString mode = viewMode()->type(); bool state = (mode!="ModeText"); @@ -5457,14 +5457,14 @@ void KWView::newPageLayout( const KoPageLayout &tqlayout ) KoKWHeaderFooter hf; m_doc->getPageLayout( pgLayout, cl, hf ); - if(tqlayout==pgLayout) + if(layout==pgLayout) return; KWPageLayoutStruct oldLayout( pgLayout, cl, hf ); - m_doc->setPageLayout( tqlayout, cl, hf ); + m_doc->setPageLayout( layout, cl, hf ); - KWPageLayoutStruct newLayout( tqlayout, cl, hf ); + KWPageLayoutStruct newLayout( layout, cl, hf ); KWTextFrameSetEdit *edit = currentTextEdit(); if (edit) @@ -5473,12 +5473,12 @@ void KWView::newPageLayout( const KoPageLayout &tqlayout ) m_doc->addCommand(cmd); } -void KWView::slotPageLayoutChanged( const KoPageLayout& tqlayout ) +void KWView::slotPageLayoutChanged( const KoPageLayout& layout ) { // This is connected to a signal of KWDocument, so that when the - // above method, or any other way of changing the page tqlayout happens, + // above method, or any other way of changing the page layout happens, // the rulers are updated in all views. - viewMode()->setPageLayout( m_gui->getHorzRuler(), m_gui->getVertRuler(), tqlayout ); + viewMode()->setPageLayout( m_gui->getHorzRuler(), m_gui->getVertRuler(), layout ); m_gui->canvasWidget()->repaintAll(); } @@ -6586,7 +6586,7 @@ void KWView::switchModeView() updateZoomControls(); updatePageInfo(); - // set page tqlayout in rulers + // set page layout in rulers canvas->viewMode()->setPageLayout( m_gui->getHorzRuler(), m_gui->getVertRuler(), m_doc->pageLayout() ); } @@ -7263,7 +7263,7 @@ void KWView::convertToTextBox() if ( cmd ) macro->addCommand( cmd ); // Auto-resize the frame from its contents - edit->textFrameSet()->tqlayout(); + edit->textFrameSet()->layout(); } m_doc->addCommand( macro ); } @@ -7618,19 +7618,19 @@ KWGUI::KWGUI( const TQString& viewMode, TQWidget *parent, KWView *daView ) l << 90; m_panner->setSizes( l ); - KoPageLayout tqlayout = doc->pageLayout(); + KoPageLayout layout = doc->pageLayout(); m_tabChooser = new KoTabChooser( m_right, KoTabChooser::TAB_ALL ); m_tabChooser->setReadWrite(doc->isReadWrite()); gridLayout->addWidget( m_tabChooser, 0, 0 ); - m_horRuler = new KoRuler( m_right, m_canvas->viewport(), Qt::Horizontal, tqlayout, + m_horRuler = new KoRuler( m_right, m_canvas->viewport(), Qt::Horizontal, layout, KoRuler::F_INDENTS | KoRuler::F_TABS, doc->unit(), m_tabChooser ); m_horRuler->setReadWrite(doc->isReadWrite()); gridLayout->addWidget( m_horRuler, 0, 1 ); - m_vertRuler = new KoRuler( m_right, m_canvas->viewport(), Qt::Vertical, tqlayout, + m_vertRuler = new KoRuler( m_right, m_canvas->viewport(), Qt::Vertical, layout, 0, doc->unit() ); m_vertRuler->setReadWrite(doc->isReadWrite()); gridLayout->addWidget( m_vertRuler, 1, 0 ); diff --git a/kword/KWView.h b/kword/KWView.h index f023e6c6..c720493b 100644 --- a/kword/KWView.h +++ b/kword/KWView.h @@ -350,7 +350,7 @@ public slots: void configure(); void configureCompletion(); - void newPageLayout( const KoPageLayout &tqlayout ); + void newPageLayout( const KoPageLayout &layout ); void newLeftIndent( double leftIndent); void newFirstIndent( double firstIndent); void newRightIndent( double rightIndent); @@ -487,7 +487,7 @@ protected slots: void spellAddAutoCorrect (const TQString & originalword, const TQString & newword); void slotApplyFont(); void slotApplyParag(); - void slotPageLayoutChanged( const KoPageLayout& tqlayout ); + void slotPageLayoutChanged( const KoPageLayout& layout ); void slotChangeCaseState(bool b); void slotChangeCutState(bool b); void slotCorrectWord(); @@ -868,7 +868,7 @@ protected: KWDocStruct *m_docStruct; // The right side - TQWidget *m_right; // The tqlayout widget. + TQWidget *m_right; // The layout widget. KoTabChooser *m_tabChooser; KoRuler *m_vertRuler; diff --git a/kword/KWViewMode.cpp b/kword/KWViewMode.cpp index c1c6f16e..aba5d83c 100644 --- a/kword/KWViewMode.cpp +++ b/kword/KWViewMode.cpp @@ -63,7 +63,7 @@ void KWViewMode::drawOnePageBorder( TQPainter * painter, const TQRect & crect, c TQRegion pageEmptyRegion = emptySpaceRegion.intersect( pagecrect ); //kdDebug() << "RESULT: pageEmptyRegion: " << pageEmptyRegion << endl; if ( !pageEmptyRegion.isEmpty() ) - m_doc->eraseEmptySpace( painter, pageEmptyRegion, TQApplication::tqpalette().active().brush( TQColorGroup::Base ) ); + m_doc->eraseEmptySpace( painter, pageEmptyRegion, TQApplication::palette().active().brush( TQColorGroup::Base ) ); } } @@ -74,7 +74,7 @@ TQRect KWViewMode::drawRightShadow( TQPainter * painter, const TQRect & crect, c if ( !shadowRect.isEmpty() ) { painter->fillRect( shadowRect, - TQApplication::tqpalette().active().brush( TQColorGroup::Shadow ) ); + TQApplication::palette().active().brush( TQColorGroup::Shadow ) ); } return shadowRect; } @@ -85,7 +85,7 @@ TQRect KWViewMode::drawBottomShadow( TQPainter * painter, const TQRect & crect, shadowRect &= crect; // intersect if ( !shadowRect.isEmpty() ) painter->fillRect( shadowRect, - TQApplication::tqpalette().active().brush( TQColorGroup::Shadow ) ); + TQApplication::palette().active().brush( TQColorGroup::Shadow ) ); return shadowRect; } @@ -144,10 +144,10 @@ TQRect KWViewMode::rulerFrameRect() return TQRect(); } -void KWViewMode::setPageLayout( KoRuler* hRuler, KoRuler* vRuler, const KoPageLayout& tqlayout ) +void KWViewMode::setPageLayout( KoRuler* hRuler, KoRuler* vRuler, const KoPageLayout& layout ) { - hRuler->setPageLayout( tqlayout ); - vRuler->setPageLayout( tqlayout ); + hRuler->setPageLayout( layout ); + vRuler->setPageLayout( layout ); } // static @@ -230,7 +230,7 @@ int KWViewModeNormal::xOffset(KWPage *page, int canvasWidth /* = -1 */) { void KWViewModeNormal::drawPageBorders( TQPainter * painter, const TQRect & crect, const TQRegion & emptySpaceRegion ) { painter->save(); - painter->setPen( TQApplication::tqpalette().active().color( TQColorGroup::Dark ) ); + painter->setPen( TQApplication::palette().active().color( TQColorGroup::Dark ) ); painter->setBrush( TQt::NoBrush ); TQRect pageRect; @@ -258,7 +258,7 @@ void KWViewModeNormal::drawPageBorders( TQPainter * painter, const TQRect & crec leftArea &= crect; if ( !leftArea.isEmpty() ) { painter->fillRect( leftArea, - TQApplication::tqpalette().active().brush( TQColorGroup::Mid ) ); + TQApplication::palette().active().brush( TQColorGroup::Mid ) ); } // The area on the right of the page @@ -267,7 +267,7 @@ void KWViewModeNormal::drawPageBorders( TQPainter * painter, const TQRect & crec if ( !rightArea.isEmpty() ) { painter->fillRect( rightArea, - TQApplication::tqpalette().active().brush( TQColorGroup::Mid ) ); + TQApplication::palette().active().brush( TQColorGroup::Mid ) ); // Draw a shadow int topOffset = ( page==0 ) ? s_shadowOffset : 0; // leave a few pixels on top, only for first page @@ -284,7 +284,7 @@ void KWViewModeNormal::drawPageBorders( TQPainter * painter, const TQRect & crec if ( !repaintRect.isEmpty() ) { painter->fillRect( repaintRect, - TQApplication::tqpalette().active().brush( TQColorGroup::Mid ) ); + TQApplication::palette().active().brush( TQColorGroup::Mid ) ); // Draw a shadow drawBottomShadow( painter, crect, pageRect, s_shadowOffset ); } @@ -406,7 +406,7 @@ TQPoint KWViewModePreview::viewToNormal( const TQPoint & vPoint ) void KWViewModePreview::drawPageBorders( TQPainter * painter, const TQRect & crect, const TQRegion & emptySpaceRegion ) { painter->save(); - painter->setPen( TQApplication::tqpalette().active().color( TQColorGroup::Dark ) ); + painter->setPen( TQApplication::palette().active().color( TQColorGroup::Dark ) ); painter->setBrush( TQt::NoBrush ); //kdDebug() << "KWViewModePreview::drawPageBorders crect=" << DEBUGRECT( crect ) << endl; TQRegion grayRegion( crect ); @@ -439,7 +439,7 @@ void KWViewModePreview::drawPageBorders( TQPainter * painter, const TQRect & cre if ( !grayRegion.isEmpty() ) { //kdDebug() << "KWViewModePreview::drawPageBorders grayRegion's bounding Rect = " << DEBUGRECT( grayRegion.boundingRect() ) << endl; - m_doc->eraseEmptySpace( painter, grayRegion, TQApplication::tqpalette().active().brush( TQColorGroup::Mid ) ); + m_doc->eraseEmptySpace( painter, grayRegion, TQApplication::palette().active().brush( TQColorGroup::Mid ) ); } painter->restore(); } @@ -541,7 +541,7 @@ void KWViewModeText::drawPageBorders( TQPainter * painter, const TQRect & crect, painter->save(); TQRegion grayRegion( crect ); //kdDebug() << "KWViewModeText::drawPageBorders crect=" << grayRegion << endl; - painter->setPen( TQApplication::tqpalette().active().color( TQColorGroup::Dark ) ); + painter->setPen( TQApplication::palette().active().color( TQColorGroup::Dark ) ); TQSize cSize = contentsSize(); // Draw a line on the right -- ## or a shadow? // +1 to be out of the contents, and +1 for TQRect @@ -562,7 +562,7 @@ void KWViewModeText::drawPageBorders( TQPainter * painter, const TQRect & crect, } //kdDebug() << "KWViewModeText::drawPageBorders erasing grayRegion " << grayRegion << endl; if ( !grayRegion.isEmpty() ) - m_doc->eraseEmptySpace( painter, grayRegion, TQApplication::tqpalette().active().brush( TQColorGroup::Mid ) ); + m_doc->eraseEmptySpace( painter, grayRegion, TQApplication::palette().active().brush( TQColorGroup::Mid ) ); painter->restore(); } @@ -571,24 +571,24 @@ TQRect KWViewModeText::rulerFrameRect() return TQRect( TQPoint(OFFSET, 0), contentsSize() ); } -void KWViewModeText::setPageLayout( KoRuler* hRuler, KoRuler* vRuler, const KoPageLayout& /*tqlayout*/ ) +void KWViewModeText::setPageLayout( KoRuler* hRuler, KoRuler* vRuler, const KoPageLayout& /*layout*/ ) { - // Create a dummy page-tqlayout, as if we had a single page englobing the whole text. - KoPageLayout tqlayout; - tqlayout.format = PG_CUSTOM; - tqlayout.orientation = PG_PORTRAIT; + // Create a dummy page-layout, as if we had a single page englobing the whole text. + KoPageLayout layout; + layout.format = PG_CUSTOM; + layout.orientation = PG_PORTRAIT; TQSize cSize = contentsSize(); - tqlayout.ptWidth = m_doc->unzoomItX( cSize.width() ); + layout.ptWidth = m_doc->unzoomItX( cSize.width() ); tqlayout.ptHeight = m_doc->unzoomItY( cSize.height() ); - //kdDebug() << "KWViewModeText::setPageLayout tqlayout size " << tqlayout.ptWidth << "x" << tqlayout.ptHeight << endl; - tqlayout.ptLeft = OFFSET; - tqlayout.ptRight = 0; - tqlayout.ptTop = 0; - tqlayout.ptBottom = 0; - tqlayout.ptBindingSide = 0; - tqlayout.ptPageEdge = 0; - hRuler->setPageLayout( tqlayout ); - vRuler->setPageLayout( tqlayout ); + //kdDebug() << "KWViewModeText::setPageLayout layout size " << layout.ptWidth << "x" << layout.ptHeight << endl; + layout.ptLeft = OFFSET; + layout.ptRight = 0; + layout.ptTop = 0; + layout.ptBottom = 0; + layout.ptBindingSide = 0; + layout.ptPageEdge = 0; + hRuler->setPageLayout( layout ); + vRuler->setPageLayout( layout ); } bool KWViewModeText::isTextModeFrameset(KWFrameSet *fs) const { diff --git a/kword/KWViewMode.h b/kword/KWViewMode.h index fc78779a..fa0ec1d9 100644 --- a/kword/KWViewMode.h +++ b/kword/KWViewMode.h @@ -85,9 +85,9 @@ public: /** The result of this is passed to setFrameStartEnd for both rulers * (after adjustement with pageCorner()) */ virtual TQRect rulerFrameRect(); - /** Called when the page tqlayout is set, or changes. + /** Called when the page layout is set, or changes. * Usually this is directly passed to KoRuler (for page-based viewmodes) */ - virtual void setPageLayout( KoRuler* hRuler, KoRuler* vRuler, const KoPageLayout& tqlayout ); + virtual void setPageLayout( KoRuler* hRuler, KoRuler* vRuler, const KoPageLayout& layout ); virtual void drawPageBorders( TQPainter * painter, const TQRect & crect, const TQRegion & emptySpaceRegion ) = 0; @@ -273,7 +273,7 @@ public: // There is no page concept. Keep everything relative to (0,0) virtual TQPoint pageCorner() { return TQPoint( 0, 0 ); } virtual TQRect rulerFrameRect(); - virtual void setPageLayout( KoRuler* hRuler, KoRuler* vRuler, const KoPageLayout& tqlayout ); + virtual void setPageLayout( KoRuler* hRuler, KoRuler* vRuler, const KoPageLayout& layout ); virtual void drawPageBorders( TQPainter * painter, const TQRect & crect, const TQRegion & emptySpaceRegion ); virtual const TQString type() const { return "ModeText"; } diff --git a/kword/KWordFrameSetIface.cpp b/kword/KWordFrameSetIface.cpp index 928cddb5..e284862e 100644 --- a/kword/KWordFrameSetIface.cpp +++ b/kword/KWordFrameSetIface.cpp @@ -135,25 +135,25 @@ bool KWordFrameSetIface::isCopy()const void KWordFrameSetIface::setPtMarginLeft(double val) { m_frame->frame( 0 )->setPaddingLeft(val); - m_frame->kWordDocument()->tqlayout(); + m_frame->kWordDocument()->layout(); } void KWordFrameSetIface::setPtMarginRight(double val) { m_frame->frame( 0 )->setPaddingRight(val); - m_frame->kWordDocument()->tqlayout(); + m_frame->kWordDocument()->layout(); } void KWordFrameSetIface::setPtMarginTop(double val) { m_frame->frame( 0 )->setPaddingTop(val); - m_frame->kWordDocument()->tqlayout(); + m_frame->kWordDocument()->layout(); } void KWordFrameSetIface::setPtMarginBottom(double val) { m_frame->frame( 0 )->setPaddingBottom(val); - m_frame->kWordDocument()->tqlayout(); + m_frame->kWordDocument()->layout(); } TQColor KWordFrameSetIface::leftBorderColor() const diff --git a/kword/OASIS b/kword/OASIS index fdbfc016..b840b92d 100644 --- a/kword/OASIS +++ b/kword/OASIS @@ -25,7 +25,7 @@ and the page-based DTP mode (page-sequence element). * Headers and footers OpenDocument supports odd/even headers and footers using "header" and "header-left". -But for first page header/footer KWord should create a separate page tqlayout, +But for first page header/footer KWord should create a separate page layout, this is not done yet (it uses its own tag instead, as a temporary hack). Also OpenDocument doesn't allow a different style for header and header-left, so they must have the same min-size, border, margins... @@ -60,7 +60,7 @@ List of features that KWord has, but OOo doesn't have, and which are in the Open List of features that KWord doesn't have, and which OpenDocument has: (that list would be quite long, but let's list the real-life interoperability problems) - - lack of section support (changes of page tqlayout, but also changes of column settings + - lack of section support (changes of page layout, but also changes of column settings in the middle of a page) We could at least keep section styles and section markers (begin/end), so that load+save preserves it. diff --git a/kword/mailmerge/kabc/addresspicker.ui b/kword/mailmerge/kabc/addresspicker.ui index 46ced301..af8f5723 100644 --- a/kword/mailmerge/kabc/addresspicker.ui +++ b/kword/mailmerge/kabc/addresspicker.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <vbox> <property name="name"> @@ -101,7 +101,7 @@ </widget> <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> diff --git a/kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp b/kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp index f08ae82e..aa97d0b2 100644 --- a/kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp +++ b/kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp @@ -100,20 +100,20 @@ void KWMailMergeKSpreadConfig::initGUI() { TQFrame *page = plainPage(); - TQGridLayout *tqlayout = new TQGridLayout( page, 2, 2, marginHint(), spacingHint() ); + TQGridLayout *layout = new TQGridLayout( page, 2, 2, marginHint(), spacingHint() ); TQLabel *label = new TQLabel( i18n( "URL:" ), page ); - tqlayout->addWidget( label, 0, 0 ); + layout->addWidget( label, 0, 0 ); _urlRequester = new KURLRequester( page ); - tqlayout->addWidget( _urlRequester, 0, 1 ); + layout->addWidget( _urlRequester, 0, 1 ); label = new TQLabel( i18n( "Page number:" ), page ); - tqlayout->addWidget( label, 1, 0 ); + layout->addWidget( label, 1, 0 ); _pageNumber = new KComboBox( page ); _pageNumber->setEnabled( false ); - tqlayout->addWidget( _pageNumber, 1, 1 ); + layout->addWidget( _pageNumber, 1, 1 ); connect( _urlRequester->lineEdit() , TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotTextChanged( const TQString & ) ) ); } diff --git a/kword/tests/KWPageManagerTester.cpp b/kword/tests/KWPageManagerTester.cpp index 641e6534..9b261d90 100644 --- a/kword/tests/KWPageManagerTester.cpp +++ b/kword/tests/KWPageManagerTester.cpp @@ -200,11 +200,11 @@ void KWPageManagerTester::removePages() { void KWPageManagerTester::pageInfo() { KWPageManager *pageManager = new KWPageManager(); - KoPageLayout tqlayout; - tqlayout.ptWidth = 300; - tqlayout.ptHeight = 600; - tqlayout.format = PG_DIN_A4; - pageManager->setDefaultPage(tqlayout); + KoPageLayout layout; + layout.ptWidth = 300; + layout.ptHeight = 600; + layout.format = PG_DIN_A4; + pageManager->setDefaultPage(layout); pageManager->setStartPage(1); KWPage *page1 = pageManager->appendPage(); page1->setWidth(100); @@ -216,19 +216,19 @@ void KWPageManagerTester::pageInfo() { CHECK(pageManager->topOfPage(3), 300.0); CHECK(pageManager->bottomOfPage(3), 900.0); - tqlayout.ptHeight = 500; - pageManager->setDefaultPage(tqlayout); + layout.ptHeight = 500; + pageManager->setDefaultPage(layout); CHECK(pageManager->bottomOfPage(3), 800.0); page2->setHeight(-1); CHECK(pageManager->bottomOfPage(3), 1200.0); - tqlayout.ptTop = 5; - tqlayout.ptLeft = 6; - tqlayout.ptBottom = 7; - tqlayout.ptRight = 8; - tqlayout.ptBindingSide = -1; - tqlayout.ptPageEdge = -1; - pageManager->setDefaultPage(tqlayout); + layout.ptTop = 5; + layout.ptLeft = 6; + layout.ptBottom = 7; + layout.ptRight = 8; + layout.ptBindingSide = -1; + layout.ptPageEdge = -1; + pageManager->setDefaultPage(layout); page2->setTopMargin(9); page2->setLeftMargin(10); page2->setBottomMargin(11); diff --git a/lib/kformula/config/esstixeight.font b/lib/kformula/config/esstixeight.font index 88992333..37cbdfdb 100644 --- a/lib/kformula/config/esstixeight.font +++ b/lib/kformula/config/esstixeight.font @@ -3,7 +3,7 @@ # Unicode mapping for the esstixeight font. You can find it at # ftp://ftp.elsevier.nl/pub/styles/esstix/esstix.zip # -# Each line consist of a char position and its tqunicode value. +# Each line consist of a char position and its unicode value. # 33, 0xE201 37, 0xE205 diff --git a/lib/kformula/config/esstixeleven.font b/lib/kformula/config/esstixeleven.font index 41e9fbe1..d94bd375 100644 --- a/lib/kformula/config/esstixeleven.font +++ b/lib/kformula/config/esstixeleven.font @@ -3,5 +3,5 @@ # Unicode mapping for the esstixeleven font. You can find it at # ftp://ftp.elsevier.nl/pub/styles/esstix/esstix.zip # -# Each line consist of a char position and its tqunicode value. +# Each line consist of a char position and its unicode value. # diff --git a/lib/kformula/config/esstixfifteen.font b/lib/kformula/config/esstixfifteen.font index 920be0c1..3df00e54 100644 --- a/lib/kformula/config/esstixfifteen.font +++ b/lib/kformula/config/esstixfifteen.font @@ -3,5 +3,5 @@ # Unicode mapping for the esstixfifteen font. You can find it at # ftp://ftp.elsevier.nl/pub/styles/esstix/esstix.zip # -# Each line consist of a char position and its tqunicode value. +# Each line consist of a char position and its unicode value. # diff --git a/lib/kformula/config/esstixfive.font b/lib/kformula/config/esstixfive.font index 62724a84..9f57fec2 100644 --- a/lib/kformula/config/esstixfive.font +++ b/lib/kformula/config/esstixfive.font @@ -3,7 +3,7 @@ # Unicode mapping for the esstixfive font. You can find it at # ftp://ftp.elsevier.nl/pub/styles/esstix/esstix.zip # -# Each line consist of a char position and its tqunicode value. +# Each line consist of a char position and its unicode value. # 52, 0x2295 53, 0x2297 diff --git a/lib/kformula/config/esstixfour.font b/lib/kformula/config/esstixfour.font index 411a138a..dc6844b9 100644 --- a/lib/kformula/config/esstixfour.font +++ b/lib/kformula/config/esstixfour.font @@ -3,7 +3,7 @@ # Unicode mapping for the esstixfour font. You can find it at # ftp://ftp.elsevier.nl/pub/styles/esstix/esstix.zip # -# Each line consist of a char position and its tqunicode value. +# Each line consist of a char position and its unicode value. # 56, 0x2291 77, 0x2290 diff --git a/lib/kformula/config/esstixfourteen.font b/lib/kformula/config/esstixfourteen.font index 723a4094..802c47ec 100644 --- a/lib/kformula/config/esstixfourteen.font +++ b/lib/kformula/config/esstixfourteen.font @@ -3,7 +3,7 @@ # Unicode mapping for the esstixfourteen font. You can find it at # ftp://ftp.elsevier.nl/pub/styles/esstix/esstix.zip # -# Each line consist of a char position and its tqunicode value. +# Each line consist of a char position and its unicode value. # 99, 0x2138 97, 0x2135 diff --git a/lib/kformula/config/esstixnine.font b/lib/kformula/config/esstixnine.font index e294bd6d..4f4e6197 100644 --- a/lib/kformula/config/esstixnine.font +++ b/lib/kformula/config/esstixnine.font @@ -3,5 +3,5 @@ # Unicode mapping for the esstixnine font. You can find it at # ftp://ftp.elsevier.nl/pub/styles/esstix/esstix.zip # -# Each line consist of a char position and its tqunicode value. +# Each line consist of a char position and its unicode value. # diff --git a/lib/kformula/config/esstixone.font b/lib/kformula/config/esstixone.font index df3e95ec..9ff6cabf 100644 --- a/lib/kformula/config/esstixone.font +++ b/lib/kformula/config/esstixone.font @@ -3,7 +3,7 @@ # Unicode mapping for the esstixone font. You can find it at # ftp://ftp.elsevier.nl/pub/styles/esstix/esstix.zip # -# Each line consist of a char position and its tqunicode value. +# Each line consist of a char position and its unicode value. # 75, 0x219B 70, 0x219A diff --git a/lib/kformula/config/esstixseven.font b/lib/kformula/config/esstixseven.font index 37650ee1..25a7d01c 100644 --- a/lib/kformula/config/esstixseven.font +++ b/lib/kformula/config/esstixseven.font @@ -3,7 +3,7 @@ # Unicode mapping for the esstixseven font. You can find it at # ftp://ftp.elsevier.nl/pub/styles/esstix/esstix.zip # -# Each line consist of a char position and its tqunicode value. +# Each line consist of a char position and its unicode value. # 61, 0x0028 62, 0x0029 diff --git a/lib/kformula/config/esstixseventeen.font b/lib/kformula/config/esstixseventeen.font index 00df77cd..c3b8f311 100644 --- a/lib/kformula/config/esstixseventeen.font +++ b/lib/kformula/config/esstixseventeen.font @@ -3,5 +3,5 @@ # Unicode mapping for the esstixseventeen font. You can find it at # ftp://ftp.elsevier.nl/pub/styles/esstix/esstix.zip # -# Each line consist of a char position and its tqunicode value. +# Each line consist of a char position and its unicode value. # diff --git a/lib/kformula/config/esstixsix.font b/lib/kformula/config/esstixsix.font index 43e2752c..a6412a58 100644 --- a/lib/kformula/config/esstixsix.font +++ b/lib/kformula/config/esstixsix.font @@ -3,7 +3,7 @@ # Unicode mapping for the esstixsix font. You can find it at # ftp://ftp.elsevier.nl/pub/styles/esstix/esstix.zip # -# Each line consist of a char position and its tqunicode value. +# Each line consist of a char position and its unicode value. # 46, 0x220F 35, 0x222E diff --git a/lib/kformula/config/esstixsixteen.font b/lib/kformula/config/esstixsixteen.font index 2a96c0c1..c212e08d 100644 --- a/lib/kformula/config/esstixsixteen.font +++ b/lib/kformula/config/esstixsixteen.font @@ -3,5 +3,5 @@ # Unicode mapping for the esstixsixteen font. You can find it at # ftp://ftp.elsevier.nl/pub/styles/esstix/esstix.zip # -# Each line consist of a char position and its tqunicode value. +# Each line consist of a char position and its unicode value. # diff --git a/lib/kformula/config/esstixten.font b/lib/kformula/config/esstixten.font index fa9c5ee2..dd4c2b0f 100644 --- a/lib/kformula/config/esstixten.font +++ b/lib/kformula/config/esstixten.font @@ -3,7 +3,7 @@ # Unicode mapping for the esstixten font. You can find it at # ftp://ftp.elsevier.nl/pub/styles/esstix/esstix.zip # -# Each line consist of a char position and its tqunicode value. +# Each line consist of a char position and its unicode value. # 118, 0x2202 86, 0x2207 diff --git a/lib/kformula/config/esstixthirteen.font b/lib/kformula/config/esstixthirteen.font index cee5bf99..fc13f891 100644 --- a/lib/kformula/config/esstixthirteen.font +++ b/lib/kformula/config/esstixthirteen.font @@ -3,5 +3,5 @@ # Unicode mapping for the esstixthirteen font. You can find it at # ftp://ftp.elsevier.nl/pub/styles/esstix/esstix.zip # -# Each line consist of a char position and its tqunicode value. +# Each line consist of a char position and its unicode value. # diff --git a/lib/kformula/config/esstixthree.font b/lib/kformula/config/esstixthree.font index fe359c1f..c55acaeb 100644 --- a/lib/kformula/config/esstixthree.font +++ b/lib/kformula/config/esstixthree.font @@ -3,7 +3,7 @@ # Unicode mapping for the esstixthree font. You can find it at # ftp://ftp.elsevier.nl/pub/styles/esstix/esstix.zip # -# Each line consist of a char position and its tqunicode value. +# Each line consist of a char position and its unicode value. # 101, 0x2204 95, 0x227B diff --git a/lib/kformula/config/esstixtwelve.font b/lib/kformula/config/esstixtwelve.font index 3a4b9d23..b82e5d7f 100644 --- a/lib/kformula/config/esstixtwelve.font +++ b/lib/kformula/config/esstixtwelve.font @@ -3,5 +3,5 @@ # Unicode mapping for the esstixtwelve font. You can find it at # ftp://ftp.elsevier.nl/pub/styles/esstix/esstix.zip # -# Each line consist of a char position and its tqunicode value. +# Each line consist of a char position and its unicode value. # diff --git a/lib/kformula/config/esstixtwo.font b/lib/kformula/config/esstixtwo.font index 201f95e1..ed83909f 100644 --- a/lib/kformula/config/esstixtwo.font +++ b/lib/kformula/config/esstixtwo.font @@ -3,7 +3,7 @@ # Unicode mapping for the esstixtwo font. You can find it at # ftp://ftp.elsevier.nl/pub/styles/esstix/esstix.zip # -# Each line consist of a char position and its tqunicode value. +# Each line consist of a char position and its unicode value. # 100, 0x2203 99, 0x2200 diff --git a/lib/kformula/config/unicode.tbl b/lib/kformula/config/unicode.tbl index d86b1df3..e3e27db8 100644 --- a/lib/kformula/config/unicode.tbl +++ b/lib/kformula/config/unicode.tbl @@ -1,6 +1,6 @@ # -# KFormula tqunicode table -# Each line contains the tqunicode value, the char class +# KFormula unicode table +# Each line contains the unicode value, the char class # (ORDINARY, BINOP or RELATION) and optionally the # chars TeX name. # diff --git a/lib/kformula/elementtype.cc b/lib/kformula/elementtype.cc index a2e44ee6..bd2c3373 100644 --- a/lib/kformula/elementtype.cc +++ b/lib/kformula/elementtype.cc @@ -406,9 +406,9 @@ void AbstractOperatorType::saveMathML( SequenceElement* se, TQDomDocument& doc, op.appendChild( doc.createTextNode( be->getCharacter() ) ); } else { - // tqunicode char + // unicode char TQString s; - op.appendChild( doc.createEntityReference( s.sprintf( "#x%05X", be->getCharacter().tqunicode() ) ) ); + op.appendChild( doc.createEntityReference( s.sprintf( "#x%05X", be->getCharacter().unicode() ) ) ); } TextElement* te = static_cast<TextElement*>( be ); TQString mathvariant = format2variant( te->getCharStyle(), te->getCharFamily() ); diff --git a/lib/kformula/entities.h b/lib/kformula/entities.h index 78e39315..38a5a0e8 100644 --- a/lib/kformula/entities.h +++ b/lib/kformula/entities.h @@ -38,7 +38,7 @@ struct entityMap { return strcmp( name, right ) < 0; } const char* name; - const uint tqunicode; + const uint unicode; }; extern const entityMap entities[]; diff --git a/lib/kformula/fontstyle.h b/lib/kformula/fontstyle.h index 8132bbb6..9fcd78b7 100644 --- a/lib/kformula/fontstyle.h +++ b/lib/kformula/fontstyle.h @@ -48,7 +48,7 @@ public: */ bool init( ContextStyle* context, bool install = true ); - /// the table for ordinary symbols (those that have a tqunicode value) + /// the table for ordinary symbols (those that have a unicode value) const SymbolTable* symbolTable() const { return &m_symbolTable; } SymbolTable* symbolTable() { return &m_symbolTable; } diff --git a/lib/kformula/glyphelement.cc b/lib/kformula/glyphelement.cc index db509eef..709609cf 100644 --- a/lib/kformula/glyphelement.cc +++ b/lib/kformula/glyphelement.cc @@ -152,7 +152,7 @@ void GlyphElement::draw( TQPainter& painter, const LuPixelRect& /*r*/, void GlyphElement::writeMathMLAttributes( TQDomElement& element ) const { element.setAttribute( "fontfamily", m_fontFamily ); - element.setAttribute( "index", m_char.tqunicode() ); + element.setAttribute( "index", m_char.unicode() ); element.setAttribute( "alt", m_alt ); } diff --git a/lib/kformula/kformulacompatibility.h b/lib/kformula/kformulacompatibility.h index 9be5c7ba..a221854c 100644 --- a/lib/kformula/kformulacompatibility.h +++ b/lib/kformula/kformulacompatibility.h @@ -51,8 +51,8 @@ private: TQDomElement findIndexNode(const TQDomDocument& doc, TQDomElement sequence); - ushort nextToken() { return formulaString[pos++].tqunicode(); } - ushort lookAhead(uint i) const { return formulaString[pos+i].tqunicode(); } + ushort nextToken() { return formulaString[pos++].unicode(); } + ushort lookAhead(uint i) const { return formulaString[pos+i].unicode(); } void pushback() { pos--; } bool hasNext() const { return pos < formulaString.length(); } diff --git a/lib/kformula/kformulaconfigpage.cc b/lib/kformula/kformulaconfigpage.cc index 21c3b946..87160a98 100644 --- a/lib/kformula/kformulaconfigpage.cc +++ b/lib/kformula/kformulaconfigpage.cc @@ -63,7 +63,7 @@ ConfigurePage::ConfigurePage( Document* document, TQWidget* view, KConfig* confi TQGroupBox *gbox = new TQGroupBox( i18n( "Fonts" ), box ); gbox->setColumnLayout( 0, Qt::Horizontal ); - TQGridLayout* grid = new TQGridLayout( gbox->tqlayout(), 5, 3 ); + TQGridLayout* grid = new TQGridLayout( gbox->layout(), 5, 3 ); grid->setSpacing( KDialog::spacingHint() ); grid->setColStretch(1, 1); @@ -108,7 +108,7 @@ ConfigurePage::ConfigurePage( Document* document, TQWidget* view, KConfig* confi // hlBox = new TQGroupBox( i18n( "Highlight Colors" ), box ); // hlBox->setColumnLayout( 0, Qt::Horizontal ); -// grid = new TQGridLayout( hlBox->tqlayout(), 5, 2 ); +// grid = new TQGridLayout( hlBox->layout(), 5, 2 ); // grid->setSpacing( KDialog::spacingHint() ); // TQLabel* defaultLabel = new TQLabel( hlBox, "defaultLabel" ); @@ -168,7 +168,7 @@ ConfigurePage::ConfigurePage( Document* document, TQWidget* view, KConfig* confi TQPushButton* ConfigurePage::buildFontLine( TQWidget* parent, - TQGridLayout* tqlayout, int number, TQFont font, TQString name, + TQGridLayout* layout, int number, TQFont font, TQString name, TQLabel*& fontName ) { TQLabel* fontTitle = new TQLabel( name, parent ); @@ -180,9 +180,9 @@ TQPushButton* ConfigurePage::buildFontLine( TQWidget* parent, TQPushButton* chooseButton = new TQPushButton( i18n( "Choose..." ), parent ); - tqlayout->addWidget( fontTitle, number, 0 ); - tqlayout->addWidget( fontName, number, 1 ); - tqlayout->addWidget( chooseButton, number, 2 ); + layout->addWidget( fontTitle, number, 0 ); + layout->addWidget( fontName, number, 1 ); + layout->addWidget( chooseButton, number, 2 ); return chooseButton; } diff --git a/lib/kformula/kformulaconfigpage.h b/lib/kformula/kformulaconfigpage.h index e3ff716a..2649ffa3 100644 --- a/lib/kformula/kformulaconfigpage.h +++ b/lib/kformula/kformulaconfigpage.h @@ -76,7 +76,7 @@ protected slots: private: - TQPushButton* buildFontLine( TQWidget* fontWidget, TQGridLayout* tqlayout, int number, + TQPushButton* buildFontLine( TQWidget* fontWidget, TQGridLayout* layout, int number, TQFont font, TQString name, TQLabel*& fontName ); void updateFontLabel( TQFont font, TQLabel* label ); diff --git a/lib/kformula/kformulacontainer.cc b/lib/kformula/kformulacontainer.cc index f533db86..4d4aa96c 100644 --- a/lib/kformula/kformulacontainer.cc +++ b/lib/kformula/kformulacontainer.cc @@ -339,7 +339,7 @@ void Container::paste() { if (!hasValidCursor()) return; - TQClipboard* clipboard = TQApplication::tqclipboard(); + TQClipboard* clipboard = TQApplication::clipboard(); const TQMimeSource* source = clipboard->data(); if (source->provides( MimeSource::selectionMimeType() )) { TQByteArray data = source->encodedData( MimeSource::selectionMimeType() ); @@ -374,7 +374,7 @@ void Container::copy() if (cursor != 0) { TQDomDocument formula = document()->createMathMLDomDocument(); cursor->copy( formula ); - TQClipboard* clipboard = TQApplication::tqclipboard(); + TQClipboard* clipboard = TQApplication::clipboard(); clipboard->setData(new MimeSource(document(), formula)); } } diff --git a/lib/kformula/kformuladefs.h b/lib/kformula/kformuladefs.h index 80879f98..855121c7 100644 --- a/lib/kformula/kformuladefs.h +++ b/lib/kformula/kformuladefs.h @@ -163,7 +163,7 @@ enum TokenElementType { * The struct used to store static font data. */ struct InternFontTable { - short tqunicode; + short unicode; TQChar pos; CharClass cl; CharStyle style; diff --git a/lib/kformula/kformuladocument.cc b/lib/kformula/kformuladocument.cc index 9caa66cb..ecd621ee 100644 --- a/lib/kformula/kformuladocument.cc +++ b/lib/kformula/kformuladocument.cc @@ -200,7 +200,7 @@ TQDomDocument Document::createDomDocument() } /** - * Create a MathML Dom Document, deprecates KFO Dom Document for internal tqlayout + * Create a MathML Dom Document, deprecates KFO Dom Document for internal layout * TODO: Shouldn't this go to KoDocument ? */ TQDomDocument Document::createMathMLDomDocument() @@ -969,7 +969,7 @@ void DocumentWrapper::insertSymbol() { if ( hasFormula() && m_document->m_contextStyle->symbolTable().contains( m_selectedName ) ) { - TQChar ch = m_document->m_contextStyle->symbolTable().tqunicode( m_selectedName ); + TQChar ch = m_document->m_contextStyle->symbolTable().unicode( m_selectedName ); if ( ch != TQChar::null ) { TextCharRequest r( ch, true ); formula()->performRequest( &r ); @@ -985,7 +985,7 @@ void DocumentWrapper::insertSymbol( TQString name ) { if ( hasFormula() ) { if ( m_document->m_contextStyle->symbolTable().contains( name ) ) { - TQChar ch = m_document->m_contextStyle->symbolTable().tqunicode( name ); + TQChar ch = m_document->m_contextStyle->symbolTable().unicode( name ); if ( ch != TQChar::null ) { TextCharRequest r( ch, true ); formula()->performRequest( &r ); @@ -1174,7 +1174,7 @@ void DocumentWrapper::initSymbolNamesAction() for ( TQStringList::Iterator it = names.begin(); it != names.end(); ++it, ++i ) { - chars[ i ] = st.tqunicode( *it ); + chars[ i ] = st.unicode( *it ); } m_symbolNamesAction->setSymbols( names, m_document->m_contextStyle->getMathFont(), chars ); m_selectedName = names[0]; diff --git a/lib/kformula/kformuladocument.h b/lib/kformula/kformuladocument.h index 46de5774..4d757262 100644 --- a/lib/kformula/kformuladocument.h +++ b/lib/kformula/kformuladocument.h @@ -188,7 +188,7 @@ public: static TQDomDocument createDomDocument(); /** - * Create a MathML Dom Document, deprecates KFO Dom Document for internal tqlayout + * Create a MathML Dom Document, deprecates KFO Dom Document for internal layout * TODO: Shouldn't this go to KoDocument ? */ TQDomDocument createMathMLDomDocument(); diff --git a/lib/kformula/main.cc b/lib/kformula/main.cc index 57344739..56a9e837 100644 --- a/lib/kformula/main.cc +++ b/lib/kformula/main.cc @@ -277,7 +277,7 @@ int main(int argc, char** argv) // Make sure there are no elements in the clipboard. // Okey for a debug app. - TQApplication::tqclipboard()->clear(); + TQApplication::clipboard()->clear(); int destruct = BasicElement::getEvilDestructionCount(); if (destruct != 0) { diff --git a/lib/kformula/prototype/gensymbolfontmap.py b/lib/kformula/prototype/gensymbolfontmap.py index 0f9f3a11..a1373815 100644 --- a/lib/kformula/prototype/gensymbolfontmap.py +++ b/lib/kformula/prototype/gensymbolfontmap.py @@ -3,7 +3,7 @@ import time from xml.sax import saxutils, handler, make_parser -tqunicodetable = { "normal":{}, "bold":{}, "italic":{}, +unicodetable = { "normal":{}, "bold":{}, "italic":{}, "slant":{}, "boldItalic":{} } fonttable = {} @@ -14,7 +14,7 @@ class ContentGenerator(handler.ContentHandler): self.font = None def startElement(self, name, attrs): - if name == 'tqunicodetable': + if name == 'unicodetable': self.font = None for (name, value) in attrs.items(): if name == "font" and value: @@ -31,7 +31,7 @@ class ContentGenerator(handler.ContentHandler): elif name == "style": style = value if number != '': - tqunicodetable[style][number] = (latexName, charClass) + unicodetable[style][number] = (latexName, charClass) fonttable[self.font].append((key, number, style)) def fontkey(font, style, number): @@ -43,9 +43,9 @@ def fontkey(font, style, number): def writeFontTable(fontname, f): f.write('\n\nstatic InternFontTable ' + fontname + 'Map[] = {\n') - for style in tqunicodetable: - for key in tqunicodetable[style]: - latexName, charClass = tqunicodetable[style][key] + for style in unicodetable: + for key in unicodetable[style]: + latexName, charClass = unicodetable[style][key] pos = fontkey(fontname, style, key) if pos: f.write(' { ' + key + ', ' + hex(pos) + ', ' + charClass + ', ' + style + 'Char },\n') @@ -107,14 +107,14 @@ def main(): writeFontTable(fn, f) f.close() - f = open('../tqunicodenames.cc', 'w') + f = open('../unicodenames.cc', 'w') write_header(f) - print >>f, 'struct UnicodeNameTable { short tqunicode; const char* name; };' + print >>f, 'struct UnicodeNameTable { short unicode; const char* name; };' print >>f, 'static UnicodeNameTable nameTable[] = {' nameDir = {} table = {} - for style in tqunicodetable: - table.update(tqunicodetable[style]) + for style in unicodetable: + table.update(unicodetable[style]) for key in table: latexName, charClass = table[key] @@ -128,10 +128,10 @@ def main(): -def make_tqunicode_table(): +def make_unicode_table(): header = [] codes = {} - f = open('../config/tqunicode.tbl', 'r') + f = open('../config/unicode.tbl', 'r') for line in f.xreadlines(): if line[0] == '#': header.append(line.strip()) @@ -142,14 +142,14 @@ def make_tqunicode_table(): codes[line.split(',')[0].strip()] = line f.close() - for key in tqunicodetable: - latexName, charClass = tqunicodetable[key] + for key in unicodetable: + latexName, charClass = unicodetable[key] if len(latexName) > 0: codes[key] = key + ', ' + charClass + ', ' + latexName.replace('\\', '') else: codes[key] = key + ', ' + charClass - f = open('../config/tqunicode.tbl', 'w') + f = open('../config/unicode.tbl', 'w') for line in header: print >> f, line for key in codes: @@ -174,8 +174,8 @@ def make_font_table(font): ## for line in header: ## print >> f, line #print >> f, "name = " + font - for key in tqunicodetable: - latexName, charClass = tqunicodetable[key] + for key in unicodetable: + latexName, charClass = unicodetable[key] pos = fontkey(font, key) if pos: print >> f, str(pos), key, charClass, latexName @@ -186,30 +186,30 @@ def make_all_font_tables(): make_font_table(font) -def symbol_entry(pos, tqunicode, charClass, name): +def symbol_entry(pos, unicode, charClass, name): return ' <entry key="%d" number="%s" name="%s" class="%s"/>' % \ - (pos, tqunicode, name, charClass) + (pos, unicode, name, charClass) def compare_font(font): for line in file(font+".font"): list = line.split() pos = int(list[0]) - tqunicode = list[1] + unicode = list[1] charClass = list[2] if len(list)>3: name = list[3] else: name = "" - if (pos, tqunicode) not in fonttable[font]: - print "not in font", font, (pos, tqunicode) - print symbol_entry(pos, tqunicode, charClass, name) - if tqunicode not in tqunicodetable: - print font, tqunicode, (name, charClass) - print symbol_entry(pos, tqunicode, charClass, name) - elif tqunicodetable[tqunicode] != (name, charClass): - print font, tqunicode, pos, tqunicodetable[tqunicode], "!=", (name, charClass) + if (pos, unicode) not in fonttable[font]: + print "not in font", font, (pos, unicode) + print symbol_entry(pos, unicode, charClass, name) + if unicode not in unicodetable: + print font, unicode, (name, charClass) + print symbol_entry(pos, unicode, charClass, name) + elif unicodetable[unicode] != (name, charClass): + print font, unicode, pos, unicodetable[unicode], "!=", (name, charClass) def compare(): fontnames = [ "symbol", @@ -241,10 +241,10 @@ if __name__ == '__main__': parser.parse("symbol.xml") #print fonttable - #print tqunicodetable + #print unicodetable #compare() main() - #make_tqunicode_table() + #make_unicode_table() #make_all_font_tables() diff --git a/lib/kformula/prototype/unicode.py b/lib/kformula/prototype/unicode.py index 585574cf..3559711d 100755 --- a/lib/kformula/prototype/unicode.py +++ b/lib/kformula/prototype/unicode.py @@ -130,7 +130,7 @@ class Widget(QWidget): print >> f, '<?xml version="1.0" encoding="iso-8859-1"?>' print >> f, '<table>' for font in self.fonts: - print >> f, ' <tqunicodetable font="' + font + '">' + print >> f, ' <unicodetable font="' + font + '">' for (key, number, latexName, charClass) in self.fonts[font]: if not charClass or charClass == '': charClass = 'ORDINARY' @@ -140,7 +140,7 @@ class Widget(QWidget): '" class="' + str(charClass) + \ '"/>' - print >> f, ' </tqunicodetable>' + print >> f, ' </unicodetable>' print >> f, '</table>' f.close() @@ -152,7 +152,7 @@ class ContentGenerator(handler.ContentHandler): self.currentFont = None def startElement(self, name, attrs): - if name == 'tqunicodetable': + if name == 'unicodetable': for (name, value) in attrs.items(): if name == "font": self.currentFont = value diff --git a/lib/kformula/scripts/bycodes.py b/lib/kformula/scripts/bycodes.py index 35b79a55..16d71959 100755 --- a/lib/kformula/scripts/bycodes.py +++ b/lib/kformula/scripts/bycodes.py @@ -25,11 +25,11 @@ import qt def decode( fd, font, line ): begin = string.find( line, '"' ) end = string.find( line, '"', begin + 1) - tqunicode = line[begin + 2:end] # Remove 'U' from string aswell + unicode = line[begin + 2:end] # Remove 'U' from string aswell char_list = [] - separation = string.find( tqunicode, '-' ) + separation = string.find( unicode, '-' ) if separation != -1: - second = tqunicode + second = unicode while separation != -1: first = second[0:separation] second = second[separation + 2:] @@ -38,13 +38,13 @@ def decode( fd, font, line ): if separation == -1: char_list.append( string.atoi( second, 16 ) ) else: - char_list.append( string.atoi ( tqunicode, 16 ) ) + char_list.append( string.atoi ( unicode, 16 ) ) fm = qt.QFontMetrics( qt.QFont( font ) ) in_font = True for c in char_list: if not fm.inFont( qt.QChar( c ) ): in_font = False - fd.write( tqunicode + ' ' + str( in_font ) + '\n') + fd.write( unicode + ' ' + str( in_font ) + '\n') def parse( file, font ): fd = open( file ) diff --git a/lib/kformula/scripts/bynames.py b/lib/kformula/scripts/bynames.py index 0829cf90..afb9ece5 100755 --- a/lib/kformula/scripts/bynames.py +++ b/lib/kformula/scripts/bynames.py @@ -66,7 +66,7 @@ struct entityMap { return qstrcmp( name, right ) < 0; } const char* name; - const uint tqunicode; + const uint unicode; }; extern const entityMap entities[]; diff --git a/lib/kformula/sequenceelement.cc b/lib/kformula/sequenceelement.cc index c44c1b50..e3573174 100644 --- a/lib/kformula/sequenceelement.cc +++ b/lib/kformula/sequenceelement.cc @@ -1184,7 +1184,7 @@ KCommand* SequenceElement::buildCommand( Container* container, Request* request const SymbolTable& table = container->document()->getSymbolTable(); if (table.greekLetters().find(element->getCharacter()) != -1) { KFCReplace* command = new KFCReplace( i18n( "Change Char to Symbol" ), container ); - TextElement* symbol = creationStrategy->createTextElement( table.tqunicodeFromSymbolFont( element->getCharacter() ), true ); + TextElement* symbol = creationStrategy->createTextElement( table.unicodeFromSymbolFont( element->getCharacter() ), true ); command->addElement( symbol ); return command; } @@ -1311,8 +1311,8 @@ KCommand* SequenceElement::input( Container* container, TQKeyEvent* event ) KCommand* SequenceElement::input( Container* container, TQChar ch ) { - int tqunicode = ch.tqunicode(); - switch (tqunicode) { + int unicode = ch.unicode(); + switch (unicode) { case '(': { BracketRequest r( container->document()->leftBracketChar(), container->document()->rightBracketChar() ); @@ -1700,8 +1700,8 @@ KCommand* NameSequence::buildCommand( Container* container, Request* request ) KCommand* NameSequence::input( Container* container, TQChar ch ) { - int tqunicode = ch.tqunicode(); - switch (tqunicode) { + int unicode = ch.unicode(); + switch (unicode) { case '(': case '[': case '|': @@ -1746,12 +1746,12 @@ void NameSequence::setElementType( ElementType* t ) BasicElement* NameSequence::replaceElement( const SymbolTable& table ) { TQString name = buildName(); - TQChar ch = table.tqunicode( name ); + TQChar ch = table.unicode( name ); if ( !ch.isNull() ) { return new TextElement( ch, true ); } else { - ch = table.tqunicode( i18n( name.latin1() ) ); + ch = table.unicode( i18n( name.latin1() ) ); if ( !ch.isNull() ) { return new TextElement( ch, true ); } diff --git a/lib/kformula/symboltable.cc b/lib/kformula/symboltable.cc index 9b27871b..83de81c9 100644 --- a/lib/kformula/symboltable.cc +++ b/lib/kformula/symboltable.cc @@ -44,12 +44,12 @@ KFORMULA_NAMESPACE_BEGIN SymbolFontHelper::SymbolFontHelper() : greek("abgdezhqiklmnxpvrstufjcywGDTQLXPSUFYVW") { - for ( uint i = 0; symbolMap[ i ].tqunicode != 0; i++ ) { - compatibility[ symbolMap[ i ].pos ] = symbolMap[ i ].tqunicode; + for ( uint i = 0; symbolMap[ i ].unicode != 0; i++ ) { + compatibility[ symbolMap[ i ].pos ] = symbolMap[ i ].unicode; } } -TQChar SymbolFontHelper::tqunicodeFromSymbolFont( TQChar pos ) const +TQChar SymbolFontHelper::unicodeFromSymbolFont( TQChar pos ) const { if ( compatibility.contains( pos ) ) { return compatibility[ pos.latin1() ]; @@ -66,17 +66,17 @@ SymbolTable::SymbolTable() void SymbolTable::init( const TQFont& font ) { backupFont = font; - for ( int i=0; operatorTable[i].tqunicode != 0; ++i ) { - names[TQChar( operatorTable[i].tqunicode )] = get_name( operatorTable[i] ); - entries[get_name( operatorTable[i] )] = TQChar( operatorTable[i].tqunicode ); + for ( int i=0; operatorTable[i].unicode != 0; ++i ) { + names[TQChar( operatorTable[i].unicode )] = get_name( operatorTable[i] ); + entries[get_name( operatorTable[i] )] = TQChar( operatorTable[i].unicode ); } - for ( int i=0; arrowTable[i].tqunicode != 0; ++i ) { - names[TQChar( arrowTable[i].tqunicode )] = get_name( arrowTable[i] ); - entries[get_name( arrowTable[i] )] = TQChar( arrowTable[i].tqunicode ); + for ( int i=0; arrowTable[i].unicode != 0; ++i ) { + names[TQChar( arrowTable[i].unicode )] = get_name( arrowTable[i] ); + entries[get_name( arrowTable[i] )] = TQChar( arrowTable[i].unicode ); } - for ( int i=0; greekTable[i].tqunicode != 0; ++i ) { - names[TQChar( greekTable[i].tqunicode )] = get_name( greekTable[i] ); - entries[get_name( greekTable[i] )] = TQChar( greekTable[i].tqunicode ); + for ( int i=0; greekTable[i].unicode != 0; ++i ) { + names[TQChar( greekTable[i].unicode )] = get_name( greekTable[i] ); + entries[get_name( greekTable[i] )] = TQChar( greekTable[i].unicode ); } } @@ -85,7 +85,7 @@ bool SymbolTable::contains(TQString name) const return entries.find( name ) != entries.end(); } -TQChar SymbolTable::tqunicode(TQString name) const +TQChar SymbolTable::unicode(TQString name) const { return entries[ name ]; } @@ -112,9 +112,9 @@ CharClass SymbolTable::charClass( TQChar symbol ) const } -TQChar SymbolTable::tqunicodeFromSymbolFont( TQChar pos ) const +TQChar SymbolTable::unicodeFromSymbolFont( TQChar pos ) const { - return symbolFontHelper.tqunicodeFromSymbolFont( pos ); + return symbolFontHelper.unicodeFromSymbolFont( pos ); } @@ -128,13 +128,13 @@ TQStringList SymbolTable::allNames() const { TQStringList list; - for ( int i=0; operatorTable[i].tqunicode != 0; ++i ) { + for ( int i=0; operatorTable[i].unicode != 0; ++i ) { list.append( get_name( operatorTable[i] )); } - for ( int i=0; arrowTable[i].tqunicode != 0; ++i ) { + for ( int i=0; arrowTable[i].unicode != 0; ++i ) { list.append( get_name( arrowTable[i] )); } - for ( int i=0; greekTable[i].tqunicode != 0; ++i ) { + for ( int i=0; greekTable[i].unicode != 0; ++i ) { list.append( get_name( greekTable[i] ) ); } return list; @@ -144,7 +144,7 @@ TQStringList SymbolTable::allNames() const TQString SymbolTable::get_name( struct UnicodeNameTable entry ) const { if ( !*entry.name ) { - return "U" + TQString( "%1" ).arg( entry.tqunicode, 4, 16 ).upper(); + return "U" + TQString( "%1" ).arg( entry.unicode, 4, 16 ).upper(); } return entry.name; } diff --git a/lib/kformula/symboltable.h b/lib/kformula/symboltable.h index d4a19f03..7820af81 100644 --- a/lib/kformula/symboltable.h +++ b/lib/kformula/symboltable.h @@ -51,14 +51,14 @@ public: TQString greekLetters() const { return greek; } /** - * @returns the tqunicode value of the symbol font char. + * @returns the unicode value of the symbol font char. */ - TQChar tqunicodeFromSymbolFont( TQChar pos ) const; + TQChar unicodeFromSymbolFont( TQChar pos ) const; private: /** - * symbol font char -> tqunicode mapping. + * symbol font char -> unicode mapping. */ TQMap<TQChar, TQChar> compatibility; @@ -91,7 +91,7 @@ public: * @returns the char in the symbol font that belongs to * the given name. */ - TQChar tqunicode( TQString name ) const; + TQChar unicode( TQString name ) const; TQString name( TQChar symbol ) const; TQFont font( TQChar symbol, const TQFont& f ) const; @@ -104,9 +104,9 @@ public: TQString greekLetters() const; /** - * @returns the tqunicode value of the symbol font char. + * @returns the unicode value of the symbol font char. */ - TQChar tqunicodeFromSymbolFont( TQChar pos ) const; + TQChar unicodeFromSymbolFont( TQChar pos ) const; /** * @returns all known names as strings. @@ -121,12 +121,12 @@ private: TQString get_name( UnicodeNameTable entry ) const; /** - * tqunicode -> name mapping. + * unicode -> name mapping. */ NameTable names; /** - * Name -> tqunicode mapping. + * Name -> unicode mapping. */ EntryTable entries; diff --git a/lib/kformula/textelement.cc b/lib/kformula/textelement.cc index 8789377c..7f146b49 100644 --- a/lib/kformula/textelement.cc +++ b/lib/kformula/textelement.cc @@ -66,7 +66,7 @@ TokenType TextElement::getTokenType() const return getSymbolTable().charClass( character ); } - switch ( character.tqunicode() ) { + switch ( character.unicode() ) { case '+': case '-': case '*': @@ -202,7 +202,7 @@ void TextElement::draw( TQPainter& painter, const LuPixelRect& /*r*/, ElementType* token = getElementType(); if ( ( token != 0 ) && !symbol ) { TQString text = token->text( static_cast<SequenceElement*>( getParent() ) ); -// kdDebug() << "draw text: " << text[0].tqunicode() +// kdDebug() << "draw text: " << text[0].unicode() // << " " << painter.font().family().latin1() // << endl; painter.fillRect( context.layoutUnitToPixelX( parentOrigin.x() ), @@ -401,10 +401,10 @@ bool TextElement::readAttributesFromDom(TQDomElement element) if(!symbolStr.isNull()) { int symbolInt = symbolStr.toInt(); if ( symbolInt == 1 ) { - character = getSymbolTable().tqunicodeFromSymbolFont(character); + character = getSymbolTable().unicodeFromSymbolFont(character); } if ( symbolInt == 2 ) { - switch ( character.tqunicode() ) { + switch ( character.unicode() ) { case 0x03D5: character = 0x03C6; break; case 0x03C6: character = 0x03D5; break; case 0x03Ba: character = 0x03BA; break; diff --git a/lib/kformula/tokenelement.cc b/lib/kformula/tokenelement.cc index eda9c0dc..6addc385 100644 --- a/lib/kformula/tokenelement.cc +++ b/lib/kformula/tokenelement.cc @@ -67,7 +67,7 @@ int TokenElement::buildChildrenFromMathMLDom(TQPtrList<BasicElement>& list, TQDo kdWarning() << "Invalid entity refererence: " << entity << endl; } else { - TextElement* child = new TextElement( TQChar( pos->tqunicode ) ); + TextElement* child = new TextElement( TQChar( pos->unicode ) ); child->setParent(this); child->setCharFamily( charFamily() ); child->setCharStyle( charStyle() ); diff --git a/lib/kformula/unicodetable.cc b/lib/kformula/unicodetable.cc index ad9a7f74..23dc8636 100644 --- a/lib/kformula/unicodetable.cc +++ b/lib/kformula/unicodetable.cc @@ -19,7 +19,7 @@ KFORMULA_NAMESPACE_BEGIN -struct UnicodeNameTable { short tqunicode; const char* name; }; +struct UnicodeNameTable { short unicode; const char* name; }; static UnicodeNameTable greekTable[] = { { 0x03B1, "alpha" }, diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp index fd790991..f881293a 100644 --- a/lib/kofficecore/KoDocument.cpp +++ b/lib/kofficecore/KoDocument.cpp @@ -1222,7 +1222,7 @@ TQPixmap KoDocument::generatePreview( const TQSize& size ) docHeight = m_pageLayout.ptHeight / 72 * KoGlobal::dpiY(); } else { - // If we don't have a page tqlayout, just draw the top left hand corner + // If we don't have a page layout, just draw the top left hand corner docWidth = 500.0; docHeight = 500.0; } @@ -2656,7 +2656,7 @@ bool KoDocument::showEmbedInitDialog(TQWidget* parent) { KDialogBase dlg(parent, "EmbedInitDialog", true, i18n("Embedding Object"), 0, KDialogBase::NoDefault); KoOpenPane* pane = createOpenPane(&dlg, instance(), templateType()); - pane->tqlayout()->setMargin(0); + pane->layout()->setMargin(0); dlg.setMainWidget(pane); dlg.setInitialSize(dlg.configDialogSize("EmbedInitDialog")); connect(this, TQT_SIGNAL(closeEmbedInitDialog()), &dlg, TQT_SLOT(slotOk())); diff --git a/lib/kofficecore/KoDocument.h b/lib/kofficecore/KoDocument.h index df1518de..1a5d0805 100644 --- a/lib/kofficecore/KoDocument.h +++ b/lib/kofficecore/KoDocument.h @@ -741,7 +741,7 @@ public: virtual bool isStoredExtern() const; /** - * @return the page tqlayout associated with this document (margins, pageSize, etc). + * @return the page layout associated with this document (margins, pageSize, etc). * Override this if you want to provide different sized pages. * * @see KoPageLayout diff --git a/lib/kofficecore/KoDocumentChild.cpp b/lib/kofficecore/KoDocumentChild.cpp index 8c6fe16f..c71c7609 100644 --- a/lib/kofficecore/KoDocumentChild.cpp +++ b/lib/kofficecore/KoDocumentChild.cpp @@ -454,7 +454,7 @@ void KoDocumentChild::saveOasisAttributes( KoXmlWriter &xmlWriter, const TQStrin d->m_doc->setURL( u ); } - //<draw:object draw:style-name="standard" draw:id="1" draw:layer="tqlayout" svg:width="14.973cm" svg:height="4.478cm" svg:x="11.641cm" svg:y="14.613cm" xlink:href="#./Object 1" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/> + //<draw:object draw:style-name="standard" draw:id="1" draw:layer="layout" svg:width="14.973cm" svg:height="4.478cm" svg:x="11.641cm" svg:y="14.613cm" xlink:href="#./Object 1" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/> xmlWriter.addAttribute( "xlink:type", "simple" ); xmlWriter.addAttribute( "xlink:show", "embed" ); xmlWriter.addAttribute( "xlink:actuate", "onLoad" ); diff --git a/lib/kofficecore/KoFilterManager.cpp b/lib/kofficecore/KoFilterManager.cpp index bcd56f75..f1bf2229 100644 --- a/lib/kofficecore/KoFilterManager.cpp +++ b/lib/kofficecore/KoFilterManager.cpp @@ -59,13 +59,13 @@ KoFilterChooser::KoFilterChooser (TQWidget *parent, const TQStringList &mimeType setMainWidget (page); // looks too squashed together without * 2 - TQVBoxLayout *tqlayout = new TQVBoxLayout (page, marginHint (), spacingHint () * 2); + TQVBoxLayout *layout = new TQVBoxLayout (page, marginHint (), spacingHint () * 2); TQLabel *filterLabel = new TQLabel (i18n ("Select a filter:"), page, "filterlabel"); - tqlayout->addWidget (filterLabel); + layout->addWidget (filterLabel); m_filterList = new KListBox (page, "filterlist"); - tqlayout->addWidget (m_filterList); + layout->addWidget (m_filterList); Q_ASSERT (!m_mimeTypes.isEmpty ()); for (TQStringList::ConstIterator it = m_mimeTypes.begin (); diff --git a/lib/kofficecore/KoGenStyles.h b/lib/kofficecore/KoGenStyles.h index 2a54f944..d7516732 100644 --- a/lib/kofficecore/KoGenStyles.h +++ b/lib/kofficecore/KoGenStyles.h @@ -274,7 +274,7 @@ public: { /** * DefaultType depends on family: e.g. paragraph-properties if family=paragraph - * or on the type of style (e.g. page-tqlayout -> page-tqlayout-properties). + * or on the type of style (e.g. page-layout -> page-layout-properties). * (In fact that tag name is the one passed to writeStyle) */ DefaultType = 0, diff --git a/lib/kofficecore/KoOasisStyles.cpp b/lib/kofficecore/KoOasisStyles.cpp index fe88a11b..0f173658 100644 --- a/lib/kofficecore/KoOasisStyles.cpp +++ b/lib/kofficecore/KoOasisStyles.cpp @@ -194,9 +194,9 @@ void KoOasisStyles::insertStyle( const TQDomElement& e, bool styleAutoStyles ) //kdDebug(30003) << "Style: '" << name << "' loaded " << endl; } } else if ( ns == KoXmlNS::style && ( - localName == "page-tqlayout" + localName == "page-layout" || localName == "font-decl" - || localName == "presentation-page-tqlayout" ) ) + || localName == "presentation-page-layout" ) ) { if ( m_styles.find( name ) != 0 ) kdDebug(30003) << "Style: '" << name << "' already exists" << endl; diff --git a/lib/kofficecore/KoOasisStyles.h b/lib/kofficecore/KoOasisStyles.h index dfa9e468..e73eab0e 100644 --- a/lib/kofficecore/KoOasisStyles.h +++ b/lib/kofficecore/KoOasisStyles.h @@ -47,8 +47,8 @@ public: /** * Look up a style by name. - * This method can find styles defined by the tags "style:page-tqlayout", - * "style:presentation-page-tqlayout", or "style:font-decl". + * This method can find styles defined by the tags "style:page-layout", + * "style:presentation-page-layout", or "style:font-decl". * Do NOT use this method for style:style styles. * * @param name the style name @@ -148,7 +148,7 @@ private: KoOasisStyles& operator=( const KoOasisStyles & ); // forbidden private: - TQDict<TQDomElement> m_styles; // page-tqlayout, font-decl etc. + TQDict<TQDomElement> m_styles; // page-layout, font-decl etc. TQDict<TQDomElement> m_defaultStyle; TQDomElement m_officeStyle; diff --git a/lib/kofficecore/KoPageLayout.cpp b/lib/kofficecore/KoPageLayout.cpp index d01ca6db..c3965d45 100644 --- a/lib/kofficecore/KoPageLayout.cpp +++ b/lib/kofficecore/KoPageLayout.cpp @@ -59,7 +59,7 @@ KoGenStyle KoPageLayout::saveOasis() const void KoPageLayout::loadOasis(const TQDomElement &style) { - TQDomElement properties( KoDom::namedItemNS( style, KoXmlNS::style, "page-tqlayout-properties" ) ); + TQDomElement properties( KoDom::namedItemNS( style, KoXmlNS::style, "page-layout-properties" ) ); if ( !properties.isNull() ) { ptWidth = KoUnit::parseValue(properties.attributeNS( KoXmlNS::fo, "page-width", TQString() ) ); @@ -82,18 +82,18 @@ void KoPageLayout::loadOasis(const TQDomElement &style) KoPageLayout KoPageLayout::standardLayout() { - KoPageLayout tqlayout; - tqlayout.format = KoPageFormat::defaultFormat(); - tqlayout.orientation = PG_PORTRAIT; - tqlayout.ptWidth = MM_TO_POINT( KoPageFormat::width( tqlayout.format, tqlayout.orientation ) ); - tqlayout.ptHeight = MM_TO_POINT( KoPageFormat::height( tqlayout.format, tqlayout.orientation ) ); - tqlayout.ptLeft = MM_TO_POINT( 20.0 ); - tqlayout.ptRight = MM_TO_POINT( 20.0 ); - tqlayout.ptTop = MM_TO_POINT( 20.0 ); - tqlayout.ptBottom = MM_TO_POINT( 20.0 ); - tqlayout.ptPageEdge = -1; - tqlayout.ptBindingSide = -1; - return tqlayout; + KoPageLayout layout; + layout.format = KoPageFormat::defaultFormat(); + layout.orientation = PG_PORTRAIT; + layout.ptWidth = MM_TO_POINT( KoPageFormat::width( layout.format, layout.orientation ) ); + layout.ptHeight = MM_TO_POINT( KoPageFormat::height( layout.format, layout.orientation ) ); + layout.ptLeft = MM_TO_POINT( 20.0 ); + layout.ptRight = MM_TO_POINT( 20.0 ); + layout.ptTop = MM_TO_POINT( 20.0 ); + layout.ptBottom = MM_TO_POINT( 20.0 ); + layout.ptPageEdge = -1; + layout.ptBindingSide = -1; + return layout; } struct PageFormatInfo @@ -149,12 +149,12 @@ int KoPageFormat::printerPageSize( KoFormat format ) { if ( format == PG_SCREEN ) { - kdWarning() << "You use the page tqlayout SCREEN. Printing in DIN A4 LANDSCAPE." << endl; + kdWarning() << "You use the page layout SCREEN. Printing in DIN A4 LANDSCAPE." << endl; return KPrinter::A4; } else if ( format == PG_CUSTOM ) { - kdWarning() << "The used page tqlayout (CUSTOM) is not supported by KPrinter. Printing in A4." << endl; + kdWarning() << "The used page layout (CUSTOM) is not supported by KPrinter. Printing in A4." << endl; return KPrinter::A4; } else if ( format <= PG_LAST_FORMAT ) diff --git a/lib/kofficecore/KoPageLayout.h b/lib/kofficecore/KoPageLayout.h index 4d4dc6cc..f854b1eb 100644 --- a/lib/kofficecore/KoPageLayout.h +++ b/lib/kofficecore/KoPageLayout.h @@ -154,7 +154,7 @@ enum KoHFType { }; /** - * This structure defines the page tqlayout, including + * This structure defines the page layout, including * its size in pt, its format (e.g. A4), orientation, unit, margins etc. */ struct KoPageLayout @@ -194,17 +194,17 @@ struct KoPageLayout } /** - * Save this page tqlayout to OASIS. + * Save this page layout to OASIS. */ KOFFICECORE_EXPORT KoGenStyle saveOasis() const; /** - * Load this page tqlayout from OASIS + * Load this page layout from OASIS */ KOFFICECORE_EXPORT void loadOasis(const TQDomElement &style); /** - * @return a page tqlayout with the default page size depending on the locale settings, + * @return a page layout with the default page size depending on the locale settings, * default margins (2 cm), and portrait orientation. * @since 1.4 */ diff --git a/lib/kofficecore/KoView.cpp b/lib/kofficecore/KoView.cpp index 259c498e..634a1393 100644 --- a/lib/kofficecore/KoView.cpp +++ b/lib/kofficecore/KoView.cpp @@ -342,7 +342,7 @@ void KoView::partActivateEvent( KParts::PartActivateEvent *event ) d->m_children.append( viewChild ); TQApplication::setOverrideCursor(waitCursor); - // This is the long operation (due to toolbar tqlayout stuff) + // This is the long operation (due to toolbar layout stuff) d->m_manager->setActivePart( child->document(), viewChild->frame()->view() ); TQApplication::restoreOverrideCursor(); diff --git a/lib/kofficecore/koDetailsPaneBase.ui b/lib/kofficecore/koDetailsPaneBase.ui index 4a838726..0b64d5eb 100644 --- a/lib/kofficecore/koDetailsPaneBase.ui +++ b/lib/kofficecore/koDetailsPaneBase.ui @@ -58,7 +58,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <grid> <property name="name"> diff --git a/lib/kofficecore/koDocumentInfoAboutWidget.ui b/lib/kofficecore/koDocumentInfoAboutWidget.ui index bfd4d49e..9e100ed2 100644 --- a/lib/kofficecore/koDocumentInfoAboutWidget.ui +++ b/lib/kofficecore/koDocumentInfoAboutWidget.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -67,7 +67,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <grid> <property name="name"> @@ -96,7 +96,7 @@ </widget> <widget class="TQLayoutWidget" row="3" column="0"> <property name="name"> - <cstring>tqlayout14</cstring> + <cstring>layout14</cstring> </property> <vbox> <property name="name"> @@ -173,7 +173,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <grid> <property name="name"> diff --git a/lib/kofficecore/koDocumentInfoAuthorWidget.ui b/lib/kofficecore/koDocumentInfoAuthorWidget.ui index e007e1a2..bce29446 100644 --- a/lib/kofficecore/koDocumentInfoAuthorWidget.ui +++ b/lib/kofficecore/koDocumentInfoAuthorWidget.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -61,7 +61,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout16</cstring> + <cstring>layout16</cstring> </property> <grid> <property name="name"> @@ -227,7 +227,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> diff --git a/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui b/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui index d97a33f2..bc650f10 100644 --- a/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui +++ b/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui @@ -26,7 +26,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <vbox> <property name="name"> diff --git a/lib/kofficecore/koOpenPaneBase.ui b/lib/kofficecore/koOpenPaneBase.ui index a85ecb38..c0076afa 100644 --- a/lib/kofficecore/koOpenPaneBase.ui +++ b/lib/kofficecore/koOpenPaneBase.ui @@ -25,7 +25,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <vbox> <property name="name"> @@ -71,7 +71,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <vbox> <property name="name"> diff --git a/lib/kofficecore/tests/koxmlreadertest.cpp b/lib/kofficecore/tests/koxmlreadertest.cpp index 512dec71..af2bc696 100644 --- a/lib/kofficecore/tests/koxmlreadertest.cpp +++ b/lib/kofficecore/tests/koxmlreadertest.cpp @@ -1419,9 +1419,9 @@ void testSimpleOpenDocumentPresentation() xmlstream << " <office:presentation>"; xmlstream << " <draw:page draw:name=\"Title\" draw:style-name=\"dp1\" "; xmlstream << " draw:master-page-name=\"lyt-cool\" "; - xmlstream << " presentation:presentation-page-tqlayout-name=\"AL1T0\">"; + xmlstream << " presentation:presentation-page-layout-name=\"AL1T0\">"; xmlstream << " <draw:frame presentation:style-name=\"pr1\" "; - xmlstream << " draw:text-style-name=\"P2\" draw:layer=\"tqlayout\" "; + xmlstream << " draw:text-style-name=\"P2\" draw:layer=\"layout\" "; xmlstream << " svg:width=\"23.912cm\" svg:height=\"3.508cm\" "; xmlstream << " svg:x=\"2.058cm\" svg:y=\"1.543cm\" "; xmlstream << " presentation:class=\"title\" "; @@ -1431,7 +1431,7 @@ void testSimpleOpenDocumentPresentation() xmlstream << " </draw:text-box>"; xmlstream << " </draw:frame>"; xmlstream << " <draw:frame presentation:style-name=\"pr2\" "; - xmlstream << " draw:text-style-name=\"P3\" draw:layer=\"tqlayout\""; + xmlstream << " draw:text-style-name=\"P3\" draw:layer=\"layout\""; xmlstream << " svg:width=\"23.912cm\" svg:height=\"13.231cm\""; xmlstream << " svg:x=\"2.058cm\" svg:y=\"5.838cm\" "; xmlstream << " presentation:class=\"subtitle\">"; @@ -1440,8 +1440,8 @@ void testSimpleOpenDocumentPresentation() xmlstream << " </draw:text-box>"; xmlstream << " </draw:frame>"; xmlstream << " <presentation:notes draw:style-name=\"dp2\">"; - xmlstream << " <draw:page-thumbnail draw:style-name=\"gr1\" draw:layer=\"tqlayout\" svg:width=\"13.706cm\" svg:height=\"10.28cm\" svg:x=\"3.647cm\" svg:y=\"2.853cm\" draw:page-number=\"1\" presentation:class=\"page\"/>"; - xmlstream << " <draw:frame presentation:style-name=\"pr3\" draw:text-style-name=\"P1\" draw:layer=\"tqlayout\" svg:width=\"14.518cm\" svg:height=\"11.411cm\" svg:x=\"3.249cm\" svg:y=\"14.13cm\" presentation:class=\"notes\" presentation:placeholder=\"true\">"; + xmlstream << " <draw:page-thumbnail draw:style-name=\"gr1\" draw:layer=\"layout\" svg:width=\"13.706cm\" svg:height=\"10.28cm\" svg:x=\"3.647cm\" svg:y=\"2.853cm\" draw:page-number=\"1\" presentation:class=\"page\"/>"; + xmlstream << " <draw:frame presentation:style-name=\"pr3\" draw:text-style-name=\"P1\" draw:layer=\"layout\" svg:width=\"14.518cm\" svg:height=\"11.411cm\" svg:x=\"3.249cm\" svg:y=\"14.13cm\" presentation:class=\"notes\" presentation:placeholder=\"true\">"; xmlstream << " <draw:text-box/>"; xmlstream << " </draw:frame>"; xmlstream << " </presentation:notes>"; @@ -1587,7 +1587,7 @@ void testSimpleOpenDocumentPresentation() CHECK( titlePageElement.attributeNS(drawNS,"style-name",""), TQString("dp1") ); CHECK( titlePageElement.attributeNS(drawNS,"master-page-name",""), TQString("lyt-cool") ); CHECK( titlePageElement.attributeNS(presentationNS, - "presentation-page-tqlayout-name",""), TQString("AL1T0") ); + "presentation-page-layout-name",""), TQString("AL1T0") ); // <draw:frame> for the title frame KoXmlElement titleFrameElement; @@ -1605,7 +1605,7 @@ void testSimpleOpenDocumentPresentation() CHECK( titleFrameElement.attributeNS(presentationNS,"class",""), TQString("title") ); CHECK( titleFrameElement.attributeNS(presentationNS,"user-transformed",""), TQString("true") ); CHECK( titleFrameElement.attributeNS(drawNS,"text-style-name",""), TQString("P2") ); - CHECK( titleFrameElement.attributeNS(drawNS,"layer",""), TQString("tqlayout") ); + CHECK( titleFrameElement.attributeNS(drawNS,"layer",""), TQString("layout") ); CHECK( titleFrameElement.attributeNS(svgNS,"width",""), TQString("23.912cm") ); CHECK( titleFrameElement.attributeNS(svgNS,"height",""), TQString("3.508cm") ); CHECK( titleFrameElement.attributeNS(svgNS,"x",""), TQString("2.058cm") ); @@ -1655,7 +1655,7 @@ void testSimpleOpenDocumentPresentation() CHECK( subtitleFrameElement.attributeNS(presentationNS,"class",""), TQString("subtitle") ); CHECK( subtitleFrameElement.hasAttributeNS(presentationNS,"user-transformed"), false ); CHECK( subtitleFrameElement.attributeNS(drawNS,"text-style-name",""), TQString("P3") ); - CHECK( subtitleFrameElement.attributeNS(drawNS,"layer",""), TQString("tqlayout") ); + CHECK( subtitleFrameElement.attributeNS(drawNS,"layer",""), TQString("layout") ); CHECK( subtitleFrameElement.attributeNS(svgNS,"width",""), TQString("23.912cm") ); CHECK( subtitleFrameElement.attributeNS(svgNS,"height",""), TQString("13.231cm") ); CHECK( subtitleFrameElement.attributeNS(svgNS,"x",""), TQString("2.058cm") ); diff --git a/lib/kofficeui/KoContextCelp.cpp b/lib/kofficeui/KoContextCelp.cpp index 2b1a2cbe..8e129f98 100644 --- a/lib/kofficeui/KoContextCelp.cpp +++ b/lib/kofficeui/KoContextCelp.cpp @@ -271,14 +271,14 @@ void KoHelpView::paintEvent( TQPaintEvent* ) KoHelpWidget::KoHelpWidget( TQString help, TQWidget* parent ) : TQWidget( parent ) { - TQGridLayout* tqlayout = new TQGridLayout( this, 3, 3 ); - tqlayout->setMargin( 2 ); - tqlayout->addWidget( m_upButton = new KoHelpNavButton( KoHelpNavButton::Up, this ), 0, 1, AlignHCenter ); - tqlayout->addWidget( m_helpViewport = new TQWidget( this ), 1, 1 ); - tqlayout->addWidget( m_downButton = new KoHelpNavButton( KoHelpNavButton::Down, this ), 2, 1, AlignHCenter ); - tqlayout->addColSpacing( 0, 5 ); - tqlayout->addColSpacing( 2, 5 ); - tqlayout->setColStretch( 1, 1 ); + TQGridLayout* layout = new TQGridLayout( this, 3, 3 ); + layout->setMargin( 2 ); + layout->addWidget( m_upButton = new KoHelpNavButton( KoHelpNavButton::Up, this ), 0, 1, AlignHCenter ); + layout->addWidget( m_helpViewport = new TQWidget( this ), 1, 1 ); + layout->addWidget( m_downButton = new KoHelpNavButton( KoHelpNavButton::Down, this ), 2, 1, AlignHCenter ); + layout->addColSpacing( 0, 5 ); + layout->addColSpacing( 2, 5 ); + layout->setColStretch( 1, 1 ); m_helpView = new KoHelpView( m_helpViewport ); m_helpViewport->setBackgroundMode( PaletteLight ); @@ -370,20 +370,20 @@ void KoHelpWidget::stopScrolling() KoContextHelpPopup::KoContextHelpPopup( TQWidget* parent ) : TQWidget( parent, "", WType_Dialog | WStyle_Customize | WStyle_NoBorder ) { - TQGridLayout* tqlayout = new TQGridLayout( this ); + TQGridLayout* layout = new TQGridLayout( this ); TQHBoxLayout* buttonLayout; - tqlayout->addWidget( m_helpIcon = new TQLabel( this ), 0, 0 ); - tqlayout->addWidget( m_helpTitle = new KoVerticalLabel( this ), 1, 0 ); - buttonLayout = new TQHBoxLayout( tqlayout ); - //tqlayout->addLayout( buttonLayout, 2, 0 ); - tqlayout->addMultiCellWidget( m_helpViewer = new KoHelpWidget( "", this ), 0, 2, 1, 1 ); + layout->addWidget( m_helpIcon = new TQLabel( this ), 0, 0 ); + layout->addWidget( m_helpTitle = new KoVerticalLabel( this ), 1, 0 ); + buttonLayout = new TQHBoxLayout( layout ); + //layout->addLayout( buttonLayout, 2, 0 ); + layout->addMultiCellWidget( m_helpViewer = new KoHelpWidget( "", this ), 0, 2, 1, 1 ); buttonLayout->add( m_close = new KoTinyButton( KoTinyButton::Close, this ) ); buttonLayout->add( m_sticky = new KoTinyButton( KoTinyButton::Sticky, this ) ); - tqlayout->addColSpacing( 2, 2 ); - tqlayout->addRowSpacing( 3, 2 ); - tqlayout->setMargin( 3 ); - tqlayout->setSpacing( 1 ); - tqlayout->setRowStretch( 1, 1 ); + layout->addColSpacing( 2, 2 ); + layout->addRowSpacing( 3, 2 ); + layout->setMargin( 3 ); + layout->setSpacing( 1 ); + layout->setRowStretch( 1, 1 ); buttonLayout->setSpacing( 1 ); setMinimumSize( 180, 180 ); @@ -537,13 +537,13 @@ KoContextHelpWidget::KoContextHelpWidget( TQWidget* parent, const char* name ) : TQWidget( parent, name ) { setCaption( i18n( "Context Help" ) ); - TQGridLayout* tqlayout = new TQGridLayout( this ); - tqlayout->addWidget( m_helpIcon = new TQLabel( this ), 0, 0 ); - tqlayout->addWidget( m_helpTitle = new KoVerticalLabel( this ), 1, 0 ); - tqlayout->addMultiCellWidget( m_helpViewer = new KoHelpWidget( "", this ), 0, 1, 1, 1 ); - tqlayout->setMargin( 2 ); - tqlayout->setSpacing( 1 ); - tqlayout->setRowStretch( 1, 1 ); + TQGridLayout* layout = new TQGridLayout( this ); + layout->addWidget( m_helpIcon = new TQLabel( this ), 0, 0 ); + layout->addWidget( m_helpTitle = new KoVerticalLabel( this ), 1, 0 ); + layout->addMultiCellWidget( m_helpViewer = new KoHelpWidget( "", this ), 0, 1, 1, 1 ); + layout->setMargin( 2 ); + layout->setSpacing( 1 ); + layout->setRowStretch( 1, 1 ); this->setMinimumSize( 180, 120 ); this->show(); setContextHelp( i18n( "Context Help" ), i18n( "Here will be shown help according to your actions" ), 0 ); @@ -567,13 +567,13 @@ KoContextHelpDocker::KoContextHelpDocker( TQWidget* parent, const char* name ) { setCaption( i18n( "Context Help" ) ); TQWidget* mainWidget = new TQWidget( this ); - TQGridLayout* tqlayout = new TQGridLayout( mainWidget ); - tqlayout->addWidget( m_helpIcon = new TQLabel( mainWidget ), 0, 0 ); - tqlayout->addWidget( m_helpTitle = new KoVerticalLabel( mainWidget ), 1, 0 ); - tqlayout->addMultiCellWidget( m_helpViewer = new KoHelpWidget( "", mainWidget ), 0, 1, 1, 1 ); - tqlayout->setMargin( 2 ); - tqlayout->setSpacing( 1 ); - tqlayout->setRowStretch( 1, 1 ); + TQGridLayout* layout = new TQGridLayout( mainWidget ); + layout->addWidget( m_helpIcon = new TQLabel( mainWidget ), 0, 0 ); + layout->addWidget( m_helpTitle = new KoVerticalLabel( mainWidget ), 1, 0 ); + layout->addMultiCellWidget( m_helpViewer = new KoHelpWidget( "", mainWidget ), 0, 1, 1, 1 ); + layout->setMargin( 2 ); + layout->setSpacing( 1 ); + layout->setRowStretch( 1, 1 ); mainWidget->setMinimumSize( 180, 120 ); mainWidget->show(); setWidget( mainWidget ); diff --git a/lib/kofficeui/KoGeneralPropertyUi.ui b/lib/kofficeui/KoGeneralPropertyUi.ui index 5d3d6e4f..399bc900 100644 --- a/lib/kofficeui/KoGeneralPropertyUi.ui +++ b/lib/kofficeui/KoGeneralPropertyUi.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout13</cstring> + <cstring>layout13</cstring> </property> <hbox> <property name="name"> diff --git a/lib/kofficeui/KoGuideLineDia.cpp b/lib/kofficeui/KoGuideLineDia.cpp index a889b3d8..00664410 100644 --- a/lib/kofficeui/KoGuideLineDia.cpp +++ b/lib/kofficeui/KoGuideLineDia.cpp @@ -60,7 +60,7 @@ KoGuideLineDia::KoGuideLineDia( TQWidget *parent, KoPoint &pos, KoRect &rect, TQButtonGroup *group = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Orientation" ), vbox ); group->setRadioButtonExclusive( true ); - //group->tqlayout(); + //group->layout(); m_hButton = new TQRadioButton( i18n( "Horizontal" ), group ); m_vButton = new TQRadioButton( i18n( "Vertical" ), group ); diff --git a/lib/kofficeui/KoPageLayoutColumns.cpp b/lib/kofficeui/KoPageLayoutColumns.cpp index 8ea3b0b9..2d1e6b77 100644 --- a/lib/kofficeui/KoPageLayoutColumns.cpp +++ b/lib/kofficeui/KoPageLayoutColumns.cpp @@ -25,18 +25,18 @@ #include <tqlabel.h> #include <tqlayout.h> -KoPageLayoutColumns::KoPageLayoutColumns(TQWidget *parent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& tqlayout) +KoPageLayoutColumns::KoPageLayoutColumns(TQWidget *parent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& layout) : KoPageLayoutColumnsBase(parent) { m_columns = columns; TQHBoxLayout *lay = new TQHBoxLayout(previewPane); - m_preview = new KoPagePreview( previewPane, "Preview", tqlayout ); + m_preview = new KoPagePreview( previewPane, "Preview", layout ); lay->addWidget(m_preview); lay = new TQHBoxLayout(columnSpacingPane); m_spacing = new KoUnitDoubleSpinBox( columnSpacingPane ); m_spacing->setValue( m_columns.ptColumnSpacing ); m_spacing->setUnit( unit ); double dStep = KoUnit::fromUserValue( 0.2, unit ); - m_spacing->setMinMaxStep( 0, tqlayout.ptWidth/2, dStep ); + m_spacing->setMinMaxStep( 0, layout.ptWidth/2, dStep ); lay->addWidget(m_spacing); labelSpacing->setBuddy( m_spacing ); nColumns->setValue( m_columns.columns ); @@ -63,8 +63,8 @@ void KoPageLayoutColumns::nSpaceChanged( double spacing ) { emit propertyChange(m_columns); } -void KoPageLayoutColumns::setLayout(KoPageLayout &tqlayout) { - m_preview->setPageLayout( tqlayout ); +void KoPageLayoutColumns::setLayout(KoPageLayout &layout) { + m_preview->setPageLayout( layout ); } #include <KoPageLayoutColumns.moc> diff --git a/lib/kofficeui/KoPageLayoutColumns.h b/lib/kofficeui/KoPageLayoutColumns.h index 8ebac1b2..b9dcd6c2 100644 --- a/lib/kofficeui/KoPageLayoutColumns.h +++ b/lib/kofficeui/KoPageLayoutColumns.h @@ -43,15 +43,15 @@ public: * @param parent the parent widget * @param columns the KoColumns data structure that this dialog should be initialzed with * @param unit the unit-type (mm/cm/inch) that the dialog should show - * @param tqlayout the page tqlayout that the preview should be initialzed with. + * @param layout the page layout that the preview should be initialzed with. */ - KoPageLayoutColumns(TQWidget *parent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& tqlayout); + KoPageLayoutColumns(TQWidget *parent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& layout); /** - * Update the page preview widget with the param tqlayout. - * @param tqlayout the new tqlayout + * Update the page preview widget with the param layout. + * @param layout the new layout */ - void setLayout(KoPageLayout &tqlayout); + void setLayout(KoPageLayout &layout); public slots: /** diff --git a/lib/kofficeui/KoPageLayoutDia.cpp b/lib/kofficeui/KoPageLayoutDia.cpp index 5cffc108..3150ab51 100644 --- a/lib/kofficeui/KoPageLayoutDia.cpp +++ b/lib/kofficeui/KoPageLayoutDia.cpp @@ -49,10 +49,10 @@ /******************************************************************/ /*===================== constrcutor ==============================*/ -KoPagePreview::KoPagePreview( TQWidget* parent, const char *name, const KoPageLayout& tqlayout ) +KoPagePreview::KoPagePreview( TQWidget* parent, const char *name, const KoPageLayout& layout ) : TQGroupBox( i18n( "Page Preview" ), parent, name ) { - setPageLayout( tqlayout ); + setPageLayout( layout ); columns = 1; setMinimumSize( 150, 150 ); } @@ -62,15 +62,15 @@ KoPagePreview::~KoPagePreview() { } -/*=================== set tqlayout =================================*/ -void KoPagePreview::setPageLayout( const KoPageLayout &tqlayout ) +/*=================== set layout =================================*/ +void KoPagePreview::setPageLayout( const KoPageLayout &layout ) { // resolution[XY] is in pixel per pt double resolutionX = POINT_TO_INCH( static_cast<double>(KoGlobal::dpiX()) ); double resolutionY = POINT_TO_INCH( static_cast<double>(KoGlobal::dpiY()) ); - m_pageWidth = tqlayout.ptWidth * resolutionX; - m_pageHeight = tqlayout.ptHeight * resolutionY; + m_pageWidth = layout.ptWidth * resolutionX; + m_pageHeight = layout.ptHeight * resolutionY; double zh = 110.0 / m_pageHeight; double zw = 110.0 / m_pageWidth; @@ -79,15 +79,15 @@ void KoPagePreview::setPageLayout( const KoPageLayout &tqlayout ) m_pageWidth *= z; m_pageHeight *= z; - m_textFrameX = tqlayout.ptLeft * resolutionX * z; - m_textFrameY = tqlayout.ptTop * resolutionY * z; - m_textFrameWidth = m_pageWidth - ( tqlayout.ptLeft + tqlayout.ptRight ) * resolutionX * z; - m_textFrameHeight = m_pageHeight - ( tqlayout.ptTop + tqlayout.ptBottom ) * resolutionY * z; + m_textFrameX = layout.ptLeft * resolutionX * z; + m_textFrameY = layout.ptTop * resolutionY * z; + m_textFrameWidth = m_pageWidth - ( layout.ptLeft + layout.ptRight ) * resolutionX * z; + m_textFrameHeight = m_pageHeight - ( layout.ptTop + layout.ptBottom ) * resolutionY * z; repaint( true ); } -/*=================== set tqlayout =================================*/ +/*=================== set layout =================================*/ void KoPagePreview::setPageColumns( const KoColumns &_columns ) { columns = _columns.columns; @@ -129,7 +129,7 @@ void KoPagePreview::drawContents( TQPainter *painter ) /*==================== constructor ===============================*/ KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name, - const KoPageLayout& tqlayout, + const KoPageLayout& layout, const KoHeadFoot& hf, int tabs, KoUnit::Unit unit, bool modal ) : KDialogBase( KDialogBase::Tabbed, i18n("Page Layout"), KDialogBase::Ok | KDialogBase::Cancel, @@ -137,7 +137,7 @@ KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name, { flags = tabs; - m_layout = tqlayout; + m_layout = layout; m_unit = unit; m_pageSizeTab = 0; m_columnsTab = 0; @@ -154,7 +154,7 @@ KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name, /*==================== constructor ===============================*/ KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name, - const KoPageLayout& tqlayout, + const KoPageLayout& layout, const KoHeadFoot& hf, const KoColumns& columns, const KoKWHeaderFooter& kwhf, @@ -164,7 +164,7 @@ KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name, { flags = tabs; - m_layout = tqlayout; + m_layout = layout; m_column = columns; m_unit = unit; m_pageSizeTab = 0; @@ -186,14 +186,14 @@ KoPageLayoutDia::~KoPageLayoutDia() } /*======================= show dialog ============================*/ -bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, int tabs, KoUnit::Unit& unit, TQWidget* parent ) +bool KoPageLayoutDia::pageLayout( KoPageLayout& layout, KoHeadFoot& hf, int tabs, KoUnit::Unit& unit, TQWidget* parent ) { bool res = false; - KoPageLayoutDia *dlg = new KoPageLayoutDia( parent, "PageLayout", tqlayout, hf, tabs, unit ); + KoPageLayoutDia *dlg = new KoPageLayoutDia( parent, "PageLayout", layout, hf, tabs, unit ); if ( dlg->exec() == TQDialog::Accepted ) { res = true; - if ( tabs & FORMAT_AND_BORDERS ) tqlayout = dlg->tqlayout(); + if ( tabs & FORMAT_AND_BORDERS ) layout = dlg->layout(); if ( tabs & HEADER_AND_FOOTER ) hf = dlg->headFoot(); unit = dlg->unit(); } @@ -204,15 +204,15 @@ bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, int ta } /*======================= show dialog ============================*/ -bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, KoColumns& columns, +bool KoPageLayoutDia::pageLayout( KoPageLayout& layout, KoHeadFoot& hf, KoColumns& columns, KoKWHeaderFooter &_kwhf, int tabs, KoUnit::Unit& unit, TQWidget* parent ) { bool res = false; - KoPageLayoutDia *dlg = new KoPageLayoutDia( parent, "PageLayout", tqlayout, hf, columns, _kwhf, tabs, unit ); + KoPageLayoutDia *dlg = new KoPageLayoutDia( parent, "PageLayout", layout, hf, columns, _kwhf, tabs, unit ); if ( dlg->exec() == TQDialog::Accepted ) { res = true; - if ( tabs & FORMAT_AND_BORDERS ) tqlayout = dlg->tqlayout(); + if ( tabs & FORMAT_AND_BORDERS ) layout = dlg->layout(); if ( tabs & HEADER_AND_FOOTER ) hf = dlg->headFoot(); if ( tabs & COLUMNS ) columns = dlg->columns(); if ( tabs & KW_HEADER_AND_FOOTER ) _kwhf = dlg->headerFooter(); @@ -224,7 +224,7 @@ bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, KoColu return res; } -/*===================== get a standard page tqlayout ===============*/ +/*===================== get a standard page layout ===============*/ KoPageLayout KoPageLayoutDia::standardLayout() { return KoPageLayout::standardLayout(); @@ -261,17 +261,17 @@ void KoPageLayoutDia::setupTab1( bool enableBorders ) this, TQT_SLOT (sizeUpdated( KoPageLayout&))); } -void KoPageLayoutDia::sizeUpdated(KoPageLayout &tqlayout) { - m_layout.ptWidth = tqlayout.ptWidth; - m_layout.ptHeight = tqlayout.ptHeight; - m_layout.ptLeft = tqlayout.ptLeft; - m_layout.ptRight = tqlayout.ptRight; - m_layout.ptTop = tqlayout.ptTop; - m_layout.ptBottom = tqlayout.ptBottom; - m_layout.format = tqlayout.format; - m_layout.orientation = tqlayout.orientation; +void KoPageLayoutDia::sizeUpdated(KoPageLayout &layout) { + m_layout.ptWidth = layout.ptWidth; + m_layout.ptHeight = layout.ptHeight; + m_layout.ptLeft = layout.ptLeft; + m_layout.ptRight = layout.ptRight; + m_layout.ptTop = layout.ptTop; + m_layout.ptBottom = layout.ptBottom; + m_layout.format = layout.format; + m_layout.orientation = layout.orientation; if(m_columnsTab) - m_columnsTab->setLayout(tqlayout); + m_columnsTab->setLayout(layout); } /*================ setup header and footer tab ===================*/ @@ -282,9 +282,9 @@ void KoPageLayoutDia::setupTab2( const KoHeadFoot& hf ) // ------------- header --------------- TQGroupBox *gHead = new TQGroupBox( 0, Qt::Vertical, i18n( "Head Line" ), tab2 ); - gHead->tqlayout()->setSpacing(KDialog::spacingHint()); - gHead->tqlayout()->setMargin(KDialog::marginHint()); - TQGridLayout *headGrid = new TQGridLayout( gHead->tqlayout(), 2, 3 ); + gHead->layout()->setSpacing(KDialog::spacingHint()); + gHead->layout()->setMargin(KDialog::marginHint()); + TQGridLayout *headGrid = new TQGridLayout( gHead->layout(), 2, 3 ); TQLabel *lHeadLeft = new TQLabel( i18n( "Left:" ), gHead ); headGrid->addWidget( lHeadLeft, 0, 0 ); @@ -311,9 +311,9 @@ void KoPageLayoutDia::setupTab2( const KoHeadFoot& hf ) // ------------- footer --------------- TQGroupBox *gFoot = new TQGroupBox( 0, Qt::Vertical, i18n( "Foot Line" ), tab2 ); - gFoot->tqlayout()->setSpacing(KDialog::spacingHint()); - gFoot->tqlayout()->setMargin(KDialog::marginHint()); - TQGridLayout *footGrid = new TQGridLayout( gFoot->tqlayout(), 2, 3 ); + gFoot->layout()->setSpacing(KDialog::spacingHint()); + gFoot->layout()->setMargin(KDialog::marginHint()); + TQGridLayout *footGrid = new TQGridLayout( gFoot->layout(), 2, 3 ); TQLabel *lFootLeft = new TQLabel( i18n( "Left:" ), gFoot ); footGrid->addWidget( lFootLeft, 0, 0 ); @@ -362,7 +362,7 @@ void KoPageLayoutDia::setupTab3() TQWidget *tab3 = addPage(i18n( "Col&umns" )); TQHBoxLayout *lay = new TQHBoxLayout(tab3); m_columnsTab = new KoPageLayoutColumns(tab3, m_column, m_unit, m_layout); - m_columnsTab->tqlayout()->setMargin(0); + m_columnsTab->layout()->setMargin(0); lay->addWidget(m_columnsTab); m_columnsTab->show(); connect (m_columnsTab, TQT_SIGNAL( propertyChange(KoColumns&)), @@ -382,7 +382,7 @@ void KoPageLayoutDia::setupTab4(const KoKWHeaderFooter kwhf ) TQWidget *tab4 = addPage(i18n( "H&eader && Footer" )); TQHBoxLayout *lay = new TQHBoxLayout(tab4); m_headerTab = new KoPageLayoutHeader(tab4, m_unit, kwhf); - m_headerTab->tqlayout()->setMargin(0); + m_headerTab->layout()->setMargin(0); lay->addWidget(m_headerTab); m_headerTab->show(); diff --git a/lib/kofficeui/KoPageLayoutDia.h b/lib/kofficeui/KoPageLayoutDia.h index 21fe7df3..1ed23ec5 100644 --- a/lib/kofficeui/KoPageLayoutDia.h +++ b/lib/kofficeui/KoPageLayoutDia.h @@ -61,7 +61,7 @@ public: ~KoPagePreview(); /** - * set page tqlayout + * set page layout */ void setPageLayout( const KoPageLayout& ); void setPageColumns( const KoColumns& ); @@ -78,7 +78,7 @@ protected: class KoPageLayoutDiaPrivate; /** - * With this dialog the user can specify the tqlayout of the paper during printing. + * With this dialog the user can specify the layout of the paper during printing. */ class KOFFICEUI_EXPORT KoPageLayoutDia : public KDialogBase { @@ -92,14 +92,14 @@ public: * * @param parent The parent of the dialog. * @param name The name of the dialog. - * @param tqlayout The tqlayout. + * @param layout The layout. * @param headfoot The header and the footer. * @param flags a variable with all features this dialog should show. * @param unit The unit to use for displaying the values to the user. * @param modal Whether the dialog is modal or not. */ KoPageLayoutDia( TQWidget* parent, const char* name, - const KoPageLayout& tqlayout, + const KoPageLayout& layout, const KoHeadFoot& headfoot, int flags, KoUnit::Unit unit, bool modal=true ); @@ -108,7 +108,7 @@ public: * * @param parent The parent of the dialog. * @param name The name of the dialog. - * @param tqlayout The tqlayout. + * @param layout The layout. * @param headfoot The header and the footer. * @param columns The number of columns on the page. * @param kwheadfoot The KWord header and footer. @@ -116,7 +116,7 @@ public: * @param unit The unit to use for displaying the values to the user */ KoPageLayoutDia( TQWidget* parent, const char* name, - const KoPageLayout& tqlayout, + const KoPageLayout& layout, const KoHeadFoot& headfoot, const KoColumns& columns, const KoKWHeaderFooter& kwheadfoot, @@ -128,26 +128,26 @@ public: ~KoPageLayoutDia(); /** - * Show page tqlayout dialog. + * Show page layout dialog. * See constructor for documentation on the parameters */ static bool pageLayout( KoPageLayout&, KoHeadFoot&, int tabs, KoUnit::Unit& unit, TQWidget* parent = 0 ); /** - * Show page tqlayout dialog. + * Show page layout dialog. * See constructor for documentation on the parameters */ static bool pageLayout( KoPageLayout&, KoHeadFoot&, KoColumns&, KoKWHeaderFooter&, int tabs, KoUnit::Unit& unit, TQWidget* parent = 0 ); /** - * Retrieves a standard page tqlayout. + * Retrieves a standard page layout. * Deprecated: better use KoPageLayout::standardLayout() */ static KDE_DEPRECATED KoPageLayout standardLayout(); /** - * Returns the tqlayout + * Returns the layout */ - const KoPageLayout& tqlayout() const { return m_layout; } + const KoPageLayout& layout() const { return m_layout; } /** * Returns the header and footer information @@ -177,7 +177,7 @@ private: TQLineEdit *eFootMid; TQLineEdit *eFootRight; - // tqlayout + // layout KoPageLayout m_layout; KoColumns m_column; @@ -189,7 +189,7 @@ protected slots: virtual void slotOk(); private slots: - void sizeUpdated(KoPageLayout &tqlayout); + void sizeUpdated(KoPageLayout &layout); void columnsUpdated(KoColumns &columns); private: diff --git a/lib/kofficeui/KoPageLayoutHeaderBase.ui b/lib/kofficeui/KoPageLayoutHeaderBase.ui index 41246d84..7f36378e 100644 --- a/lib/kofficeui/KoPageLayoutHeaderBase.ui +++ b/lib/kofficeui/KoPageLayoutHeaderBase.ui @@ -45,7 +45,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -120,7 +120,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> diff --git a/lib/kofficeui/KoPageLayoutSize.cpp b/lib/kofficeui/KoPageLayoutSize.cpp index 54be2b3f..73629862 100644 --- a/lib/kofficeui/KoPageLayoutSize.cpp +++ b/lib/kofficeui/KoPageLayoutSize.cpp @@ -34,9 +34,9 @@ #include <tqvgroupbox.h> #include <tqhbuttongroup.h> -KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& tqlayout, KoUnit::Unit unit,const KoColumns& columns, bool unitChooser, bool enableBorders) +KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout, KoUnit::Unit unit,const KoColumns& columns, bool unitChooser, bool enableBorders) : TQWidget(parent), m_blockSignals(false) { - m_layout = tqlayout; + m_layout = layout; m_unit = unit; TQGridLayout *grid1 = new TQGridLayout( this, 5, 2, 0, KDialog::spacingHint() ); @@ -130,7 +130,7 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& tqlayou marginsFrame->setMargin( KDialog::marginHint() ); grid1->addWidget( marginsFrame, 3, 0 ); - TQGridLayout *marginsLayout = new TQGridLayout( marginsFrame->tqlayout(), 3, 3, + TQGridLayout *marginsLayout = new TQGridLayout( marginsFrame->layout(), 3, 3, KDialog::spacingHint() ); // left margin diff --git a/lib/kofficeui/KoPageLayoutSize.h b/lib/kofficeui/KoPageLayoutSize.h index d917b349..6d50e014 100644 --- a/lib/kofficeui/KoPageLayoutSize.h +++ b/lib/kofficeui/KoPageLayoutSize.h @@ -42,13 +42,13 @@ public: /** * Contructor * @param parent the parent widget - * @param tqlayout the page tqlayout that this widget should be initialzed with. + * @param layout the page layout that this widget should be initialzed with. * @param unit the unit-type (mm/cm/inch) that the dialog should show * @param columns the KoColumns (amout of columns) that the preview should be initialized with * @param unitChooser if true a combobox with the unit-type is shown for the user to change * @param enableBorders if true enable the user to change the margins (aka borders) of the page */ - KoPageLayoutSize(TQWidget *parent, const KoPageLayout& tqlayout, KoUnit::Unit unit, + KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout, KoUnit::Unit unit, const KoColumns& columns, bool unitChooser, bool enableBorders); /** @@ -78,11 +78,11 @@ public slots: signals: /** * Emitted whenever the user changed something in the dialog. - * @param tqlayout the update tqlayout structure with currently displayed info. + * @param layout the update layout structure with currently displayed info. * Note that the info may not be fully correct and physically possible (in which * case queryClose will return false) */ - void propertyChange(KoPageLayout &tqlayout); + void propertyChange(KoPageLayout &layout); protected: TQComboBox *cpgFormat; diff --git a/lib/kofficeui/KoRuler.cpp b/lib/kofficeui/KoRuler.cpp index cc8f5189..b11b0604 100644 --- a/lib/kofficeui/KoRuler.cpp +++ b/lib/kofficeui/KoRuler.cpp @@ -44,7 +44,7 @@ public: bool whileMovingBorderLeft, whileMovingBorderRight; bool whileMovingBorderTop, whileMovingBorderBottom; TQPixmap pmFirst, pmLeft; - KoPageLayout tqlayout; + KoPageLayout layout; KoTabChooser *tabChooser; KoTabulatorList tabList; // Do we have to remove a certain tab in the DC Event? @@ -93,7 +93,7 @@ KoRuler::KoRuler( TQWidget *_parent, TQWidget *_canvas, Qt::Orientation _orienta d->canvas = _canvas; orientation = _orientation; - d->tqlayout = _layout; + d->layout = _layout; d->flags = _flags; d->m_bReadWrite=true; @@ -125,11 +125,11 @@ KoRuler::KoRuler( TQWidget *_parent, TQWidget *_canvas, Qt::Orientation _orienta d->removeTab.type = T_INVALID; if ( orientation == Qt::Horizontal ) { - frameStart = tqRound( zoomIt(d->tqlayout.ptLeft) ); - d->frameEnd = tqRound( zoomIt(d->tqlayout.ptWidth - d->tqlayout.ptRight) ); + frameStart = tqRound( zoomIt(d->layout.ptLeft) ); + d->frameEnd = tqRound( zoomIt(d->layout.ptWidth - d->layout.ptRight) ); } else { - frameStart = tqRound( zoomIt(d->tqlayout.ptTop) ); - d->frameEnd = tqRound( zoomIt(d->tqlayout.ptHeight - d->tqlayout.ptBottom) ); + frameStart = tqRound( zoomIt(d->layout.ptTop) ); + d->frameEnd = tqRound( zoomIt(d->layout.ptHeight - d->layout.ptBottom) ); } m_bFrameStartSet = false; @@ -211,7 +211,7 @@ void KoRuler::drawHorizontal( TQPainter *_painter ) TQPainter p( &buffer ); p.fillRect( 0, 0, width(), height(), TQBrush( colorGroup().brush( TQColorGroup::Background ) ) ); - int totalw = tqRound( zoomIt(d->tqlayout.ptWidth) ); + int totalw = tqRound( zoomIt(d->layout.ptWidth) ); TQString str; p.setBrush( colorGroup().brush( TQColorGroup::Base ) ); @@ -373,7 +373,7 @@ void KoRuler::drawVertical( TQPainter *_painter ) TQPainter p( &buffer ); p.fillRect( 0, 0, width(), height(), TQBrush( colorGroup().brush( TQColorGroup::Background ) ) ); - int totalh = tqRound( zoomIt(d->tqlayout.ptHeight) ); + int totalh = tqRound( zoomIt(d->layout.ptHeight) ); // Clip rect - this gives basically always a rect like (2,2,width-2,height-2) TQRect paintRect = _painter->clipRegion( TQPainter::CoordPainter ).boundingRect(); // Ruler rect @@ -598,7 +598,7 @@ void KoRuler::mouseReleaseEvent( TQMouseEvent *e ) if ( d->canvas ) drawLine(d->oldMx, -1); update(); - emit newPageLayout( d->tqlayout ); + emit newPageLayout( d->layout ); } else if ( d->action == A_BR_TOP || d->action == A_BR_BOTTOM ) { d->whileMovingBorderTop = false; d->whileMovingBorderBottom = false; @@ -610,7 +610,7 @@ void KoRuler::mouseReleaseEvent( TQMouseEvent *e ) p.end(); } update(); - emit newPageLayout( d->tqlayout ); + emit newPageLayout( d->layout ); } else if ( d->action == A_FIRST_INDENT ) { if ( d->canvas ) drawLine(d->oldMx, -1); @@ -667,12 +667,12 @@ void KoRuler::mouseMoveEvent( TQMouseEvent *e ) hasToDelete = false; int pw = d->frameEnd - frameStart; - int ph = tqRound(zoomIt(d->tqlayout.ptHeight)); + int ph = tqRound(zoomIt(d->layout.ptHeight)); int left = frameStart - diffx; - int top = tqRound(zoomIt(d->tqlayout.ptTop)); + int top = tqRound(zoomIt(d->layout.ptTop)); top -= diffy; int right = d->frameEnd - diffx; - int bottom = tqRound(zoomIt(d->tqlayout.ptBottom)); + int bottom = tqRound(zoomIt(d->layout.ptBottom)); bottom = ph - bottom - diffy; // Cumulate first-line-indent int ip_first = tqRound( zoomIt( i_first + ( d->rtl ? d->i_right : i_left) ) ); @@ -693,13 +693,13 @@ void KoRuler::mouseMoveEvent( TQMouseEvent *e ) /////// ###### // At the moment, moving the left and right border indicators // is disabled when setFrameStartEnd has been called (i.e. in KWord) - // Changing the tqlayout margins directly from it would be utterly wrong + // Changing the layout margins directly from it would be utterly wrong // (just try the 2-columns modes...). What needs to be done is: // emitting a signal frameResized in mouseReleaseEvent, when a left/right // border has been moved, and in kword we need to update the margins from // there, if the left border of the 1st column or the right border of the // last column was moved... and find what to do with the other borders. - // And for normal frames, resize the frame without touching the page tqlayout. + // And for normal frames, resize the frame without touching the page layout. // All that is too much for now -> disabling. if ( !m_bFrameStartSet ) { @@ -747,7 +747,7 @@ void KoRuler::mouseMoveEvent( TQMouseEvent *e ) case A_BR_LEFT: { if ( d->canvas && mx < right-10 && mx+diffx-2 > 0) { drawLine( d->oldMx, mx ); - d->tqlayout.ptLeft = unZoomIt(static_cast<double>(mx + diffx)); + d->layout.ptLeft = unZoomIt(static_cast<double>(mx + diffx)); if( ip_left > right-left-15 ) { ip_left=right-left-15; ip_left=ip_left<0 ? 0 : ip_left; @@ -770,7 +770,7 @@ void KoRuler::mouseMoveEvent( TQMouseEvent *e ) case A_BR_RIGHT: { if ( d->canvas && mx > left+10 && mx+diffx <= pw-2) { drawLine( d->oldMx, mx ); - d->tqlayout.ptRight = unZoomIt(static_cast<double>(pw - ( mx + diffx ))); + d->layout.ptRight = unZoomIt(static_cast<double>(pw - ( mx + diffx ))); if( ip_left > right-left-15 ) { ip_left=right-left-15; ip_left=ip_left<0 ? 0 : ip_left; @@ -895,7 +895,7 @@ void KoRuler::mouseMoveEvent( TQMouseEvent *e ) p.drawLine( 0, d->oldMy, d->canvas->width(), d->oldMy ); p.drawLine( 0, my, d->canvas->width(), my ); p.end(); - d->tqlayout.ptTop = unZoomIt(static_cast<double>(my + diffy)); + d->layout.ptTop = unZoomIt(static_cast<double>(my + diffy)); d->oldMx = mx; d->oldMy = my; update(); @@ -910,7 +910,7 @@ void KoRuler::mouseMoveEvent( TQMouseEvent *e ) p.drawLine( 0, d->oldMy, d->canvas->width(), d->oldMy ); p.drawLine( 0, my, d->canvas->width(), my ); p.end(); - d->tqlayout.ptBottom = unZoomIt(static_cast<double>(ph - ( my + diffy ))); + d->layout.ptBottom = unZoomIt(static_cast<double>(ph - ( my + diffy ))); d->oldMx = mx; d->oldMy = my; update(); @@ -984,7 +984,7 @@ void KoRuler::handleDoubleClick() // Double-clicked nothing d->action = A_NONE; - emit doubleClicked(); // usually page tqlayout dialog + emit doubleClicked(); // usually page layout dialog } void KoRuler::setTabList( const KoTabulatorList & _tabList ) @@ -1195,7 +1195,7 @@ TQSize KoRuler::sizeHint() const void KoRuler::setPageLayout( const KoPageLayout& _layout ) { - d->tqlayout = _layout; + d->layout = _layout; update(); } diff --git a/lib/kofficeui/KoRuler.h b/lib/kofficeui/KoRuler.h index 52dcecd0..352e6820 100644 --- a/lib/kofficeui/KoRuler.h +++ b/lib/kofficeui/KoRuler.h @@ -96,7 +96,7 @@ class KoRulerPrivate; * and supports zooming, tabulators, paragraph indents, showing the mouse position, etc. * * It also offers a popupmenu upon right-clicking, for changing the unit, - * the page tqlayout, or removing a tab. + * the page layout, or removing a tab. */ class KOFFICEUI_EXPORT KoRuler : public TQFrame { @@ -139,7 +139,7 @@ public: const double& zoom() const { return m_zoom; } /** - * Set the page tqlayout, see @ref KoPageLayout. + * Set the page layout, see @ref KoPageLayout. * This defines the size of the page and the margins, * from which the size of the ruler is deducted. */ diff --git a/lib/kofficeui/KoTabBar.cpp b/lib/kofficeui/KoTabBar.cpp index a249084f..fe448916 100644 --- a/lib/kofficeui/KoTabBar.cpp +++ b/lib/kofficeui/KoTabBar.cpp @@ -37,7 +37,7 @@ // TODO // improvement possibilities // - use offscreen buffer to reduce flicker even more -// - keep track of tabs, only (re)tqlayout when necessary +// - keep track of tabs, only (re)layout when necessary // - paint all tabs to buffer, show only by shifting // - customizable button pixmaps // - use TQStyle to paint the tabs & buttons (is it good/possible?) @@ -57,7 +57,7 @@ public: // read-only: no mouse drag, double-click, right-click bool readOnly; - // if true, tqlayout is from right to left + // if true, layout is from right to left bool reverseLayout; // list of all tabs, in order of appearance @@ -724,7 +724,7 @@ void KoTabBar::resizeEvent( TQResizeEvent* ) TQSize KoTabBar::sizeHint() const { - return TQSize( 40, tqstyle().pixelMetric( TQStyle::PM_ScrollBarExtent, this ) ); + return TQSize( 40, style().pixelMetric( TQStyle::PM_ScrollBarExtent, this ) ); } void KoTabBar::renameTab( const TQString& old_name, const TQString& new_name ) diff --git a/lib/kofficeui/KoTemplateChooseDia.cpp b/lib/kofficeui/KoTemplateChooseDia.cpp index 0311049e..af79486d 100644 --- a/lib/kofficeui/KoTemplateChooseDia.cpp +++ b/lib/kofficeui/KoTemplateChooseDia.cpp @@ -165,7 +165,7 @@ class KoTemplateChooseDiaPrivate { // choose a file MyFileDialog *m_filedialog; - // for the tqlayout + // for the layout TQTabWidget* tabWidget; TQWidget* newTab; TQWidget* existingTab; @@ -298,13 +298,13 @@ KoTemplateChooseDia::DialogType KoTemplateChooseDia::getDialogType() const { /*================================================================*/ // private -void KoTemplateChooseDia::setupRecentDialog(TQWidget * widgetbase, TQGridLayout * tqlayout) +void KoTemplateChooseDia::setupRecentDialog(TQWidget * widgetbase, TQGridLayout * layout) { d->m_recent = new KoTCDRecentFilesIconView(widgetbase, "recent files"); // I prefer the icons to be in "most recent first" order (DF) d->m_recent->setSorting( static_cast<TQDir::SortSpec>( TQDir::Time | TQDir::Reversed ) ); - tqlayout->addWidget(d->m_recent,0,0); + layout->addWidget(d->m_recent,0,0); TQString oldGroup = d->m_instance->config()->group(); d->m_instance->config()->setGroup( "RecentFiles" ); @@ -342,7 +342,7 @@ void KoTemplateChooseDia::setupRecentDialog(TQWidget * widgetbase, TQGridLayout /*================================================================*/ // private -void KoTemplateChooseDia::setupFileDialog(TQWidget * widgetbase, TQGridLayout * tqlayout) +void KoTemplateChooseDia::setupFileDialog(TQWidget * widgetbase, TQGridLayout * layout) { TQString dir = TQString(); TQPoint point( 0, 0 ); @@ -353,7 +353,7 @@ void KoTemplateChooseDia::setupFileDialog(TQWidget * widgetbase, TQGridLayout * "file dialog", false); - tqlayout->addWidget(d->m_filedialog,0,0); + layout->addWidget(d->m_filedialog,0,0); d->m_filedialog->reparent( widgetbase , point ); //d->m_filedialog->setOperationMode( KFileDialog::Opening); @@ -387,20 +387,20 @@ void KoTemplateChooseDia::setupFileDialog(TQWidget * widgetbase, TQGridLayout * /*================================================================*/ // private -void KoTemplateChooseDia::setupTemplateDialog(TQWidget * widgetbase, TQGridLayout * tqlayout) +void KoTemplateChooseDia::setupTemplateDialog(TQWidget * widgetbase, TQGridLayout * layout) { d->m_jwidget = new KJanusWidget( widgetbase, "kjanuswidget", KJanusWidget::IconList); - tqlayout->addWidget(d->m_jwidget,0,0); + layout->addWidget(d->m_jwidget,0,0); d->boxdescription = new TQVGroupBox( i18n("Selected Template"), widgetbase, "boxdescription"); - tqlayout->addWidget(d->boxdescription, 1, 0 ); + layout->addWidget(d->boxdescription, 1, 0 ); // config KConfigGroup grp( d->m_instance->config(), "TemplateChooserDialog" ); @@ -429,9 +429,9 @@ void KoTemplateChooseDia::setupTemplateDialog(TQWidget * widgetbase, TQGridLayou group->name(), group->first()->loadPicture(d->m_instance)); - TQGridLayout * tqlayout = new TQGridLayout(frame); + TQGridLayout * layout = new TQGridLayout(frame); KoTCDIconCanvas *canvas = new KoTCDIconCanvas( frame ); - tqlayout->addWidget(canvas,0,0); + layout->addWidget(canvas,0,0); canvas->setBackgroundColor( colorGroup().base() ); canvas->setResizeMode(TQIconView::Adjust); @@ -481,7 +481,7 @@ void KoTemplateChooseDia::setupTemplateDialog(TQWidget * widgetbase, TQGridLayou TQString translatedstring = i18n("Always start %1 with the selected template").arg(d->m_nativeName); d->m_nodiag = new TQCheckBox ( translatedstring , widgetbase); - tqlayout->addWidget(d->m_nodiag, 2, 0); + layout->addWidget(d->m_nodiag, 2, 0); TQString startwithoutdialog = grp.readEntry( "NoStartDlg" ); bool ischecked = startwithoutdialog == TQString("yes"); diff --git a/lib/kofficeui/KoTemplateChooseDia.h b/lib/kofficeui/KoTemplateChooseDia.h index 677c11b1..9363477d 100644 --- a/lib/kofficeui/KoTemplateChooseDia.h +++ b/lib/kofficeui/KoTemplateChooseDia.h @@ -236,9 +236,9 @@ private: TQString descriptionText(const TQString &name, const TQString &description); void setupDialog(); - void setupTemplateDialog(TQWidget * widgetbase, TQGridLayout * tqlayout); - void setupFileDialog(TQWidget * widgetbase, TQGridLayout * tqlayout); - void setupRecentDialog(TQWidget * widgetbase, TQGridLayout * tqlayout); + void setupTemplateDialog(TQWidget * widgetbase, TQGridLayout * layout); + void setupFileDialog(TQWidget * widgetbase, TQGridLayout * layout); + void setupRecentDialog(TQWidget * widgetbase, TQGridLayout * layout); bool collectInfo(); bool noStartupDlg() const; diff --git a/lib/kofficeui/KoTemplateCreateDia.cpp b/lib/kofficeui/KoTemplateCreateDia.cpp index 4e8c4d0c..d2dc25f0 100644 --- a/lib/kofficeui/KoTemplateCreateDia.cpp +++ b/lib/kofficeui/KoTemplateCreateDia.cpp @@ -142,15 +142,15 @@ KoTemplateCreateDia::KoTemplateCreateDia( const TQCString &templateType, KInstan TQVBoxLayout *rightbox=new TQVBoxLayout(mbox); TQGroupBox *pixbox=new TQGroupBox(i18n("Picture"), mainwidget); rightbox->addWidget(pixbox); - TQVBoxLayout *pixtqlayout=new TQVBoxLayout(pixbox, KDialogBase::marginHint(), + TQVBoxLayout *pixlayout=new TQVBoxLayout(pixbox, KDialogBase::marginHint(), KDialogBase::spacingHint()); pixtqlayout->addSpacing(pixbox->fontMetrics().height()/2); - pixtqlayout->addStretch(1); + pixlayout->addStretch(1); d->m_default=new TQRadioButton(i18n("&Default"), pixbox); d->m_default->setChecked(true); connect(d->m_default, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDefault())); - pixtqlayout->addWidget(d->m_default); - TQHBoxLayout *custombox=new TQHBoxLayout(pixtqlayout); + pixlayout->addWidget(d->m_default); + TQHBoxLayout *custombox=new TQHBoxLayout(pixlayout); d->m_custom=new TQRadioButton(i18n("Custom"), pixbox); d->m_custom->setChecked(false); connect(d->m_custom, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCustom())); @@ -159,15 +159,15 @@ KoTemplateCreateDia::KoTemplateCreateDia( const TQCString &templateType, KInstan connect(d->m_select, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelect())); custombox->addWidget(d->m_select, 1); custombox->addStretch(1); - pixtqlayout->addStretch(1); + pixlayout->addStretch(1); label=new TQLabel(i18n("Preview:"), pixbox); - pixtqlayout->addWidget(label); - TQHBoxLayout *previewbox=new TQHBoxLayout(pixtqlayout); + pixlayout->addWidget(label); + TQHBoxLayout *previewbox=new TQHBoxLayout(pixlayout); previewbox->addStretch(10); d->m_preview=new TQLabel(pixbox); // setPixmap() -> auto resize? previewbox->addWidget(d->m_preview); previewbox->addStretch(10); - pixtqlayout->addStretch(8); + pixlayout->addStretch(8); d->m_defaultTemplate = new TQCheckBox( i18n("Use the new template as default"), mainwidget ); d->m_defaultTemplate->setChecked( true ); diff --git a/lib/kofficeui/KoTooluButton.cpp b/lib/kofficeui/KoTooluButton.cpp index bc5affeb..10334c32 100644 --- a/lib/kofficeui/KoTooluButton.cpp +++ b/lib/kofficeui/KoTooluButton.cpp @@ -368,7 +368,7 @@ void KoColorPanel::paintEvent( TQPaintEvent* e ) // The "active" element (if there is one) if ( hasFocus() && m_focusPosition.x != -1 && m_focusPosition.y != -1 && mapFromPosition( m_focusPosition ).intersects( e->rect() ) ) - tqstyle().tqdrawPrimitive( TQStyle::PE_Panel, &p, TQRect( m_focusPosition.x << 4, m_focusPosition.y << 4, TILESIZE, TILESIZE ), + style().tqdrawPrimitive( TQStyle::PE_Panel, &p, TQRect( m_focusPosition.x << 4, m_focusPosition.y << 4, TILESIZE, TILESIZE ), colorGroup(), TQStyle::Style_Sunken | TQStyle::Style_Enabled ); --lns; // Attention: We just avoid some lns - 1 statements @@ -579,7 +579,7 @@ void KoColorPanel::updateFocusPosition( const Position& newPosition ) TQMap<Position, TQColor>::ConstIterator it = m_colorMap.find( m_focusPosition ); if ( it != m_colorMap.end() ) { // draw at the new focus position - tqstyle().tqdrawPrimitive( TQStyle::PE_Panel, &p, TQRect( m_focusPosition.x << 4, m_focusPosition.y << 4, TILESIZE, TILESIZE ), + style().tqdrawPrimitive( TQStyle::PE_Panel, &p, TQRect( m_focusPosition.x << 4, m_focusPosition.y << 4, TILESIZE, TILESIZE ), colorGroup(), TQStyle::Style_Sunken | TQStyle::Style_Enabled ); p.fillRect( ( m_focusPosition.x << 4 ) + 2, ( m_focusPosition.y << 4 ) + 2, 12, 12, it.data() ); } @@ -712,15 +712,15 @@ void KoToolButton::drawButton(TQPainter *_painter) // Draw styled toolbuttons _painter->setClipRect( 0, 0, width() - ARROW_WIDTH, height() ); - tqstyle().drawComplexControl( TQStyle::CC_ToolButton, _painter, this, TQRect( 0, 0, width() - ARROW_WIDTH, height() ), cg, + style().drawComplexControl( TQStyle::CC_ToolButton, _painter, this, TQRect( 0, 0, width() - ARROW_WIDTH, height() ), cg, flags, TQStyle::SC_ToolButton, active, opt ); _painter->setClipRect( width() - ARROW_WIDTH, 0, ARROW_WIDTH, height() ); - tqstyle().drawComplexControl( TQStyle::CC_ToolButton, _painter, this, TQRect( width(), 0, ARROW_WIDTH, height() ), cg, + style().drawComplexControl( TQStyle::CC_ToolButton, _painter, this, TQRect( width(), 0, ARROW_WIDTH, height() ), cg, arrowFlags, TQStyle::SC_ToolButton, arrowActive, opt ); _painter->setClipping( false ); // ...and the arrow indicating the popup - tqstyle().tqdrawPrimitive( TQStyle::PE_ArrowDown, _painter, TQRect( width() - ARROW_WIDTH - 1, 0, ARROW_WIDTH, height() ), + style().tqdrawPrimitive( TQStyle::PE_ArrowDown, _painter, TQRect( width() - ARROW_WIDTH - 1, 0, ARROW_WIDTH, height() ), cg, flags, opt ); if ( KToolBarButton::isRaised() || m_arrowPressed ) @@ -798,7 +798,7 @@ void KoToolButton::drawButton(TQPainter *_painter) if (!textLabel().isNull() && !textRect.isNull()) { _painter->setFont( KGlobalSettings::toolBarFont() ); if ( !isEnabled() ) - _painter->setPen( tqpalette().disabled().dark() ); + _painter->setPen( palette().disabled().dark() ); else if( KToolBarButton::isRaised() ) _painter->setPen( KGlobalSettings::toolBarHighlightColor() ); else @@ -838,15 +838,15 @@ void KoToolButton::init() // We are interested in the mouse clicks on the arrow button m_popup->installEventFilter( this ); - ARROW_WIDTH = tqstyle().pixelMetric(TQStyle::PM_MenuButtonIndicator) + 4; + ARROW_WIDTH = style().pixelMetric(TQStyle::PM_MenuButtonIndicator) + 4; kdDebug() << "##################### Arrow: " << ARROW_WIDTH << endl; } void KoToolButton::buttonShift( int& dx, int& dy ) { if ( isDown() && !m_arrowPressed ) { - dx += tqstyle().pixelMetric( TQStyle::PM_ButtonShiftHorizontal ); - dy += tqstyle().pixelMetric( TQStyle::PM_ButtonShiftVertical ); + dx += style().pixelMetric( TQStyle::PM_ButtonShiftHorizontal ); + dy += style().pixelMetric( TQStyle::PM_ButtonShiftVertical ); } } diff --git a/lib/kofficeui/KoUnitWidgets.cpp b/lib/kofficeui/KoUnitWidgets.cpp index 14b92ec6..2a2c854e 100644 --- a/lib/kofficeui/KoUnitWidgets.cpp +++ b/lib/kofficeui/KoUnitWidgets.cpp @@ -379,48 +379,48 @@ double KoUnitDoubleComboBox::value( void ) const KoUnitDoubleSpinComboBox::KoUnitDoubleSpinComboBox( TQWidget *parent, const char *name ) : TQWidget( parent ), m_step( 1.0 ) { - TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3 ); - //tqlayout->setMargin( 2 ); + TQGridLayout *layout = new TQGridLayout( this, 2, 3 ); + //layout->setMargin( 2 ); TQPushButton *up = new TQPushButton( "+", this ); //up->setFlat( true ); up->setMaximumHeight( 15 ); up->setMaximumWidth( 15 ); - tqlayout->addWidget( up, 0, 0 ); + layout->addWidget( up, 0, 0 ); connect( up, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotUpClicked() ) ); TQPushButton *down = new TQPushButton( "-", this ); down->setMaximumHeight( 15 ); down->setMaximumWidth( 15 ); - tqlayout->addWidget( down, 1, 0 ); + layout->addWidget( down, 1, 0 ); connect( down, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotDownClicked() ) ); m_combo = new KoUnitDoubleComboBox( this, KoUnit::ptToUnit( 0.0, KoUnit::U_PT ), KoUnit::ptToUnit( 9999.99, KoUnit::U_PT ), 0.0, KoUnit::U_PT, 2, name ); connect( m_combo, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SIGNAL( valueChanged( double ) ) ); - tqlayout->addMultiCellWidget( m_combo, 0, 1, 2, 2 ); + layout->addMultiCellWidget( m_combo, 0, 1, 2, 2 ); } KoUnitDoubleSpinComboBox::KoUnitDoubleSpinComboBox( TQWidget *parent, double lower, double upper, double step, double value, KoUnit::Unit unit, unsigned int precision, const char *name ) : TQWidget( parent ), m_step( step )//, m_lowerInPoints( lower ), m_upperInPoints( upper ) { - TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3 ); - //tqlayout->setMargin( 2 ); + TQGridLayout *layout = new TQGridLayout( this, 2, 3 ); + //layout->setMargin( 2 ); TQPushButton *up = new TQPushButton( "+", this ); //up->setFlat( true ); up->setMaximumHeight( 15 ); up->setMaximumWidth( 15 ); - tqlayout->addWidget( up, 0, 0 ); + layout->addWidget( up, 0, 0 ); connect( up, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotUpClicked() ) ); TQPushButton *down = new TQPushButton( "-", this ); down->setMaximumHeight( 15 ); down->setMaximumWidth( 15 ); - tqlayout->addWidget( down, 1, 0 ); + layout->addWidget( down, 1, 0 ); connect( down, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotDownClicked() ) ); m_combo = new KoUnitDoubleComboBox( this, KoUnit::ptToUnit( lower, unit ), KoUnit::ptToUnit( upper, unit ), value, unit, precision, name ); connect( m_combo, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SIGNAL( valueChanged( double ) ) ); - tqlayout->addMultiCellWidget( m_combo, 0, 1, 2, 2 ); + layout->addMultiCellWidget( m_combo, 0, 1, 2, 2 ); } void diff --git a/lib/kofficeui/tkaction.cpp b/lib/kofficeui/tkaction.cpp index cfc21c65..65b4de02 100644 --- a/lib/kofficeui/tkaction.cpp +++ b/lib/kofficeui/tkaction.cpp @@ -128,11 +128,11 @@ TQWidget* TKAction::createLayout(TQWidget* parent, TQWidget* children) TQLabel* pixLabel = new TQLabel(base,"pixmap"); children->reparent(base,TQPoint(0,0)); children->setName("widget"); - TQHBoxLayout* tqlayout = new TQHBoxLayout(base,0,3); - tqlayout->setResizeMode(TQLayout::Minimum); - tqlayout->addWidget(textLabel); - tqlayout->addWidget(pixLabel); - tqlayout->addWidget(children,1); + TQHBoxLayout* layout = new TQHBoxLayout(base,0,3); + layout->setResizeMode(TQLayout::Minimum); + layout->addWidget(textLabel); + layout->addWidget(pixLabel); + layout->addWidget(children,1); updateLayout(base); return base; diff --git a/lib/kofficeui/tkcoloractions.cpp b/lib/kofficeui/tkcoloractions.cpp index 1449d0fb..11ddbc7f 100644 --- a/lib/kofficeui/tkcoloractions.cpp +++ b/lib/kofficeui/tkcoloractions.cpp @@ -43,7 +43,7 @@ TKColorPopupMenu::~TKColorPopupMenu() void TKColorPopupMenu::updateItemSize() { - styleChange(tqstyle()); + styleChange(style()); } /****************************************************************************************/ class TKSelectColorActionPrivate diff --git a/lib/kofficeui/tkcombobox.cpp b/lib/kofficeui/tkcombobox.cpp index cd20f790..c7b2a8b2 100644 --- a/lib/kofficeui/tkcombobox.cpp +++ b/lib/kofficeui/tkcombobox.cpp @@ -87,11 +87,11 @@ void TKComboBox::paintEvent(TQPaintEvent*) TQPixmap pixmap(arrow_down); - tqstyle().drawControl( TQStyle::CE_PushButton, &p, this, TQRect( bx, by, bw, bh ), colorGroup() ); - tqstyle().drawItem( &p, TQRect( bx, by, bw, bh), AlignCenter, colorGroup(), isEnabled(), &pixmap, TQString() ); + style().drawControl( TQStyle::CE_PushButton, &p, this, TQRect( bx, by, bw, bh ), colorGroup() ); + style().drawItem( &p, TQRect( bx, by, bw, bh), AlignCenter, colorGroup(), isEnabled(), &pixmap, TQString() ); if ( hasFocus()) { - tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, fr, g ); + style().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, fr, g ); } if (!editable()) { diff --git a/lib/kofficeui/tktoolbarbutton.cpp b/lib/kofficeui/tktoolbarbutton.cpp index af2b14c2..8a2798e0 100644 --- a/lib/kofficeui/tktoolbarbutton.cpp +++ b/lib/kofficeui/tktoolbarbutton.cpp @@ -353,14 +353,14 @@ void TKToolBarButton::drawButton( TQPainter* p ) #define DRAW_PIXMAP_AND_TEXT \ int x = 3;\ if (pixmap()) {\ - tqstyle().drawItem( p, TQRect( x, 0, pixmap()->width(), height() ), AlignCenter, colorGroup(), isEnabled(), pixmap(), TQString() );\ + style().drawItem( p, TQRect( x, 0, pixmap()->width(), height() ), AlignCenter, colorGroup(), isEnabled(), pixmap(), TQString() );\ if (d->m_iconMode==TK::IconAndText && !d->m_text.isEmpty()) {\ x += pixmap()->width() + 3;\ }\ }\ if ((d->m_iconMode==TK::IconAndText||d->m_iconMode==TK::TextOnly) && !d->m_text.isEmpty()) {\ TQFontMetrics fm(KGlobalSettings::toolBarFont());\ - tqstyle().drawItem( p, TQRect( x, 0, fm.width(d->m_text), height() ), AlignCenter, colorGroup(), isEnabled(), 0, d->m_text );\ + style().drawItem( p, TQRect( x, 0, fm.width(d->m_text), height() ), AlignCenter, colorGroup(), isEnabled(), 0, d->m_text );\ } const char* arrow[] = { @@ -384,20 +384,20 @@ void TKToolBarButton::drawButton( TQPainter* p ) if (d->m_isRaised) flags |= TQStyle::Style_Raised; if (hasFocus()) flags |= TQStyle::Style_HasFocus; - tqstyle().drawComplexControl( TQStyle::CC_ToolButton, p, this, TQRect( 0, 0, width()-12, height() ), colorGroup(), flags, TQStyle::SC_ToolButton ); - tqstyle().drawComplexControl( TQStyle::CC_ToolButton, p, this, TQRect( width()-13, 0, 13, height() ), colorGroup(), flags, TQStyle::SC_ToolButton ); - tqstyle().drawItem( p, TQRect( width()-13, 0, 13, height() ), AlignCenter, colorGroup(), isEnabled(), &arrow_pix, TQString() ); + style().drawComplexControl( TQStyle::CC_ToolButton, p, this, TQRect( 0, 0, width()-12, height() ), colorGroup(), flags, TQStyle::SC_ToolButton ); + style().drawComplexControl( TQStyle::CC_ToolButton, p, this, TQRect( width()-13, 0, 13, height() ), colorGroup(), flags, TQStyle::SC_ToolButton ); + style().drawItem( p, TQRect( width()-13, 0, 13, height() ), AlignCenter, colorGroup(), isEnabled(), &arrow_pix, TQString() ); if ( d->m_isRaised ) qDrawShadeLine( p, width()-12, 0, width()-12, height(), colorGroup(), true ); DRAW_PIXMAP_AND_TEXT } else { - tqstyle().drawControl( TQStyle::CE_PushButton, p, this, TQRect( 0, 0, width(), height() ), isEnabled() ? colorGroup() : tqpalette().disabled(), f ); + style().drawControl( TQStyle::CE_PushButton, p, this, TQRect( 0, 0, width(), height() ), isEnabled() ? colorGroup() : palette().disabled(), f ); DRAW_PIXMAP_AND_TEXT int z = f ? 1:0; p->drawPixmap(width()-11+z,(height()-4)/2+z ,arrow_pix); } } else { - tqstyle().drawControl( TQStyle::CE_PushButton, p, this, TQRect( 0, 0, width(), height() ), isEnabled() ? colorGroup() : tqpalette().disabled(), f ); + style().drawControl( TQStyle::CE_PushButton, p, this, TQRect( 0, 0, width(), height() ), isEnabled() ? colorGroup() : palette().disabled(), f ); DRAW_PIXMAP_AND_TEXT } } diff --git a/lib/kopainter/koIconChooser.cc b/lib/kopainter/koIconChooser.cc index 7fa2f11b..9fd7f877 100644 --- a/lib/kopainter/koIconChooser.cc +++ b/lib/kopainter/koIconChooser.cc @@ -446,7 +446,7 @@ KoPatternChooser::KoPatternChooser( const TQPtrList<KoIconItem> &list, TQWidget for( itr.toFirst(); itr.current(); ++itr ) chooser->addItem( itr.current() ); - TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 1, -1, "main tqlayout" ); + TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 1, -1, "main layout" ); mainLayout->addWidget( chooser, 10 ); } diff --git a/lib/kopalette/kopalette.cc b/lib/kopalette/kopalette.cc index 04774369..dd247877 100644 --- a/lib/kopalette/kopalette.cc +++ b/lib/kopalette/kopalette.cc @@ -54,8 +54,8 @@ KoPalette::KoPalette(TQWidget * parent, const char * name) setHorizontallyStretchable(false); setNewLine(true); - tqlayout() -> setSpacing(0); - tqlayout() -> setMargin(0); + layout() -> setSpacing(0); + layout() -> setMargin(0); resetFont(); } diff --git a/lib/kopalette/kopalettemanager.h b/lib/kopalette/kopalettemanager.h index be9e7126..dd8f1686 100644 --- a/lib/kopalette/kopalettemanager.h +++ b/lib/kopalette/kopalettemanager.h @@ -172,7 +172,7 @@ public slots: void showAllPalettes(bool shown); /** - * Restores the palette configuration to the default tqlayout, i.e, the tqlayout + * Restores the palette configuration to the default layout, i.e, the layout * preferred by each docker. */ virtual void slotReset(); diff --git a/lib/koproperty/editoritem.cpp b/lib/koproperty/editoritem.cpp index 0a431329..1027d224 100644 --- a/lib/koproperty/editoritem.cpp +++ b/lib/koproperty/editoritem.cpp @@ -133,7 +133,7 @@ class GroupWidgetBase : public TQWidget TQRect r(rect()); TQPainter p(this); TQStyle::StyleFlags flags = m_mouseDown ? TQStyle::Style_Down : TQStyle::Style_Default; - kapp->tqstyle().tqdrawPrimitive(TQStyle::PE_HeaderSection, &p, r, tqpalette().active(), flags); + kapp->style().tqdrawPrimitive(TQStyle::PE_HeaderSection, &p, r, palette().active(), flags); paintListViewExpander(&p, this, r.height()+2, tqpalette().active(), isOpen()); if (!m_miniicon.isNull()) { @@ -143,7 +143,7 @@ class GroupWidgetBase : public TQWidget if (!m_titleStr.isNull()) { int indent = 16 + (m_miniicon.isNull() ? 0 : (m_miniicon.width()+4)); - p.setPen(tqpalette().active().text()); + p.setPen(palette().active().text()); TQFont f = p.font(); f.setBold(true); p.setFont(f); diff --git a/lib/koproperty/editors/booledit.cpp b/lib/koproperty/editors/booledit.cpp index da3fd994..7791730c 100644 --- a/lib/koproperty/editors/booledit.cpp +++ b/lib/koproperty/editors/booledit.cpp @@ -46,7 +46,7 @@ BoolEdit::BoolEdit(Property *property, TQWidget *parent, const char *name) m_toggle->setUsesTextLabel(true); m_toggle->setTextPosition(TQToolButton::Right); m_toggle->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); - //we're not using tqlayout to because of problems with button size + //we're not using layout to because of problems with button size m_toggle->move(0, 0); m_toggle->resize(width(), height()); setFocusWidget(m_toggle); diff --git a/lib/koproperty/editors/fontedit.cpp b/lib/koproperty/editors/fontedit.cpp index f85279ce..a4f4b519 100644 --- a/lib/koproperty/editors/fontedit.cpp +++ b/lib/koproperty/editors/fontedit.cpp @@ -47,7 +47,7 @@ class FontEditRequester : public KFontRequester FontEditRequester(TQWidget* parent) : KFontRequester(parent) { - label()->setPaletteBackgroundColor(tqpalette().active().base()); + label()->setPaletteBackgroundColor(palette().active().base()); label()->setMinimumWidth(0); label()->setFrameShape(TQFrame::Box); label()->setIndent(-1); @@ -55,9 +55,9 @@ class FontEditRequester : public KFontRequester label()->setFocusPolicy(TQ_ClickFocus); KAcceleratorManager::setNoAccel(label()); #endif - tqlayout()->remove(label()); - tqlayout()->remove(button());//->reparent(this, 0, TQPoint(0,0)); - delete tqlayout(); + layout()->remove(label()); + layout()->remove(button());//->reparent(this, 0, TQPoint(0,0)); + delete layout(); button()->setText(i18n("...")); TQToolTip::add(button(), i18n("Change font")); button()->setFocusPolicy(TQ_NoFocus); diff --git a/lib/koproperty/editors/pixmapedit.cpp b/lib/koproperty/editors/pixmapedit.cpp index d887a8cd..265ee16d 100644 --- a/lib/koproperty/editors/pixmapedit.cpp +++ b/lib/koproperty/editors/pixmapedit.cpp @@ -73,7 +73,7 @@ PixmapEdit::PixmapEdit(Property *property, TQWidget *parent, const char *name) m_button->setFocusPolicy(TQ_NoFocus); m_popup = new TQLabel(0, "m_popup", TQt::WStyle_Customize|TQt::WStyle_NoBorder|TQt::WX11BypassWM|WStyle_StaysOnTop); - m_popup->setPaletteBackgroundColor(m_popup->tqpalette().active().base()); + m_popup->setPaletteBackgroundColor(m_popup->palette().active().base()); m_popup->setFrameStyle(TQFrame::Plain|TQFrame::Box); m_popup->setMargin(2); m_popup->setLineWidth(1); diff --git a/lib/koproperty/editors/pointedit.cpp b/lib/koproperty/editors/pointedit.cpp index c47c854f..7badc4de 100644 --- a/lib/koproperty/editors/pointedit.cpp +++ b/lib/koproperty/editors/pointedit.cpp @@ -41,7 +41,7 @@ PointEdit::PointEdit(Property *property, TQWidget *parent, const char *name) m_edit = new KActiveLabel(this); m_edit->setFocusPolicy(TQ_NoFocus); // m_edit->setIndent(KPROPEDITOR_ITEM_MARGIN); - m_edit->setPaletteBackgroundColor(tqpalette().active().base()); + m_edit->setPaletteBackgroundColor(palette().active().base()); m_edit->setWordWrap( TQTextEdit::NoWrap ); // m_edit->setBackgroundMode(TQt::PaletteBase); // m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); diff --git a/lib/koproperty/editors/rectedit.cpp b/lib/koproperty/editors/rectedit.cpp index 3cebfea8..2422eec8 100644 --- a/lib/koproperty/editors/rectedit.cpp +++ b/lib/koproperty/editors/rectedit.cpp @@ -39,7 +39,7 @@ RectEdit::RectEdit(Property *property, TQWidget *parent, const char *name) setHasBorders(false); m_edit = new KActiveLabel(this); m_edit->setFocusPolicy(TQ_NoFocus); - m_edit->setPaletteBackgroundColor(tqpalette().active().base()); + m_edit->setPaletteBackgroundColor(palette().active().base()); m_edit->setWordWrap( TQTextEdit::NoWrap ); m_edit->setMinimumHeight(5); setEditor(m_edit); diff --git a/lib/koproperty/editors/sizeedit.cpp b/lib/koproperty/editors/sizeedit.cpp index 98075515..3e0213d9 100644 --- a/lib/koproperty/editors/sizeedit.cpp +++ b/lib/koproperty/editors/sizeedit.cpp @@ -41,7 +41,7 @@ SizeEdit::SizeEdit(Property *property, TQWidget *parent, const char *name) m_edit = new KActiveLabel(this); m_edit->setFocusPolicy(TQ_NoFocus); // m_edit->setIndent(KPROPEDITOR_ITEM_MARGIN); - m_edit->setPaletteBackgroundColor(tqpalette().active().base()); + m_edit->setPaletteBackgroundColor(palette().active().base()); // m_edit->setBackgroundMode(TQt::PaletteBase); // m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_edit->setMinimumHeight(5); diff --git a/lib/koproperty/editors/symbolcombo.cpp b/lib/koproperty/editors/symbolcombo.cpp index 65a7d951..faaefdb9 100644 --- a/lib/koproperty/editors/symbolcombo.cpp +++ b/lib/koproperty/editors/symbolcombo.cpp @@ -61,7 +61,7 @@ TQVariant SymbolCombo::value() const { if (!(m_edit->text().isNull())) - return m_edit->text().at(0).tqunicode(); + return m_edit->text().at(0).unicode(); else return 0; } diff --git a/lib/koproperty/property.h b/lib/koproperty/property.h index 5f61ff6b..9f097c61 100644 --- a/lib/koproperty/property.h +++ b/lib/koproperty/property.h @@ -104,7 +104,7 @@ enum PropertyType { //predefined custom types ValueFromList = 2000 /**<string value from a list*/, - Symbol = 2001 /**<tqunicode symbol code*/, + Symbol = 2001 /**<unicode symbol code*/, FontName /**<font name, e.g. "times new roman"*/, FileURL /**<url of a file*/, PictureFileURL /**<url of a pixmap*/, diff --git a/lib/koproperty/widgetproxy.cpp b/lib/koproperty/widgetproxy.cpp index a4558319..9e6ea602 100644 --- a/lib/koproperty/widgetproxy.cpp +++ b/lib/koproperty/widgetproxy.cpp @@ -30,7 +30,7 @@ class WidgetProxyPrivate { public: WidgetProxyPrivate() - : property(0), widget(0), type(Invalid), tqlayout(0) + : property(0), widget(0), type(Invalid), layout(0) {} ~WidgetProxyPrivate() {} @@ -38,7 +38,7 @@ class WidgetProxyPrivate Widget *widget; PropertyType type; - TQHBoxLayout *tqlayout; + TQHBoxLayout *layout; }; } @@ -49,7 +49,7 @@ WidgetProxy::WidgetProxy(TQWidget *parent, const char *name) { d = new WidgetProxyPrivate(); d->property = new Property(); - d->tqlayout = new TQHBoxLayout(this, 0, 0); + d->layout = new TQHBoxLayout(this, 0, 0); } WidgetProxy::~WidgetProxy() @@ -118,7 +118,7 @@ WidgetProxy::setWidget() if (d->widget) { d->widget->reparent(this, TQPoint(0,0), true); - d->tqlayout->addWidget(d->widget); + d->layout->addWidget(d->widget); } } diff --git a/lib/kotext/DESIGN b/lib/kotext/DESIGN index 4fd1e479..12bc2940 100644 --- a/lib/kotext/DESIGN +++ b/lib/kotext/DESIGN @@ -26,17 +26,17 @@ Zoomed: (aka Normal) Internal: The former two were mostly for objects like frames etc, not for text. Text (the individual - words and characters) are positioned with the tqlayout coordinates. Layout is similar to the + words and characters) are positioned with the layout coordinates. Layout is similar to the Zoomed system, but always uses the same resolution. This resolution is sufficiently high to - do the tqlayout in integers, and not really lose info. + do the layout in integers, and not really lose info. - This is the high-resolution unit in which the text tqlayout is done, + This is the high-resolution unit in which the text layout is done, currently set to 1440 DPI. Everything known the QRT classes will be in this coordinate system (including the QTextFormats). When painting, we apply the current zoom and resolution to find the right font size to use, and we have to catch up with rounding differences. However the position of the words - (i.e. tqlayout) is the one determined previously in tqlayout units. KoZoomHandler - offers methods for converting between tqlayout units and zoom-dependent points + (i.e. layout) is the one determined previously in layout units. KoZoomHandler + offers methods for converting between layout units and zoom-dependent points and pixels. Note that the Internal coordinate system starts at the topleft corner of @@ -73,14 +73,14 @@ Document (pt values, in double, KoPoint, KoRect.) | |--KWTextFrameSet::documentToInternal V -Internal coordinates (the coordinates given to QRT - in "tqlayout units") -Note that there are pixels and pts in the tqlayout unit system too ! +Internal coordinates (the coordinates given to QRT - in "layout units") +Note that there are pixels and pts in the layout unit system too ! There are conversions between LU points and document points, but also direct conversions between LU pixels and view pixels. Font sizes ========== -A 12pt font will lead to a tqlayout font of ptToLayoutUnit(12)=20*12=240pt - +A 12pt font will lead to a layout font of ptToLayoutUnit(12)=20*12=240pt - that's the value stored in the QTextFormat. However font metrics are calculated from the 100%-zoom-level font (e.g. 12pt for a 12pt font) diff --git a/lib/kotext/KFontDialog_local.cpp b/lib/kotext/KFontDialog_local.cpp index 393488c9..8be2f699 100644 --- a/lib/kotext/KFontDialog_local.cpp +++ b/lib/kotext/KFontDialog_local.cpp @@ -473,7 +473,7 @@ void KFontChooser_local::family_chosen_slot(const TQString& family) TQFontDatabase dbase; - TQStringList styles = TQStringList(dbase.tqstyles(currentFamily)); + TQStringList styles = TQStringList(dbase.styles(currentFamily)); styleListBox->clear(); currentStyles.clear(); for ( TQStringList::Iterator it = styles.begin(); it != styles.end(); ++it ) { diff --git a/lib/kotext/KoChangeCaseDia.cpp b/lib/kotext/KoChangeCaseDia.cpp index 8f7c2515..cde58f0a 100644 --- a/lib/kotext/KoChangeCaseDia.cpp +++ b/lib/kotext/KoChangeCaseDia.cpp @@ -36,7 +36,7 @@ KoChangeCaseDia::KoChangeCaseDia( TQWidget *parent, const char *name ) TQButtonGroup *grp = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Case" ),page ); grp->setRadioButtonExclusive( TRUE ); - grp->tqlayout(); + grp->layout(); m_upperCase=new TQRadioButton( i18n("&Uppercase"), grp ); m_lowerCase=new TQRadioButton( i18n("&Lowercase"), grp ); diff --git a/lib/kotext/KoCompletionBase.ui b/lib/kotext/KoCompletionBase.ui index 3156e078..babc467c 100644 --- a/lib/kotext/KoCompletionBase.ui +++ b/lib/kotext/KoCompletionBase.ui @@ -29,7 +29,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <hbox> <property name="name"> @@ -45,7 +45,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <vbox> <property name="name"> @@ -129,7 +129,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <grid> <property name="name"> @@ -254,7 +254,7 @@ This option is most important when Automatically add words to completion list is </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <hbox> <property name="name"> @@ -302,7 +302,7 @@ This option is most important when Automatically add words to completion list is </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> diff --git a/lib/kotext/KoCompletionDia.cpp b/lib/kotext/KoCompletionDia.cpp index abe89b56..09e12f0d 100644 --- a/lib/kotext/KoCompletionDia.cpp +++ b/lib/kotext/KoCompletionDia.cpp @@ -40,7 +40,7 @@ KoCompletionDia::KoCompletionDia( TQWidget *parent, const char *name, KoAutoForm { TQVBox *page = makeVBoxMainWidget(); m_widget = new KoCompletion(page, autoFormat); - m_widget->tqlayout()->setMargin(0); + m_widget->layout()->setMargin(0); connect( this, TQT_SIGNAL( user1Clicked() ), m_widget, TQT_SLOT(slotResetConf())); setButtonWhatsThis(Ok,i18n("This will save your options.")); setButtonWhatsThis(Cancel,i18n("This will abort all changes.")); diff --git a/lib/kotext/KoComplexText.cpp b/lib/kotext/KoComplexText.cpp index 96ff88e1..475f439d 100644 --- a/lib/kotext/KoComplexText.cpp +++ b/lib/kotext/KoComplexText.cpp @@ -72,7 +72,7 @@ static int shapeBufSize = 0; Arabic shaping obeys a number of rules according to the joining classes (see Unicode book, section on arabic). - Each tqunicode char has a joining class (right, dual (left&right), center (joincausing) or transparent). + Each unicode char has a joining class (right, dual (left&right), center (joincausing) or transparent). transparent joining is not encoded in TQChar::joining(), but applies to all combining marks and format marks. Right join-causing: dual + center @@ -113,7 +113,7 @@ static inline const TQChar *prevChar( const TQString &str, int pos ) { //kdDebug() << "leftChar: pos=" << pos << endl; pos--; - const TQChar *ch = str.tqunicode() + pos; + const TQChar *ch = str.unicode() + pos; while( pos > -1 ) { if( !ch->isMark() ) return ch; @@ -127,7 +127,7 @@ static inline const TQChar *nextChar( const TQString &str, int pos) { pos++; int len = str.length(); - const TQChar *ch = str.tqunicode() + pos; + const TQChar *ch = str.unicode() + pos; while( pos < len ) { //kdDebug() << "rightChar: " << pos << " isLetter=" << ch.isLetter() << ", joining=" << ch.joining() << endl; if( !ch->isMark() ) @@ -155,7 +155,7 @@ KoComplexText::Shape KoComplexText::glyphVariant( const TQString &str, int pos) { // ignores L1 - L3, done in the codec TQChar::Joining joining = str[pos].joining(); - //kdDebug() << "checking " << str[pos].tqunicode() << ", joining=" << joining << endl; + //kdDebug() << "checking " << str[pos].unicode() << ", joining=" << joining << endl; switch ( joining ) { case TQChar::OtherJoining: case TQChar::Center: @@ -200,7 +200,7 @@ KoComplexText::Shape KoComplexText::glyphVariantLogical( const TQString &str, in { // ignores L1 - L3, ligatures are job of the codec TQChar::Joining joining = str[pos].joining(); - //kdDebug() << "checking " << str[pos].tqunicode() << ", joining=" << joining << endl; + //kdDebug() << "checking " << str[pos].unicode() << ", joining=" << joining << endl; switch ( joining ) { case TQChar::OtherJoining: case TQChar::Center: @@ -229,7 +229,7 @@ KoComplexText::Shape KoComplexText::glyphVariantLogical( const TQString &str, in // ------------------------------------------------------------- -// The tqunicode to tqunicode shaping codec. +// The unicode to unicode shaping codec. // does only presentation forms B at the moment, but that should be enough for // simple display static const ushort arabicUnicodeMapping[256][2] = { @@ -561,13 +561,13 @@ TQString KoComplexText::shapedString(const TQString& uc, int from, int len, TQPa // we have to ignore NSMs at the beginning and add at the end. int num = uc.length() - from - len; - const TQChar *ch = uc.tqunicode() + from + len; + const TQChar *ch = uc.unicode() + from + len; while ( num > 0 && ch->combiningClass() != 0 ) { ch++; num--; len++; } - ch = uc.tqunicode() + from; + ch = uc.unicode() + from; while ( len > 0 && ch->combiningClass() != 0 ) { ch++; len--; @@ -602,7 +602,7 @@ TQString KoComplexText::shapedString(const TQString& uc, int from, int len, TQPa if ( dir == TQPainter::RTL ) pos = from + len - 1 - i; int shape = glyphVariantLogical( uc, pos ); - //kdDebug() << "mapping U+" << ch->tqunicode() << " to shape " << shape << " glyph=0x" << arabicUnicodeMapping[ch->cell()][shape] << endl; + //kdDebug() << "mapping U+" << ch->unicode() << " to shape " << shape << " glyph=0x" << arabicUnicodeMapping[ch->cell()][shape] << endl; // take care of lam-alef ligatures (lam right of alef) ushort map; switch ( c ) { @@ -627,7 +627,7 @@ TQString KoComplexText::shapedString(const TQString& uc, int from, int len, TQPa case 0x23: // alef with hamza above case 0x25: // alef with hamza below case 0x27: // alef - if ( prevChar( uc, pos )->tqunicode() == 0x0644 ) { + if ( prevChar( uc, pos )->unicode() == 0x0644 ) { // have a lam alef ligature //kdDebug() << " alef of lam-alef ligature" << endl; goto skip; @@ -689,12 +689,12 @@ TQString KoComplexText::shapedString(const TQString& uc, int from, int len, TQPa TQChar KoComplexText::shapedCharacter( const TQString &str, int pos, const TQFontMetrics *fm ) { - const TQChar *ch = str.tqunicode() + pos; + const TQChar *ch = str.unicode() + pos; if ( ch->row() != 0x06 ) return *ch; else { int shape = glyphVariantLogical( str, pos ); - //kdDebug() << "mapping U+" << ch->tqunicode() << " to shape " << shape << " glyph=0x" << arabicUnicodeMapping[ch->cell()][shape] << endl; + //kdDebug() << "mapping U+" << ch->unicode() << " to shape " << shape << " glyph=0x" << arabicUnicodeMapping[ch->cell()][shape] << endl; // lam aleph ligatures switch ( ch->cell() ) { case 0x44: { // lam @@ -716,7 +716,7 @@ TQChar KoComplexText::shapedCharacter( const TQString &str, int pos, const TQFon case 0x23: // alef with hamza above case 0x25: // alef with hamza below case 0x27: // alef - if ( prevChar( str, pos )->tqunicode() == 0x0644 ) + if ( prevChar( str, pos )->unicode() == 0x0644 ) // have a lam alef ligature return TQChar(0); default: @@ -842,7 +842,7 @@ TQPointArray KoComplexText::positionMarks( TQFontPrivate *f, const TQString &str default: break; } - //kdDebug() << "char=" << mark.tqunicode() << " combiningClass = " << cmb << " offset=" << p.x() << "/" << p.y() << endl; + //kdDebug() << "char=" << mark.unicode() << " combiningClass = " << cmb << " offset=" << p.x() << "/" << p.y() << endl; markRect.moveBy( p.x(), p.y() ); p += TQPoint( -baseOffset, 0 ); attachmentRect |= markRect; @@ -864,7 +864,7 @@ static TQChar::Direction basicDirection(const TQString &str, int start = 0) { int len = str.length(); int pos = start > len ? len -1 : start; - const TQChar *uc = str.tqunicode() + pos; + const TQChar *uc = str.unicode() + pos; while( pos < len ) { switch( uc->direction() ) { @@ -1406,8 +1406,8 @@ TQString KoComplexText::bidiReorderString( const TQString &str, TQChar::Directio int len = str.length(); TQString visual; visual.setUnicode( 0, len ); - TQChar *vch = (TQChar *)visual.tqunicode(); - const TQChar *ch = str.tqunicode(); + TQChar *vch = (TQChar *)visual.unicode(); + const TQChar *ch = str.unicode(); while( lineStart < len ) { lineEnd = lineStart; while( *ch != '\n' && lineEnd < len ) { diff --git a/lib/kotext/KoParagCounter.cpp b/lib/kotext/KoParagCounter.cpp index 56adc3a2..9810e8b0 100644 --- a/lib/kotext/KoParagCounter.cpp +++ b/lib/kotext/KoParagCounter.cpp @@ -216,7 +216,7 @@ void KoParagCounter::loadOasisListStyle( const TQDomElement& listStyle, TQString bulletChar = listStyle.attributeNS( KoXmlNS::text, "bullet-char", TQString() ); if ( !bulletChar.isEmpty() ) { // Reverse engineering, I found those codes: - switch( bulletChar[0].tqunicode() ) { + switch( bulletChar[0].unicode() ) { case 0x2022: // small disc -> circle m_style = STYLE_CIRCLEBULLET; break; @@ -235,7 +235,7 @@ void KoParagCounter::loadOasisListStyle( const TQDomElement& listStyle, m_style = STYLE_BOXBULLET; break; default: - kdDebug() << "Unhandled bullet code 0x" << TQString::number( (uint)m_customBulletChar.tqunicode(), 16 ) << endl; + kdDebug() << "Unhandled bullet code 0x" << TQString::number( (uint)m_customBulletChar.unicode(), 16 ) << endl; // fallback case 0x2794: // arrow case 0x2717: // cross @@ -504,7 +504,7 @@ void KoParagCounter::save( TQDomElement & element ) element.setAttribute( "depth", m_depth ); if ( (Style)m_style == STYLE_CUSTOMBULLET ) { - element.setAttribute( "bullet", m_customBulletChar.tqunicode() ); + element.setAttribute( "bullet", m_customBulletChar.unicode() ); if ( !m_customBulletFont.isEmpty() ) element.setAttribute( "bulletfont", m_customBulletFont ); } @@ -973,7 +973,7 @@ void KoParagCounter::printRTDebug( KoTextParag* parag ) if ( restartCounter() ) additionalInfo = "[restartCounter]"; if ( m_style == STYLE_CUSTOMBULLET ) - additionalInfo += " [customBullet: " + TQString::number( m_customBulletChar.tqunicode() ) + additionalInfo += " [customBullet: " + TQString::number( m_customBulletChar.unicode() ) + " in font '" + m_customBulletFont + "']"; static const char * const s_numbering[] = { "List", "Chapter", "None", "Footnote" }; kdDebug(32500) << " Counter style=" << style() diff --git a/lib/kotext/KoParagDia.cpp b/lib/kotext/KoParagDia.cpp index 1d424b27..0e38c8b5 100644 --- a/lib/kotext/KoParagDia.cpp +++ b/lib/kotext/KoParagDia.cpp @@ -830,7 +830,7 @@ void KoStylePreview::drawContents( TQPainter *painter ) TQRect whiteRect( r.x() + 10, r.y() + 10, r.width() - 20, r.height() - 20 ); - TQColorGroup cg = TQApplication::tqpalette().active(); + TQColorGroup cg = TQApplication::palette().active(); painter->fillRect( whiteRect, cg.brush( TQColorGroup::Base ) ); KoTextParag * parag = m_textdoc->firstParag(); @@ -1605,9 +1605,9 @@ KoParagCounterWidget::KoParagCounterWidget( bool disableAll, TQWidget * parent, gNumbering = new TQButtonGroup( this, "numberingGroup" ); gNumbering->setTitle( i18n( "Numbering" ) ); gNumbering->setColumnLayout(0, Qt::Vertical ); - gNumbering->tqlayout()->setSpacing( 0 ); - gNumbering->tqlayout()->setMargin( 0 ); - TQHBoxLayout *numberingGroupLayout = new TQHBoxLayout( gNumbering->tqlayout() ); + gNumbering->layout()->setSpacing( 0 ); + gNumbering->layout()->setMargin( 0 ); + TQHBoxLayout *numberingGroupLayout = new TQHBoxLayout( gNumbering->layout() ); numberingGroupLayout->setAlignment( TQt::AlignTop ); numberingGroupLayout->setSpacing( KDialog::spacingHint() ); numberingGroupLayout->setMargin( KDialog::marginHint() ); @@ -1770,9 +1770,9 @@ KoParagTabulatorsWidget::KoParagTabulatorsWidget( KoUnit::Unit unit, double fram gPosition = new TQGroupBox( this, "gPosition" ); gPosition->setTitle( i18n( "Po&sition" ) ); gPosition->setColumnLayout(0, Qt::Vertical ); - gPosition->tqlayout()->setSpacing( 0 ); - gPosition->tqlayout()->setMargin( 0 ); - TQVBoxLayout* GroupBox2Layout = new TQVBoxLayout( gPosition->tqlayout() ); + gPosition->layout()->setSpacing( 0 ); + gPosition->layout()->setMargin( 0 ); + TQVBoxLayout* GroupBox2Layout = new TQVBoxLayout( gPosition->layout() ); GroupBox2Layout->setAlignment( TQt::AlignTop ); GroupBox2Layout->setSpacing( KDialog::spacingHint() ); GroupBox2Layout->setMargin( KDialog::marginHint() ); @@ -1798,9 +1798,9 @@ KoParagTabulatorsWidget::KoParagTabulatorsWidget( KoUnit::Unit unit, double fram bgAlign = new TQButtonGroup( this ); bgAlign->setTitle( i18n( "Alignment" ) ); bgAlign->setColumnLayout(0, Qt::Vertical ); - bgAlign->tqlayout()->setSpacing( 0 ); - bgAlign->tqlayout()->setMargin( 0 ); - TQVBoxLayout* ButtonGroup1Layout = new TQVBoxLayout( bgAlign->tqlayout() ); + bgAlign->layout()->setSpacing( 0 ); + bgAlign->layout()->setMargin( 0 ); + TQVBoxLayout* ButtonGroup1Layout = new TQVBoxLayout( bgAlign->layout() ); ButtonGroup1Layout->setAlignment( TQt::AlignTop ); ButtonGroup1Layout->setSpacing( KDialog::spacingHint() ); ButtonGroup1Layout->setMargin( KDialog::marginHint() ); @@ -2159,31 +2159,31 @@ KoParagDia::KoParagDia( TQWidget* parent, const char* name, { TQVBox * page = addVBoxPage( i18n( "Indent && S&pacing" ) ); m_indentSpacingWidget = new KoIndentSpacingWidget( unit,_frameWidth,page, "indent-spacing" ); - m_indentSpacingWidget->tqlayout()->setMargin(0); + m_indentSpacingWidget->layout()->setMargin(0); } if ( m_flags & PD_ALIGN ) { TQVBox * page = addVBoxPage( i18n( "General &Layout" ) ); m_alignWidget = new KoParagAlignWidget( breakLine, page, "align" ); - m_alignWidget->tqlayout()->setMargin(0); + m_alignWidget->layout()->setMargin(0); } if ( m_flags & PD_DECORATION ) { TQVBox * page = addVBoxPage( i18n( "D&ecorations" ) ); m_decorationsWidget = new KoParagDecorationWidget( page, "decorations"); - m_decorationsWidget->tqlayout()->setMargin(0); + m_decorationsWidget->layout()->setMargin(0); } if ( m_flags & PD_NUMBERING ) { TQVBox * page = addVBoxPage( i18n( "B&ullets/Numbers" ) ); m_counterWidget = new KoParagCounterWidget( disableAll , page, "numbers" ); - m_counterWidget->tqlayout()->setMargin(0); + m_counterWidget->layout()->setMargin(0); } if ( m_flags & PD_TABS ) { TQVBox * page = addVBoxPage( i18n( "&Tabulators" ) ); m_tabulatorsWidget = new KoParagTabulatorsWidget( unit,_frameWidth, page, "tabs"); - m_tabulatorsWidget->tqlayout()->setMargin(0); + m_tabulatorsWidget->layout()->setMargin(0); } connect( this, TQT_SIGNAL( user1Clicked() ), this, TQT_SLOT(slotReset())); diff --git a/lib/kotext/KoParagDia.h b/lib/kotext/KoParagDia.h index 443bb62f..4fd8f784 100644 --- a/lib/kotext/KoParagDia.h +++ b/lib/kotext/KoParagDia.h @@ -95,7 +95,7 @@ public: /** return the (i18n-ed) name of the tab */ virtual TQString tabName() = 0; - // Return the part of the paragtqlayout that this widget cares about + // Return the part of the paraglayout that this widget cares about int flag() const { return m_flag; } private: diff --git a/lib/kotext/KoParagLayout.cpp b/lib/kotext/KoParagLayout.cpp index 8e5178a5..37fbbfb5 100644 --- a/lib/kotext/KoParagLayout.cpp +++ b/lib/kotext/KoParagLayout.cpp @@ -44,72 +44,72 @@ KoParagLayout::KoParagLayout() initialise(); } -void KoParagLayout::operator=( const KoParagLayout &tqlayout ) +void KoParagLayout::operator=( const KoParagLayout &layout ) { - alignment = tqlayout.alignment; + alignment = layout.alignment; for ( int i = 0 ; i < 5 ; ++i ) - margins[i] = tqlayout.margins[i]; - pageBreaking = tqlayout.pageBreaking; - leftBorder = tqlayout.leftBorder; - rightBorder = tqlayout.rightBorder; - topBorder = tqlayout.topBorder; - bottomBorder = tqlayout.bottomBorder; - joinBorder = tqlayout.joinBorder; - backgroundColor = tqlayout.backgroundColor; - if ( tqlayout.counter ) - counter = new KoParagCounter( *tqlayout.counter ); + margins[i] = layout.margins[i]; + pageBreaking = layout.pageBreaking; + leftBorder = layout.leftBorder; + rightBorder = layout.rightBorder; + topBorder = layout.topBorder; + bottomBorder = layout.bottomBorder; + joinBorder = layout.joinBorder; + backgroundColor = layout.backgroundColor; + if ( layout.counter ) + counter = new KoParagCounter( *layout.counter ); else counter = 0L; - lineSpacing = tqlayout.lineSpacing; - lineSpacingType = tqlayout.lineSpacingType; - style = tqlayout.style; - direction = tqlayout.direction; - setTabList( tqlayout.tabList() ); + lineSpacing = layout.lineSpacing; + lineSpacingType = layout.lineSpacingType; + style = layout.style; + direction = layout.direction; + setTabList( layout.tabList() ); } -int KoParagLayout::compare( const KoParagLayout & tqlayout ) const +int KoParagLayout::compare( const KoParagLayout & layout ) const { int flags = 0; - if ( alignment != tqlayout.alignment ) + if ( alignment != layout.alignment ) flags |= Alignment; for ( int i = 0 ; i < 5 ; ++i ) - if ( margins[i] != tqlayout.margins[i] ) + if ( margins[i] != layout.margins[i] ) { flags |= Margins; break; } - if ( pageBreaking != tqlayout.pageBreaking ) + if ( pageBreaking != layout.pageBreaking ) flags |= PageBreaking; - if ( leftBorder != tqlayout.leftBorder - || rightBorder != tqlayout.rightBorder - || topBorder != tqlayout.topBorder - || bottomBorder != tqlayout.bottomBorder - || joinBorder != tqlayout.joinBorder ) + if ( leftBorder != layout.leftBorder + || rightBorder != layout.rightBorder + || topBorder != layout.topBorder + || bottomBorder != layout.bottomBorder + || joinBorder != layout.joinBorder ) flags |= Borders; - if ( tqlayout.counter ) + if ( layout.counter ) { if ( counter ) { - if ( ! ( *tqlayout.counter == *counter ) ) + if ( ! ( *layout.counter == *counter ) ) flags |= BulletNumber; } else - if ( tqlayout.counter->numbering() != KoParagCounter::NUM_NONE ) + if ( layout.counter->numbering() != KoParagCounter::NUM_NONE ) flags |= BulletNumber; } else if ( counter && counter->numbering() != KoParagCounter::NUM_NONE ) flags |= BulletNumber; - if ( lineSpacing != tqlayout.lineSpacing - || lineSpacingType != tqlayout.lineSpacingType ) + if ( lineSpacing != layout.lineSpacing + || lineSpacingType != layout.lineSpacingType ) flags |= LineSpacing; - //if ( style != tqlayout.style ) + //if ( style != layout.style ) // flags |= Style; - if ( m_tabList != tqlayout.m_tabList ) + if ( m_tabList != layout.m_tabList ) flags |= Tabulator; - if ( backgroundColor != tqlayout.backgroundColor) + if ( backgroundColor != layout.backgroundColor) flags |= BackgroundColor; // This method is used for the GUI stuff only, so we don't have a flag @@ -141,13 +141,13 @@ KoParagLayout::~KoParagLayout() delete counter; } -void KoParagLayout::loadParagLayout( KoParagLayout& tqlayout, const TQDomElement& parentElem, int docVersion ) +void KoParagLayout::loadParagLayout( KoParagLayout& layout, const TQDomElement& parentElem, int docVersion ) { - // tqlayout is an input and output parameter + // layout is an input and output parameter // It can have been initialized already, e.g. by copying from a style // (we don't do that anymore though). - // Load the paragraph tabs - we load into a clean list, not mixing with those already in "tqlayout" + // Load the paragraph tabs - we load into a clean list, not mixing with those already in "layout" // We can't apply the 'default comes from the style' in this case, because // there is no way to differentiate between "I want no tabs in the parag" // and "use default from style". @@ -171,15 +171,15 @@ void KoParagLayout::loadParagLayout( KoParagLayout& tqlayout, const TQDomElement } } qHeapSort( tabList ); - tqlayout.setTabList( tabList ); - tqlayout.alignment = TQt::AlignAuto; + layout.setTabList( tabList ); + layout.alignment = TQt::AlignAuto; element = parentElem.namedItem( "FLOW" ).toElement(); // Flow is what is now called alignment internally if ( !element.isNull() ) { TQString flow = element.attribute( "align" ); // KWord-1.0 DTD if ( !flow.isEmpty() ) { - tqlayout.alignment = flow=="right" ? TQt::AlignRight : + layout.alignment = flow=="right" ? TQt::AlignRight : flow=="center" ? TQt::AlignHCenter : flow=="justify" ? TQt::AlignJustify : flow=="left" ? TQt::AlignLeft : TQt::AlignAuto; @@ -187,9 +187,9 @@ void KoParagLayout::loadParagLayout( KoParagLayout& tqlayout, const TQDomElement TQString dir = element.attribute( "dir" ); // KWord-1.2 if ( !dir.isEmpty() ) { if ( dir == "L" ) - tqlayout.direction = TQChar::DirL; + layout.direction = TQChar::DirL; else if ( dir == "R" ) - tqlayout.direction = TQChar::DirR; + layout.direction = TQChar::DirR; else kdWarning() << "Unexpected value for paragraph direction: " << dir << endl; } @@ -197,7 +197,7 @@ void KoParagLayout::loadParagLayout( KoParagLayout& tqlayout, const TQDomElement flow = element.attribute( "value" ); // KWord-0.8 static const int flow2align[] = { TQt::AlignAuto, TQt::AlignRight, TQt::AlignHCenter, TQt::AlignJustify }; if ( !flow.isEmpty() && flow.toInt() < 4 ) - tqlayout.alignment = flow2align[flow.toInt()]; + layout.alignment = flow2align[flow.toInt()]; } } @@ -205,34 +205,34 @@ void KoParagLayout::loadParagLayout( KoParagLayout& tqlayout, const TQDomElement { element = parentElem.namedItem( "OHEAD" ).toElement(); // used by KWord-0.8 if ( !element.isNull() ) - tqlayout.margins[TQStyleSheetItem::MarginTop] = getAttribute( element, "pt", 0.0 ); + layout.margins[TQStyleSheetItem::MarginTop] = getAttribute( element, "pt", 0.0 ); element = parentElem.namedItem( "OFOOT" ).toElement(); // used by KWord-0.8 if ( !element.isNull() ) - tqlayout.margins[TQStyleSheetItem::MarginBottom] = getAttribute( element, "pt", 0.0 ); + layout.margins[TQStyleSheetItem::MarginBottom] = getAttribute( element, "pt", 0.0 ); element = parentElem.namedItem( "IFIRST" ).toElement(); // used by KWord-0.8 if ( !element.isNull() ) - tqlayout.margins[TQStyleSheetItem::MarginFirstLine] = getAttribute( element, "pt", 0.0 ); + layout.margins[TQStyleSheetItem::MarginFirstLine] = getAttribute( element, "pt", 0.0 ); element = parentElem.namedItem( "ILEFT" ).toElement(); // used by KWord-0.8 if ( !element.isNull() ) - tqlayout.margins[TQStyleSheetItem::MarginLeft] = getAttribute( element, "pt", 0.0 ); + layout.margins[TQStyleSheetItem::MarginLeft] = getAttribute( element, "pt", 0.0 ); } // KWord-1.0 DTD element = parentElem.namedItem( "INDENTS" ).toElement(); if ( !element.isNull() ) { - tqlayout.margins[TQStyleSheetItem::MarginFirstLine] = getAttribute( element, "first", 0.0 ); - tqlayout.margins[TQStyleSheetItem::MarginLeft] = getAttribute( element, "left", 0.0 ); - tqlayout.margins[TQStyleSheetItem::MarginRight] = getAttribute( element, "right", 0.0 ); + layout.margins[TQStyleSheetItem::MarginFirstLine] = getAttribute( element, "first", 0.0 ); + layout.margins[TQStyleSheetItem::MarginLeft] = getAttribute( element, "left", 0.0 ); + layout.margins[TQStyleSheetItem::MarginRight] = getAttribute( element, "right", 0.0 ); } element = parentElem.namedItem( "OFFSETS" ).toElement(); if ( !element.isNull() ) { - tqlayout.margins[TQStyleSheetItem::MarginTop] = getAttribute( element, "before", 0.0 ); - tqlayout.margins[TQStyleSheetItem::MarginBottom] = getAttribute( element, "after", 0.0 ); + layout.margins[TQStyleSheetItem::MarginTop] = getAttribute( element, "before", 0.0 ); + layout.margins[TQStyleSheetItem::MarginBottom] = getAttribute( element, "after", 0.0 ); } if ( docVersion < 2 ) @@ -240,8 +240,8 @@ void KoParagLayout::loadParagLayout( KoParagLayout& tqlayout, const TQDomElement element = parentElem.namedItem( "LINESPACE" ).toElement(); // used by KWord-0.8 if ( !element.isNull() ) { - tqlayout.lineSpacingType = KoParagLayout::LS_CUSTOM; - tqlayout.lineSpacing = getAttribute( element, "pt", 0.0 ); + layout.lineSpacingType = KoParagLayout::LS_CUSTOM; + layout.lineSpacing = getAttribute( element, "pt", 0.0 ); } } @@ -254,18 +254,18 @@ void KoParagLayout::loadParagLayout( KoParagLayout& tqlayout, const TQDomElement TQString value = element.attribute( "value" ); if ( value == "oneandhalf" ) { - tqlayout.lineSpacingType = KoParagLayout::LS_ONEANDHALF; - tqlayout.lineSpacing = 0; + layout.lineSpacingType = KoParagLayout::LS_ONEANDHALF; + layout.lineSpacing = 0; } else if ( value == "double" ) { - tqlayout.lineSpacingType = KoParagLayout::LS_DOUBLE; - tqlayout.lineSpacing = 0; + layout.lineSpacingType = KoParagLayout::LS_DOUBLE; + layout.lineSpacing = 0; } else { - tqlayout.lineSpacingType = KoParagLayout::LS_CUSTOM; - tqlayout.lineSpacing = value.toDouble(); + layout.lineSpacingType = KoParagLayout::LS_CUSTOM; + layout.lineSpacing = value.toDouble(); } } else @@ -273,36 +273,36 @@ void KoParagLayout::loadParagLayout( KoParagLayout& tqlayout, const TQDomElement TQString type = element.attribute( "type" ); if ( type == "oneandhalf" ) { - tqlayout.lineSpacingType = KoParagLayout::LS_ONEANDHALF; - tqlayout.lineSpacing = 0; + layout.lineSpacingType = KoParagLayout::LS_ONEANDHALF; + layout.lineSpacing = 0; } else if ( type == "double" ) { - tqlayout.lineSpacingType = KoParagLayout::LS_DOUBLE; - tqlayout.lineSpacing = 0; + layout.lineSpacingType = KoParagLayout::LS_DOUBLE; + layout.lineSpacing = 0; } else if ( type == "custom" ) { - tqlayout.lineSpacingType = KoParagLayout::LS_CUSTOM; - tqlayout.lineSpacing = element.attribute( "spacingvalue" ).toDouble(); + layout.lineSpacingType = KoParagLayout::LS_CUSTOM; + layout.lineSpacing = element.attribute( "spacingvalue" ).toDouble(); } else if ( type == "atleast" ) { - tqlayout.lineSpacingType = KoParagLayout::LS_AT_LEAST; - tqlayout.lineSpacing = element.attribute( "spacingvalue" ).toDouble(); + layout.lineSpacingType = KoParagLayout::LS_AT_LEAST; + layout.lineSpacing = element.attribute( "spacingvalue" ).toDouble(); } else if ( type == "multiple" ) { - tqlayout.lineSpacingType = KoParagLayout::LS_MULTIPLE; - tqlayout.lineSpacing = element.attribute( "spacingvalue" ).toDouble(); + layout.lineSpacingType = KoParagLayout::LS_MULTIPLE; + layout.lineSpacing = element.attribute( "spacingvalue" ).toDouble(); } else if ( type == "fixed" ) { - tqlayout.lineSpacingType = KoParagLayout::LS_FIXED; - tqlayout.lineSpacing = element.attribute( "spacingvalue" ).toDouble(); + layout.lineSpacingType = KoParagLayout::LS_FIXED; + layout.lineSpacing = element.attribute( "spacingvalue" ).toDouble(); } else if ( type == "single" ) // not used; just in case future versions use it. - tqlayout.lineSpacingType = KoParagLayout::LS_SINGLE; + layout.lineSpacingType = KoParagLayout::LS_SINGLE; } } @@ -323,37 +323,37 @@ void KoParagLayout::loadParagLayout( KoParagLayout& tqlayout, const TQDomElement if ( !element.isNull() ) pageBreaking |= KoParagLayout::HardFrameBreakBefore; } - tqlayout.pageBreaking = pageBreaking; + layout.pageBreaking = pageBreaking; element = parentElem.namedItem( "LEFTBORDER" ).toElement(); if ( !element.isNull() ) - tqlayout.leftBorder = KoBorder::loadBorder( element ); + layout.leftBorder = KoBorder::loadBorder( element ); else - tqlayout.leftBorder.setPenWidth(0); + layout.leftBorder.setPenWidth(0); element = parentElem.namedItem( "RIGHTBORDER" ).toElement(); if ( !element.isNull() ) - tqlayout.rightBorder = KoBorder::loadBorder( element ); + layout.rightBorder = KoBorder::loadBorder( element ); else - tqlayout.rightBorder.setPenWidth(0); + layout.rightBorder.setPenWidth(0); element = parentElem.namedItem( "TOPBORDER" ).toElement(); if ( !element.isNull() ) - tqlayout.topBorder = KoBorder::loadBorder( element ); + layout.topBorder = KoBorder::loadBorder( element ); else - tqlayout.topBorder.setPenWidth(0); + layout.topBorder.setPenWidth(0); element = parentElem.namedItem( "BOTTOMBORDER" ).toElement(); if ( !element.isNull() ) - tqlayout.bottomBorder = KoBorder::loadBorder( element ); + layout.bottomBorder = KoBorder::loadBorder( element ); else - tqlayout.bottomBorder.setPenWidth(0); + layout.bottomBorder.setPenWidth(0); element = parentElem.namedItem( "COUNTER" ).toElement(); if ( !element.isNull() ) { - tqlayout.counter = new KoParagCounter; - tqlayout.counter->load( element ); + layout.counter = new KoParagCounter; + layout.counter->load( element ); } // Compatibility with KOffice-1.2 @@ -434,29 +434,29 @@ TQCString KoParagLayout::saveOasisAlignment( TQt::AlignmentFlags alignment ) "start"; // i.e. direction-dependent } -void KoParagLayout::loadOasisParagLayout( KoParagLayout& tqlayout, KoOasisContext& context ) +void KoParagLayout::loadOasisParagLayout( KoParagLayout& layout, KoOasisContext& context ) { context.styleStack().setTypeProperties( "paragraph" ); - // tqlayout is an input and output parameter + // layout is an input and output parameter // It can have been initialized already, e.g. by copying from a style // code from OoWriterImport::writeLayout if ( context.styleStack().hasAttributeNS( KoXmlNS::fo, "text-align" ) ) { TQCString align = context.styleStack().attributeNS( KoXmlNS::fo, "text-align" ).latin1(); - tqlayout.alignment = loadOasisAlignment( align ); + layout.alignment = loadOasisAlignment( align ); } if ( context.styleStack().hasAttributeNS( KoXmlNS::style, "writing-mode" ) ) { // http://web4.w3.org/TR/xsl/slice7.html#writing-mode // LTR is lr-tb. RTL is rl-tb TQString writingMode = context.styleStack().attributeNS( KoXmlNS::style, "writing-mode" ); - tqlayout.direction = ( writingMode=="rl-tb" || writingMode=="rl" ) ? TQChar::DirR : TQChar::DirL; + layout.direction = ( writingMode=="rl-tb" || writingMode=="rl" ) ? TQChar::DirR : TQChar::DirL; } // Indentation (margins) if ( context.styleStack().hasAttributeNS( KoXmlNS::fo, "margin-left" ) || // 3.11.19 context.styleStack().hasAttributeNS( KoXmlNS::fo, "margin-right" ) ) { - tqlayout.margins[TQStyleSheetItem::MarginLeft] = KoUnit::parseValue( context.styleStack().attributeNS( KoXmlNS::fo, "margin-left" ) ); - tqlayout.margins[TQStyleSheetItem::MarginRight] = KoUnit::parseValue( context.styleStack().attributeNS( KoXmlNS::fo, "margin-right" ) ); + layout.margins[TQStyleSheetItem::MarginLeft] = KoUnit::parseValue( context.styleStack().attributeNS( KoXmlNS::fo, "margin-left" ) ); + layout.margins[TQStyleSheetItem::MarginRight] = KoUnit::parseValue( context.styleStack().attributeNS( KoXmlNS::fo, "margin-right" ) ); // *text-indent must always be bound to either margin-left or margin-right double first = 0; if ( context.styleStack().attributeNS( KoXmlNS::style, "auto-text-indent") == "true" ) // style:auto-text-indent takes precedence @@ -467,14 +467,14 @@ void KoParagLayout::loadOasisParagLayout( KoParagLayout& tqlayout, KoOasisContex else if ( context.styleStack().hasAttributeNS( KoXmlNS::fo, "text-indent") ) first = KoUnit::parseValue( context.styleStack().attributeNS( KoXmlNS::fo, "text-indent") ); - tqlayout.margins[TQStyleSheetItem::MarginFirstLine] = first; + layout.margins[TQStyleSheetItem::MarginFirstLine] = first; } // Offset before and after paragraph if( context.styleStack().hasAttributeNS( KoXmlNS::fo, "margin-top") || // 3.11.22 context.styleStack().hasAttributeNS( KoXmlNS::fo, "margin-bottom")) { - tqlayout.margins[TQStyleSheetItem::MarginTop] = KoUnit::parseValue( context.styleStack().attributeNS( KoXmlNS::fo, "margin-top" ) ); - tqlayout.margins[TQStyleSheetItem::MarginBottom] = KoUnit::parseValue( context.styleStack().attributeNS( KoXmlNS::fo, "margin-bottom" ) ); + layout.margins[TQStyleSheetItem::MarginTop] = KoUnit::parseValue( context.styleStack().attributeNS( KoXmlNS::fo, "margin-top" ) ); + layout.margins[TQStyleSheetItem::MarginBottom] = KoUnit::parseValue( context.styleStack().attributeNS( KoXmlNS::fo, "margin-bottom" ) ); } // Line spacing @@ -483,23 +483,23 @@ void KoParagLayout::loadOasisParagLayout( KoParagLayout& tqlayout, KoOasisContex TQString value = context.styleStack().attributeNS( KoXmlNS::fo, "line-height" ); if ( value != "normal" ) { if ( value == "100%" ) - tqlayout.lineSpacingType = KoParagLayout::LS_SINGLE; + layout.lineSpacingType = KoParagLayout::LS_SINGLE; else if( value=="150%") - tqlayout.lineSpacingType = KoParagLayout::LS_ONEANDHALF; + layout.lineSpacingType = KoParagLayout::LS_ONEANDHALF; else if( value=="200%") - tqlayout.lineSpacingType = KoParagLayout::LS_DOUBLE; + layout.lineSpacingType = KoParagLayout::LS_DOUBLE; else if ( value.find('%') > -1 ) { value = value.remove( '%' ); double percent = value.toDouble(); - tqlayout.lineSpacingType = KoParagLayout::LS_MULTIPLE; - tqlayout.lineSpacing = percent / 100.0; - kdDebug(33001) << "line-height =" << percent << ", " << tqlayout.lineSpacing << ", " << percent/100 << endl; + layout.lineSpacingType = KoParagLayout::LS_MULTIPLE; + layout.lineSpacing = percent / 100.0; + kdDebug(33001) << "line-height =" << percent << ", " << layout.lineSpacing << ", " << percent/100 << endl; } else // fixed value { - tqlayout.lineSpacingType = KoParagLayout::LS_FIXED; - tqlayout.lineSpacing = KoUnit::parseValue( value ); + layout.lineSpacingType = KoParagLayout::LS_FIXED; + layout.lineSpacing = KoUnit::parseValue( value ); } } } @@ -512,8 +512,8 @@ void KoParagLayout::loadOasisParagLayout( KoParagLayout& tqlayout, KoOasisContex // Did we make the wrong choice in kotext? //kdWarning() << "Unimplemented support for style:line-height-at-least: " << value << endl; // Well let's see if this makes a big difference. - tqlayout.lineSpacingType = KoParagLayout::LS_AT_LEAST; - tqlayout.lineSpacing = KoUnit::parseValue( value ); + layout.lineSpacingType = KoParagLayout::LS_AT_LEAST; + layout.lineSpacing = KoUnit::parseValue( value ); } // Line-spacing is mutually exclusive with line-height and line-height-at-least else if ( context.styleStack().hasAttributeNS( KoXmlNS::style, "line-spacing") ) // 3.11.3 @@ -521,8 +521,8 @@ void KoParagLayout::loadOasisParagLayout( KoParagLayout& tqlayout, KoOasisContex double value = KoUnit::parseValue( context.styleStack().attributeNS( KoXmlNS::style, "line-spacing" ) ); if ( value != 0.0 ) { - tqlayout.lineSpacingType = KoParagLayout::LS_CUSTOM; - tqlayout.lineSpacing = value; + layout.lineSpacingType = KoParagLayout::LS_CUSTOM; + layout.lineSpacing = value; } } @@ -530,7 +530,7 @@ void KoParagLayout::loadOasisParagLayout( KoParagLayout& tqlayout, KoOasisContex KoTabulatorList tabList; if ( context.styleStack().hasChildNodeNS( KoXmlNS::style, "tab-stops" ) ) { // 3.11.10 TQDomElement tabStops = context.styleStack().childNodeNS( KoXmlNS::style, "tab-stops" ); - //kdDebug(30519) << k_funcinfo << tabStops.childNodes().count() << " tab stops in tqlayout." << endl; + //kdDebug(30519) << k_funcinfo << tabStops.childNodes().count() << " tab stops in layout." << endl; TQDomElement tabStop; forEachElement( tabStop, tabStops ) { @@ -540,7 +540,7 @@ void KoParagLayout::loadOasisParagLayout( KoParagLayout& tqlayout, KoOasisContex KoTabulator tab; tab.ptPos = KoUnit::parseValue( tabStop.attributeNS( KoXmlNS::style, "position", TQString() ) ); // Tab stop positions in the XML are relative to the left-margin - tab.ptPos += tqlayout.margins[TQStyleSheetItem::MarginLeft]; + tab.ptPos += layout.margins[TQStyleSheetItem::MarginLeft]; if ( type == "center" ) tab.type = T_CENTER; else if ( type == "right" ) @@ -573,7 +573,7 @@ void KoParagLayout::loadOasisParagLayout( KoParagLayout& tqlayout, KoOasisContex } else { - // Fallback: convert leaderChar's tqunicode value + // Fallback: convert leaderChar's unicode value TQString leaderChar = tabStop.attributeNS( KoXmlNS::style, "leader-text", TQString() ); if ( !leaderChar.isEmpty() ) { @@ -594,27 +594,27 @@ void KoParagLayout::loadOasisParagLayout( KoParagLayout& tqlayout, KoOasisContex } //for } qHeapSort( tabList ); - tqlayout.setTabList( tabList ); + layout.setTabList( tabList ); - tqlayout.joinBorder = !( context.styleStack().attributeNS( KoXmlNS::style, "join-border") == "false" ); + layout.joinBorder = !( context.styleStack().attributeNS( KoXmlNS::style, "join-border") == "false" ); // Borders if ( context.styleStack().hasAttributeNS( KoXmlNS::fo, "border","left") ) - tqlayout.leftBorder.loadFoBorder( context.styleStack().attributeNS( KoXmlNS::fo, "border","left") ); + layout.leftBorder.loadFoBorder( context.styleStack().attributeNS( KoXmlNS::fo, "border","left") ); else - tqlayout.leftBorder.setPenWidth(0); + layout.leftBorder.setPenWidth(0); if ( context.styleStack().hasAttributeNS( KoXmlNS::fo, "border","right") ) - tqlayout.rightBorder.loadFoBorder( context.styleStack().attributeNS( KoXmlNS::fo, "border","right") ); + layout.rightBorder.loadFoBorder( context.styleStack().attributeNS( KoXmlNS::fo, "border","right") ); else - tqlayout.rightBorder.setPenWidth(0); + layout.rightBorder.setPenWidth(0); if ( context.styleStack().hasAttributeNS( KoXmlNS::fo, "border","top") ) - tqlayout.topBorder.loadFoBorder( context.styleStack().attributeNS( KoXmlNS::fo, "border","top") ); + layout.topBorder.loadFoBorder( context.styleStack().attributeNS( KoXmlNS::fo, "border","top") ); else - tqlayout.topBorder.setPenWidth(0); + layout.topBorder.setPenWidth(0); if ( context.styleStack().hasAttributeNS( KoXmlNS::fo, "border","bottom") ) - tqlayout.bottomBorder.loadFoBorder( context.styleStack().attributeNS( KoXmlNS::fo, "border","bottom") ); + layout.bottomBorder.loadFoBorder( context.styleStack().attributeNS( KoXmlNS::fo, "border","bottom") ); else - tqlayout.bottomBorder.setPenWidth(0); + layout.bottomBorder.setPenWidth(0); // Page breaking @@ -647,25 +647,25 @@ void KoParagLayout::loadOasisParagLayout( KoParagLayout& tqlayout, KoOasisContex pageBreaking |= KoParagLayout::KeepWithNext; } } - tqlayout.pageBreaking = pageBreaking; + layout.pageBreaking = pageBreaking; // Paragraph background color - fo:background-color // The background color for parts of a paragraph that have no text underneath if ( context.styleStack().hasAttributeNS( KoXmlNS::fo, "background-color" ) ) { TQString bgColor = context.styleStack().attributeNS( KoXmlNS::fo, "background-color"); if (bgColor != "transparent") - tqlayout.backgroundColor.setNamedColor( bgColor ); + layout.backgroundColor.setNamedColor( bgColor ); } } void KoParagLayout::saveParagLayout( TQDomElement & parentElem, int alignment ) const { - const KoParagLayout& tqlayout = *this; // code moved from somewhere else;) + const KoParagLayout& layout = *this; // code moved from somewhere else;) TQDomDocument doc = parentElem.ownerDocument(); TQDomElement element = doc.createElement( "NAME" ); parentElem.appendChild( element ); - if ( tqlayout.style ) - element.setAttribute( "value", tqlayout.style->displayName() ); + if ( layout.style ) + element.setAttribute( "value", layout.style->displayName() ); //else // kdWarning() << "KoParagLayout::saveParagLayout: style==0!" << endl; @@ -677,118 +677,118 @@ void KoParagLayout::saveParagLayout( TQDomElement & parentElem, int alignment ) alignment==TQt::AlignJustify ? "justify" : alignment==TQt::AlignAuto ? "auto" : "left" ); // Note: styles can have AlignAuto. Not paragraphs. - if ( static_cast<TQChar::Direction>(tqlayout.direction) == TQChar::DirR ) + if ( static_cast<TQChar::Direction>(layout.direction) == TQChar::DirR ) element.setAttribute( "dir", "R" ); else - if ( static_cast<TQChar::Direction>(tqlayout.direction) == TQChar::DirL ) + if ( static_cast<TQChar::Direction>(layout.direction) == TQChar::DirL ) element.setAttribute( "dir", "L" ); - if ( tqlayout.margins[TQStyleSheetItem::MarginFirstLine] != 0 || - tqlayout.margins[TQStyleSheetItem::MarginLeft] != 0 || - tqlayout.margins[TQStyleSheetItem::MarginRight] != 0 ) + if ( layout.margins[TQStyleSheetItem::MarginFirstLine] != 0 || + layout.margins[TQStyleSheetItem::MarginLeft] != 0 || + layout.margins[TQStyleSheetItem::MarginRight] != 0 ) { element = doc.createElement( "INDENTS" ); parentElem.appendChild( element ); - if ( tqlayout.margins[TQStyleSheetItem::MarginFirstLine] != 0 ) - element.setAttribute( "first", tqlayout.margins[TQStyleSheetItem::MarginFirstLine] ); - if ( tqlayout.margins[TQStyleSheetItem::MarginLeft] != 0 ) - element.setAttribute( "left", tqlayout.margins[TQStyleSheetItem::MarginLeft] ); - if ( tqlayout.margins[TQStyleSheetItem::MarginRight] != 0 ) - element.setAttribute( "right", tqlayout.margins[TQStyleSheetItem::MarginRight] ); + if ( layout.margins[TQStyleSheetItem::MarginFirstLine] != 0 ) + element.setAttribute( "first", layout.margins[TQStyleSheetItem::MarginFirstLine] ); + if ( layout.margins[TQStyleSheetItem::MarginLeft] != 0 ) + element.setAttribute( "left", layout.margins[TQStyleSheetItem::MarginLeft] ); + if ( layout.margins[TQStyleSheetItem::MarginRight] != 0 ) + element.setAttribute( "right", layout.margins[TQStyleSheetItem::MarginRight] ); } - if ( tqlayout.margins[TQStyleSheetItem::MarginTop] != 0 || - tqlayout.margins[TQStyleSheetItem::MarginBottom] != 0 ) + if ( layout.margins[TQStyleSheetItem::MarginTop] != 0 || + layout.margins[TQStyleSheetItem::MarginBottom] != 0 ) { element = doc.createElement( "OFFSETS" ); parentElem.appendChild( element ); - if ( tqlayout.margins[TQStyleSheetItem::MarginTop] != 0 ) - element.setAttribute( "before", tqlayout.margins[TQStyleSheetItem::MarginTop] ); - if ( tqlayout.margins[TQStyleSheetItem::MarginBottom] != 0 ) - element.setAttribute( "after", tqlayout.margins[TQStyleSheetItem::MarginBottom] ); + if ( layout.margins[TQStyleSheetItem::MarginTop] != 0 ) + element.setAttribute( "before", layout.margins[TQStyleSheetItem::MarginTop] ); + if ( layout.margins[TQStyleSheetItem::MarginBottom] != 0 ) + element.setAttribute( "after", layout.margins[TQStyleSheetItem::MarginBottom] ); } - if ( tqlayout.lineSpacingType != LS_SINGLE ) + if ( layout.lineSpacingType != LS_SINGLE ) { element = doc.createElement( "LINESPACING" ); parentElem.appendChild( element ); - if ( tqlayout.lineSpacingType == KoParagLayout::LS_ONEANDHALF ) { + if ( layout.lineSpacingType == KoParagLayout::LS_ONEANDHALF ) { element.setAttribute( "type", "oneandhalf" ); element.setAttribute( "value", "oneandhalf" ); //compatibility with koffice 1.2 } - else if ( tqlayout.lineSpacingType == KoParagLayout::LS_DOUBLE ) { + else if ( layout.lineSpacingType == KoParagLayout::LS_DOUBLE ) { element.setAttribute( "type", "double" ); element.setAttribute( "value", "double" ); //compatibility with koffice 1.2 } - else if ( tqlayout.lineSpacingType == KoParagLayout::LS_CUSTOM ) + else if ( layout.lineSpacingType == KoParagLayout::LS_CUSTOM ) { element.setAttribute( "type", "custom" ); - element.setAttribute( "spacingvalue", tqlayout.lineSpacing); - element.setAttribute( "value", tqlayout.lineSpacing ); //compatibility with koffice 1.2 + element.setAttribute( "spacingvalue", layout.lineSpacing); + element.setAttribute( "value", layout.lineSpacing ); //compatibility with koffice 1.2 } - else if ( tqlayout.lineSpacingType == KoParagLayout::LS_AT_LEAST ) + else if ( layout.lineSpacingType == KoParagLayout::LS_AT_LEAST ) { element.setAttribute( "type", "atleast" ); - element.setAttribute( "spacingvalue", tqlayout.lineSpacing); + element.setAttribute( "spacingvalue", layout.lineSpacing); } - else if ( tqlayout.lineSpacingType == KoParagLayout::LS_MULTIPLE ) + else if ( layout.lineSpacingType == KoParagLayout::LS_MULTIPLE ) { element.setAttribute( "type", "multiple" ); - element.setAttribute( "spacingvalue", tqlayout.lineSpacing); + element.setAttribute( "spacingvalue", layout.lineSpacing); } - else if ( tqlayout.lineSpacingType == KoParagLayout::LS_FIXED ) + else if ( layout.lineSpacingType == KoParagLayout::LS_FIXED ) { element.setAttribute( "type", "fixed" ); - element.setAttribute( "spacingvalue", tqlayout.lineSpacing); + element.setAttribute( "spacingvalue", layout.lineSpacing); } else kdDebug()<<" error in lineSpacing Type\n"; } - if ( tqlayout.pageBreaking != 0 ) + if ( layout.pageBreaking != 0 ) { element = doc.createElement( "PAGEBREAKING" ); parentElem.appendChild( element ); - if ( tqlayout.pageBreaking & KoParagLayout::KeepLinesTogether ) + if ( layout.pageBreaking & KoParagLayout::KeepLinesTogether ) element.setAttribute( "linesTogether", "true" ); - if ( tqlayout.pageBreaking & KoParagLayout::HardFrameBreakBefore ) + if ( layout.pageBreaking & KoParagLayout::HardFrameBreakBefore ) element.setAttribute( "hardFrameBreak", "true" ); - if ( tqlayout.pageBreaking & KoParagLayout::HardFrameBreakAfter ) + if ( layout.pageBreaking & KoParagLayout::HardFrameBreakAfter ) element.setAttribute( "hardFrameBreakAfter", "true" ); } - if ( tqlayout.leftBorder.penWidth() > 0 ) + if ( layout.leftBorder.penWidth() > 0 ) { element = doc.createElement( "LEFTBORDER" ); parentElem.appendChild( element ); - tqlayout.leftBorder.save( element ); + layout.leftBorder.save( element ); } - if ( tqlayout.rightBorder.penWidth() > 0 ) + if ( layout.rightBorder.penWidth() > 0 ) { element = doc.createElement( "RIGHTBORDER" ); parentElem.appendChild( element ); - tqlayout.rightBorder.save( element ); + layout.rightBorder.save( element ); } - if ( tqlayout.topBorder.penWidth() > 0 ) + if ( layout.topBorder.penWidth() > 0 ) { element = doc.createElement( "TOPBORDER" ); parentElem.appendChild( element ); - tqlayout.topBorder.save( element ); + layout.topBorder.save( element ); } - if ( tqlayout.bottomBorder.penWidth() > 0 ) + if ( layout.bottomBorder.penWidth() > 0 ) { element = doc.createElement( "BOTTOMBORDER" ); parentElem.appendChild( element ); - tqlayout.bottomBorder.save( element ); + layout.bottomBorder.save( element ); } - if ( tqlayout.counter && tqlayout.counter->numbering() != KoParagCounter::NUM_NONE ) + if ( layout.counter && layout.counter->numbering() != KoParagCounter::NUM_NONE ) { element = doc.createElement( "COUNTER" ); parentElem.appendChild( element ); - if ( tqlayout.counter ) - tqlayout.counter->save( element ); + if ( layout.counter ) + layout.counter->save( element ); } - KoTabulatorList tabList = tqlayout.tabList(); + KoTabulatorList tabList = layout.tabList(); KoTabulatorList::ConstIterator it = tabList.begin(); for ( ; it != tabList.end() ; it++ ) { diff --git a/lib/kotext/KoParagLayout.h b/lib/kotext/KoParagLayout.h index c0582b19..975fdaf0 100644 --- a/lib/kotext/KoParagLayout.h +++ b/lib/kotext/KoParagLayout.h @@ -40,7 +40,7 @@ class KOTEXT_EXPORT KoParagLayout { public: KoParagLayout(); - KoParagLayout( const KoParagLayout &tqlayout ) { operator=( tqlayout ); } + KoParagLayout( const KoParagLayout &layout ) { operator=( layout ); } ~KoParagLayout(); @@ -122,29 +122,29 @@ public: const KoTabulatorList& tabList() const { return m_tabList; } //! Assignment operator for KoParagLayout - /** Copy a paragraph tqlayout. + /** Copy a paragraph layout. * * If you're modifying this, you might also need to modify * KoTextParag::setParagLayout */ void operator=( const KoParagLayout & ); - /** Return a set of flags showing the differences between this and 'tqlayout' */ - int compare( const KoParagLayout & tqlayout ) const; + /** Return a set of flags showing the differences between this and 'layout' */ + int compare( const KoParagLayout & layout ) const; - /** Save this parag tqlayout to XML. + /** Save this parag layout to XML. * This format is used by KWord for paragraphs, and by KPresenter+KWord for styles. */ void saveParagLayout( TQDomElement & parentElem, int alignment ) const; - /** Load this parag tqlayout from XML. + /** Load this parag layout from XML. * This format is used by KWord for paragraphs, and by KPresenter+KWord for styles. */ - static void loadParagLayout( KoParagLayout& tqlayout, const TQDomElement& parentElem, int docVersion = 2 ); + static void loadParagLayout( KoParagLayout& layout, const TQDomElement& parentElem, int docVersion = 2 ); - /// Load this parag tqlayout from Oasis XML - static void loadOasisParagLayout( KoParagLayout& tqlayout, KoOasisContext& context ); - /// Save this parag tqlayout to Oasis XML + /// Load this parag layout from Oasis XML + static void loadOasisParagLayout( KoParagLayout& layout, KoOasisContext& context ); + /// Save this parag layout to Oasis XML /// @param savingStyle true if this is saved as part of a user style, /// false when saving a paragraph /// @param gs the style where all the properties will be saved to diff --git a/lib/kotext/KoParagStyle.cpp b/lib/kotext/KoParagStyle.cpp index b09fe90e..fcae882c 100644 --- a/lib/kotext/KoParagStyle.cpp +++ b/lib/kotext/KoParagStyle.cpp @@ -103,12 +103,12 @@ void KoParagStyle::saveStyle( TQDomElement & parentElem ) void KoParagStyle::loadStyle( TQDomElement & parentElem, int docVersion ) { - KoParagLayout tqlayout; - KoParagLayout::loadParagLayout( tqlayout, parentElem, docVersion ); + KoParagLayout layout; + KoParagLayout::loadParagLayout( layout, parentElem, docVersion ); // This way, KoTextParag::setParagLayout also sets the style pointer, to this style - tqlayout.style = this; - m_paragLayout = tqlayout; + layout.style = this; + m_paragLayout = layout; // Load name TQDomElement nameElem = parentElem.namedItem("NAME").toElement(); @@ -138,8 +138,8 @@ void KoParagStyle::loadStyle( TQDomElement & styleElem, KoOasisContext& context context.styleStack().save(); context.addStyles( &styleElem, "paragraph" ); // Load all parents - only because we don't support inheritance. - KoParagLayout tqlayout; - KoParagLayout::loadOasisParagLayout( tqlayout, context ); + KoParagLayout layout; + KoParagLayout::loadOasisParagLayout( layout, context ); // loadOasisParagLayout doesn't load the counter. It's modelled differently for parags and for styles. int level = 0; @@ -172,15 +172,15 @@ void KoParagStyle::loadStyle( TQDomElement & styleElem, KoOasisContext& context const TQDomElement listStyle = context.listStyleStack().currentListStyle(); // The tag is either text:list-level-style-number or text:list-level-style-bullet const bool ordered = listStyle.localName() == "list-level-style-number"; - Q_ASSERT( !tqlayout.counter ); - tqlayout.counter = new KoParagCounter; - tqlayout.counter->loadOasis( context, -1, ordered, m_bOutline, level, true ); + Q_ASSERT( !layout.counter ); + layout.counter = new KoParagCounter; + layout.counter->loadOasis( context, -1, ordered, m_bOutline, level, true ); context.listStyleStack().pop(); } // This way, KoTextParag::setParagLayout also sets the style pointer, to this style - tqlayout.style = this; - m_paragLayout = tqlayout; + layout.style = this; + m_paragLayout = layout; m_format.load( context ); @@ -269,9 +269,9 @@ void KoParagStyle::propagateChanges( int paragLayoutFlag, int /*formatFlag*/ ) #if 0 if ( paragLayoutFlag == KoParagLayout::All ) { - setDirection( static_cast<TQChar::Direction>(tqlayout.direction) ); + setDirection( static_cast<TQChar::Direction>(layout.direction) ); // Don't call applyStyle from here, it would overwrite any paragraph-specific settings - setStyle( tqlayout.style ); + setStyle( layout.style ); } #endif // TODO a flag for the "is outline" bool? Otherwise we have no way to inherit diff --git a/lib/kotext/KoParagStyle.h b/lib/kotext/KoParagStyle.h index 190ad345..0e396b64 100644 --- a/lib/kotext/KoParagStyle.h +++ b/lib/kotext/KoParagStyle.h @@ -49,7 +49,7 @@ protected: /** * A paragraph style is a combination of a character style - * and paragraph-tqlayout attributes, all grouped under a name. + * and paragraph-layout attributes, all grouped under a name. */ class KOTEXT_EXPORT KoParagStyle : public KoCharStyle { @@ -71,10 +71,10 @@ public: KoParagStyle *followingStyle() const { return m_followingStyle; } void setFollowingStyle( KoParagStyle *fst ); - /// Saves the name, tqlayout, the following style and the outline bool. Not the format. + /// Saves the name, layout, the following style and the outline bool. Not the format. /// @deprecated (1.3 format) void saveStyle( TQDomElement & parentElem ); - /// Loads the name, tqlayout and the outline bool. Not the "following style" nor the format. + /// Loads the name, layout and the outline bool. Not the "following style" nor the format. /// (1.3 format) void loadStyle( TQDomElement & parentElem, int docVersion = 2 ); diff --git a/lib/kotext/KoRichText.cpp b/lib/kotext/KoRichText.cpp index addbd574..d9d6c1df 100644 --- a/lib/kotext/KoRichText.cpp +++ b/lib/kotext/KoRichText.cpp @@ -1332,7 +1332,7 @@ TQString KoTextString::toString( const TQMemArray<KoTextStringChar> &data ) int l = data.size(); s.setUnicode( 0, l ); KoTextStringChar *c = data.data(); - TQChar *uc = (TQChar *)s.tqunicode(); + TQChar *uc = (TQChar *)s.unicode(); while ( l-- ) { *uc = c->c; uc++; @@ -1348,7 +1348,7 @@ TQString KoTextString::toReverseString() const int l = length(); s.setUnicode(0, l); KoTextStringChar *c = data.data() + (l-1); - TQChar *uc = (TQChar *)s.tqunicode(); + TQChar *uc = (TQChar *)s.unicode(); while ( l-- ) { *uc = c->c; uc++; @@ -1505,7 +1505,7 @@ KoTextParagLineStart *KoTextFormatterBase::bidiReorderLine( KoTextParag * /*para str.setUnicode( 0, last - start + 1 ); // fill string with logically ordered chars. KoTextStringChar *ch = startChar; - TQChar *qch = (TQChar *)str.tqunicode(); + TQChar *qch = (TQChar *)str.unicode(); while ( ch <= lastChar ) { *qch = ch->c; qch++; @@ -1562,7 +1562,7 @@ KoTextParagLineStart *KoTextFormatterBase::bidiReorderLine( KoTextParag * /*para c->rightToLeft = TRUE; c->startOfRun = FALSE; int ww = 0; - if ( c->c.tqunicode() >= 32 || c->c == '\t' || c->c == '\n' || c->isCustom() ) { + if ( c->c.unicode() >= 32 || c->c == '\t' || c->c == '\n' || c->isCustom() ) { ww = c->width; } else { ww = c->format()->width( ' ' ); @@ -1589,7 +1589,7 @@ KoTextParagLineStart *KoTextFormatterBase::bidiReorderLine( KoTextParag * /*para c->rightToLeft = FALSE; c->startOfRun = FALSE; int ww = 0; - if ( c->c.tqunicode() >= 32 || c->c == '\t' || c->isCustom() ) { + if ( c->c.unicode() >= 32 || c->c == '\t' || c->isCustom() ) { ww = c->width; } else { ww = c->format()->width( ' ' ); diff --git a/lib/kotext/KoRichText.h b/lib/kotext/KoRichText.h index f3cf9746..35bb8bd7 100644 --- a/lib/kotext/KoRichText.h +++ b/lib/kotext/KoRichText.h @@ -93,7 +93,7 @@ public: // this is the same struct as in qtextengine_p.h. Don't change! uchar softBreak :1; // Potential linebreak point - uchar whiteSpace :1; // A tqunicode whitespace character, except NBSP, ZWNBSP + uchar whiteSpace :1; // A unicode whitespace character, except NBSP, ZWNBSP uchar charStop :1; // Valid cursor position (for left/right arrow) uchar wordStop :1; // Valid cursor position (for ctrl + left/right arrow) (TODO: use) //uchar nobreak :1; @@ -564,12 +564,12 @@ public: TQString richText() const; - int minimumWidth() const { return tqlayout ? tqlayout->minimumSize().width() : 0; } - int widthHint() const { return ( tqlayout ? tqlayout->sizeHint().width() : 0 ) + 2 * outerborder; } + int minimumWidth() const { return layout ? layout->minimumSize().width() : 0; } + int widthHint() const { return ( layout ? layout->sizeHint().width() : 0 ) + 2 * outerborder; } TQPtrList<KoTextTableCell> tableCells() const { return cells; } - TQRect geometry() const { return tqlayout ? tqlayout->geometry() : TQRect(); } + TQRect geometry() const { return layout ? layout->geometry() : TQRect(); } bool isStretching() const { return stretch; } private: @@ -577,7 +577,7 @@ private: void addCell( KoTextTableCell* cell ); private: - TQGridLayout* tqlayout; + TQGridLayout* layout; TQPtrList<KoTextTableCell> cells; TQPainter* painter; int cachewidth; diff --git a/lib/kotext/KoSearchDia.cpp b/lib/kotext/KoSearchDia.cpp index 8aaab47b..b022eb72 100644 --- a/lib/kotext/KoSearchDia.cpp +++ b/lib/kotext/KoSearchDia.cpp @@ -605,25 +605,25 @@ KoFormatDia::KoFormatDia( TQWidget* parent, const TQString & _caption, KoSearchC TQButtonGroup *grpBold = new TQButtonGroup( 1, Qt::Vertical, page ); grpBold->setRadioButtonExclusive( TRUE ); - grpBold->tqlayout(); + grpBold->layout(); m_boldYes=new TQRadioButton( i18n("Yes"), grpBold ); m_boldNo=new TQRadioButton( i18n("No"), grpBold ); TQButtonGroup *grpItalic = new TQButtonGroup( 1, Qt::Vertical, page ); grpItalic->setRadioButtonExclusive( TRUE ); - grpItalic->tqlayout(); + grpItalic->layout(); m_italicYes=new TQRadioButton( i18n("Yes"), grpItalic ); m_italicNo=new TQRadioButton( i18n("No"), grpItalic ); TQButtonGroup *grpShadow = new TQButtonGroup( 1, Qt::Vertical, page ); grpShadow->setRadioButtonExclusive( TRUE ); - grpShadow->tqlayout(); + grpShadow->layout(); m_shadowYes=new TQRadioButton( i18n("Yes"), grpShadow ); m_shadowNo=new TQRadioButton( i18n("No"), grpShadow ); TQButtonGroup *grpWordByWord = new TQButtonGroup( 1, Qt::Vertical, page ); grpWordByWord->setRadioButtonExclusive( TRUE ); - grpWordByWord->tqlayout(); + grpWordByWord->layout(); m_wordByWordYes=new TQRadioButton( i18n("Yes"), grpWordByWord ); m_wordByWordNo=new TQRadioButton( i18n("No"), grpWordByWord ); diff --git a/lib/kotext/KoStyleManager.cpp b/lib/kotext/KoStyleManager.cpp index 2c759282..5a99c38b 100644 --- a/lib/kotext/KoStyleManager.cpp +++ b/lib/kotext/KoStyleManager.cpp @@ -86,7 +86,7 @@ KoStyleManager::KoStyleManager( TQWidget *_parent, KoUnit::Unit unit, newTab = new KoStyleParagTab( m_tabs ); KoParagLayoutWidget *decorations = new KoParagDecorationWidget( newTab ); - decorations->tqlayout()->setMargin(KDialog::marginHint()); + decorations->layout()->setMargin(KDialog::marginHint()); newTab->setWidget( decorations ); addTab( newTab ); @@ -122,7 +122,7 @@ void KoStyleManager::addTab( KoStyleManagerTab * tab ) { m_tabsList.append( tab ); m_tabs->insertTab( tab, tab->tabName() ); - tab->tqlayout()->activate(); + tab->layout()->activate(); } void KoStyleManager::setupWidget(const KoStyleCollection& styleCollection) diff --git a/lib/kotext/KoStyleManager.h b/lib/kotext/KoStyleManager.h index 84c75349..b562e1f6 100644 --- a/lib/kotext/KoStyleManager.h +++ b/lib/kotext/KoStyleManager.h @@ -137,7 +137,7 @@ protected: KoParagStyle *m_style; }; -// A tab to edit parts of the parag-tqlayout of the style +// A tab to edit parts of the parag-layout of the style // Acts as a wrapper around KoParagLayoutWidget [which doesn't know about styles]. class KOTEXT_EXPORT KoStyleParagTab : public KoStyleManagerTab { diff --git a/lib/kotext/KoTextCommand.cpp b/lib/kotext/KoTextCommand.cpp index 1b0f1076..875c1e71 100644 --- a/lib/kotext/KoTextCommand.cpp +++ b/lib/kotext/KoTextCommand.cpp @@ -96,7 +96,7 @@ KoTextCursor * KoTextDeleteCommand::unexecute( KoTextCursor *c ) while ( p ) { if ( lit != m_oldParagLayouts.end() ) { - kdDebug(32500) << "KoTextDeleteCommand::unexecute applying paragtqlayout to parag " << p->paragId() << endl; + kdDebug(32500) << "KoTextDeleteCommand::unexecute applying paraglayout to parag " << p->paragId() << endl; p->setParagLayout( *lit ); } else diff --git a/lib/kotext/KoTextDocument.cpp b/lib/kotext/KoTextDocument.cpp index fe20b049..35adf814 100644 --- a/lib/kotext/KoTextDocument.cpp +++ b/lib/kotext/KoTextDocument.cpp @@ -729,7 +729,7 @@ void KoTextDocument::setFormat( int id, const KoTextFormat *f, int flags ) if ( !hasSelection( id ) ) return; - TQApplication::tqclipboard()->setText( selectedText( id ) ); + TQApplication::clipboard()->setText( selectedText( id ) ); #endif }*/ @@ -1217,7 +1217,7 @@ void KoTextDocument::drawWithoutDoubleBuffer( TQPainter *p, const TQRect &cr, co TQRect pr( parag->pixelRect( zoomHandler ) ); pr.setLeft( 0 ); pr.setWidth( TQWIDGETSIZE_MAX ); - // The cliprect is checked in tqlayout units, in KoTextParag::paint + // The cliprect is checked in layout units, in KoTextParag::paint TQRect crect_lu( parag->rect() ); if ( !cr.isNull() && !cr.intersects( pr ) ) { @@ -1350,7 +1350,7 @@ void KoTextDocument::drawParagWYSIWYG( TQPainter *p, KoTextParag *parag, int cx, #endif //painter->setBrushOrigin( painter->brushOrigin() + rect.topLeft() - ir.topLeft() ); - // The cliprect is checked in tqlayout units, in KoTextParag::paint + // The cliprect is checked in layout units, in KoTextParag::paint TQRect crect_lu( zoomHandler->pixelToLayoutUnit( crect ) ); #ifdef DEBUG_PAINTING kdDebug(32500) << "KoTextDocument::drawParagWYSIWYG crect_lu=" << crect_lu << endl; diff --git a/lib/kotext/KoTextFormat.cpp b/lib/kotext/KoTextFormat.cpp index 9b8e8869..2554d4ee 100644 --- a/lib/kotext/KoTextFormat.cpp +++ b/lib/kotext/KoTextFormat.cpp @@ -1179,8 +1179,8 @@ TQFont KoTextFormat::smallCapsFont( const KoTextZoomHandler* zh, bool applyZoom int KoTextFormat::charWidth( const KoTextZoomHandler* zh, bool applyZoom, const KoTextStringChar* c, const KoTextParag* parag, int i ) const { - ushort tqunicode = c->c.tqunicode(); - if ( !c->charStop || tqunicode == 0xad || tqunicode == 0x2028 ) + ushort unicode = c->c.unicode(); + if ( !c->charStop || unicode == 0xad || unicode == 0x2028 ) return 0; Q_ASSERT( !c->isCustom() ); // actually it's a bit stupid to call this for custom items if( c->isCustom() ) { @@ -1209,13 +1209,13 @@ int KoTextFormat::charWidth( const KoTextZoomHandler* zh, bool applyZoom, const pixelww = this->screenFontMetrics( zh ).width( displayedChar( c->c ) ); } else { // Use the m_screenWidths[] array when possible, even faster - Q_ASSERT( tqunicode < 256 ); - pixelww = d->m_screenWidths[ tqunicode ]; + Q_ASSERT( unicode < 256 ); + pixelww = d->m_screenWidths[ unicode ]; // Not in cache yet -> calculate if ( pixelww == 0 ) { pixelww = this->screenFontMetrics( zh ).width( displayedChar( c->c ) ); Q_ASSERT( pixelww < 65535 ); - d->m_screenWidths[ tqunicode ] = pixelww; + d->m_screenWidths[ unicode ] = pixelww; } } } @@ -1319,7 +1319,7 @@ TQString KoTextFormat::displayedString( const TQString& str )const TQChar KoTextFormat::displayedChar( TQChar c )const { - if ( c.tqunicode() == 0xa0 ) // nbsp + if ( c.unicode() == 0xa0 ) // nbsp return ' '; switch ( m_attributeFont ) { case ATT_NONE: diff --git a/lib/kotext/KoTextFormat.h b/lib/kotext/KoTextFormat.h index 0e7c1a13..4c155b91 100644 --- a/lib/kotext/KoTextFormat.h +++ b/lib/kotext/KoTextFormat.h @@ -75,7 +75,7 @@ public: // caching for speedup when formatting TQFont* m_screenFont; // font to be used when painting (zoom-dependent) TQFontMetrics* m_screenFontMetrics; // font metrics on screen (zoom-dependent) - TQFont* m_refFont; // font to be used when formatting text for tqlayout units + TQFont* m_refFont; // font to be used when formatting text for layout units TQFontMetrics* m_refFontMetrics; // font metrics for m_refFontMetrics int m_refAscent; int m_refDescent; @@ -308,7 +308,7 @@ public: /** * @return the reference font, i.e. with the size specified by the user. - * This is used at text tqlayout time (e.g. kotextformatter) + * This is used at text layout time (e.g. kotextformatter) */ TQFont refFont() const; diff --git a/lib/kotext/KoTextFormatter.cpp b/lib/kotext/KoTextFormatter.cpp index d978ba43..552bcf27 100644 --- a/lib/kotext/KoTextFormatter.cpp +++ b/lib/kotext/KoTextFormatter.cpp @@ -196,7 +196,7 @@ bool KoTextFormatterCore::format() // but with counters/margins this might be different). This is why // we call determineCharWidth() again from within the loop. TQPair<int, int> widths = determineCharWidth(); - int ww = widths.first; // width in tqlayout units + int ww = widths.first; // width in layout units #ifndef REF_IS_LU int pixelww = widths.second; // width in pixels #endif @@ -516,11 +516,11 @@ bool KoTextFormatterCore::format() spaceAfterLine -= c->width; //else - if ( c->c.tqunicode() == 0xad || hyphenated ) // soft hyphen or hyphenation + if ( c->c.unicode() == 0xad || hyphenated ) // soft hyphen or hyphenation { // Recalculate its width, the hyphen will appear finally (important for the parag rect) int width = KoTextZoomHandler::ptToLayoutUnitPt( c->format()->refFontMetrics().width( TQChar(0xad) ) ); - if ( c->c.tqunicode() == 0xad ) + if ( c->c.unicode() == 0xad ) c->width = width; spaceAfterLine -= width; } @@ -934,7 +934,7 @@ KoTextParagLineStart *KoTextFormatterCore::koBidiReorderLine( str.setUnicode( 0, last - start + 1 ); // fill string with logically ordered chars. KoTextStringChar *ch = startChar; - TQChar *qch = (TQChar *)str.tqunicode(); + TQChar *qch = (TQChar *)str.unicode(); while ( ch <= lastChar ) { *qch = ch->c; qch++; diff --git a/lib/kotext/KoTextObject.cpp b/lib/kotext/KoTextObject.cpp index 06394275..afd18909 100644 --- a/lib/kotext/KoTextObject.cpp +++ b/lib/kotext/KoTextObject.cpp @@ -564,7 +564,7 @@ void KoTextObject::doKeyboardAction( KoTextCursor * cursor, KoTextFormat * & /*c undoRedoInfo.oldParagLayouts << parag->paragLayout(); } if ( cursor->atParagEnd() ) { - // Get paragtqlayout from next parag (next can't be 0 here) + // Get paraglayout from next parag (next can't be 0 here) KoParagLayout paragLayout = parag->next()->paragLayout(); if ( cursor->remove() ) { diff --git a/lib/kotext/KoTextObject.h b/lib/kotext/KoTextObject.h index 90693bed..7970a323 100644 --- a/lib/kotext/KoTextObject.h +++ b/lib/kotext/KoTextObject.h @@ -64,11 +64,11 @@ public: */ virtual KCommand *setFormatCommand( const KoTextFormat *format, int flags, bool zoomFont = false ) = 0; - /** Interface for accessing the current parag tqlayout */ + /** Interface for accessing the current parag layout */ virtual const KoParagLayout * currentParagLayoutFormat() const = 0; - /** Interface for changing the paragraph tqlayout. - * @param newLayout pointer to the new tqlayout to apply + /** Interface for changing the paragraph layout. + * @param newLayout pointer to the new layout to apply * @param flags one of the KoParagLayout flags * @param marginIndex type of margin. Only used if flags==KoParagLayout::Margins */ @@ -345,7 +345,7 @@ public: * @param cursor the current cursor; used if there is no selection. Can be 0L if there is one. * @param style the KoParagStyle to apply * @param selectionId the id of the selection, usually Standard or Temp - * @param paragLayoutFlags which settings from the paragraph tqlayout to apply + * @param paragLayoutFlags which settings from the paragraph layout to apply * @param formatFlags which settings from the text format to apply * @param createUndoRedo if true, an undo/redo command will be created and emitted * @param interactive if true, the text will be reformatted/repainted to show the new style @@ -429,7 +429,7 @@ public: /** * Abort the current formatMore() loop, or prevent the next one from starting. * Use with care. This is e.g. for KWFootNoteVariable, so that it can do - * a frame tqlayout before formatting the main text again. + * a frame layout before formatting the main text again. * It is important to make sure that formatMore will be called again ;) */ void abortFormatting(); diff --git a/lib/kotext/KoTextParag.cpp b/lib/kotext/KoTextParag.cpp index aba58abc..cc1aecb9 100644 --- a/lib/kotext/KoTextParag.cpp +++ b/lib/kotext/KoTextParag.cpp @@ -1296,7 +1296,7 @@ int KoTextParag::rightMargin() const return zh->ptToLayoutUnitPixX( m_layout.margins[ TQStyleSheetItem::MarginRight ] + m_layout.rightBorder.width() ) - + cw; /* in tqlayout units already */ + + cw; /* in layout units already */ } int KoTextParag::firstLineMargin() const @@ -1597,7 +1597,7 @@ void KoTextParag::paintLines( TQPainter &painter, const TQColorGroup &cg, KoText // we flush before and after tabs flush = flush || ( chr->c == '\t' || nextchr->c == '\t' ); // we flush on soft hypens - flush = flush || ( chr->c.tqunicode() == 0xad ); + flush = flush || ( chr->c.unicode() == 0xad ); // we flush on custom items flush = flush || chr->isCustom(); // we flush before custom items @@ -1847,7 +1847,7 @@ void KoTextParag::drawParagStringInternal( TQPainter &painter, const TQString &s // 3) Paint TQString str( s ); - if ( str[ (int)str.length() - 1 ].tqunicode() == 0xad ) + if ( str[ (int)str.length() - 1 ].unicode() == 0xad ) str.remove( str.length() - 1, 1 ); painter.setPen( TQPen( textColor ) ); painter.setFont( font ); @@ -1877,7 +1877,7 @@ void KoTextParag::drawParagStringInternal( TQPainter &painter, const TQString &s } KoTextParag::drawFontEffects( &painter, format, zh, font, textColor, startX, baseLine, bw, lastY, h, str[start] ); - if ( str[ start ] != '\t' && str[ start ].tqunicode() != 0xad ) { + if ( str[ start ] != '\t' && str[ start ].unicode() != 0xad ) { str = format->displayedString( str ); // #### This converts the whole string, instead of from start to start+len! if ( format->vAlign() == KoTextFormat::AlignNormal ) { int posY = lastY + baseLine; @@ -1965,7 +1965,7 @@ void KoTextParag::drawParagStringInternal( TQPainter &painter, const TQString &s #ifdef DEBUG_PAINT //kdDebug(32500) << "we are drawing the end of line " << line << ". Auto-hyphenated: " << lineHyphenated( line ) << endl; #endif - bool drawHyphen = at( start+len-1 )->c.tqunicode() == 0xad; + bool drawHyphen = at( start+len-1 )->c.unicode() == 0xad; drawHyphen = drawHyphen || lineHyphenated( line ); if ( drawHyphen ) { #ifdef DEBUG_PAINT @@ -2059,7 +2059,7 @@ void KoTextParag::copyParagData( KoTextParag *parag ) //else // kdWarning() << "Paragraph has no style " << paragId() << endl; - // No "following style" setting, or same style -> copy tqlayout & format of previous paragraph + // No "following style" setting, or same style -> copy layout & format of previous paragraph if (!styleApplied) { setParagLayout( parag->paragLayout() ); @@ -2082,7 +2082,7 @@ void KoTextParag::copyParagData( KoTextParag *parag ) // Note: we don't call the original KoTextParag::copyParagData on purpose. // We don't want setListStyle to get called - it ruins our stylesheetitems // And we don't care about copying the stylesheetitems directly, - // applying the parag tqlayout will create them + // applying the parag layout will create them } void KoTextParag::setTabList( const KoTabulatorList &tabList ) @@ -2240,43 +2240,43 @@ void KoTextParag::applyStyle( KoParagStyle *style ) setFormat( newFormat ); } -void KoTextParag::setParagLayout( const KoParagLayout & tqlayout, int flags, int marginIndex ) +void KoTextParag::setParagLayout( const KoParagLayout & layout, int flags, int marginIndex ) { //kdDebug(32500) << "KoTextParag::setParagLayout flags=" << flags << endl; if ( flags & KoParagLayout::Alignment ) - setAlign( tqlayout.alignment ); + setAlign( layout.alignment ); if ( flags & KoParagLayout::Margins ) { if ( marginIndex == -1 ) - setMargins( tqlayout.margins ); + setMargins( layout.margins ); else - setMargin( (TQStyleSheetItem::Margin)marginIndex, tqlayout.margins[marginIndex] ); + setMargin( (TQStyleSheetItem::Margin)marginIndex, layout.margins[marginIndex] ); } if ( flags & KoParagLayout::LineSpacing ) { - setLineSpacingType( tqlayout.lineSpacingType ); - setLineSpacing( tqlayout.lineSpacingValue() ); + setLineSpacingType( layout.lineSpacingType ); + setLineSpacing( layout.lineSpacingValue() ); } if ( flags & KoParagLayout::Borders ) { - setLeftBorder( tqlayout.leftBorder ); - setRightBorder( tqlayout.rightBorder ); - setTopBorder( tqlayout.topBorder ); - setBottomBorder( tqlayout.bottomBorder ); - setJoinBorder( tqlayout.joinBorder ); + setLeftBorder( layout.leftBorder ); + setRightBorder( layout.rightBorder ); + setTopBorder( layout.topBorder ); + setBottomBorder( layout.bottomBorder ); + setJoinBorder( layout.joinBorder ); } if ( flags & KoParagLayout::BackgroundColor ) { - setBackgroundColor( tqlayout.backgroundColor ); + setBackgroundColor( layout.backgroundColor ); } if ( flags & KoParagLayout::BulletNumber ) - setCounter( tqlayout.counter ); + setCounter( layout.counter ); if ( flags & KoParagLayout::Tabulator ) - setTabList( tqlayout.tabList() ); + setTabList( layout.tabList() ); if ( flags == KoParagLayout::All ) { - setDirection( static_cast<TQChar::Direction>(tqlayout.direction) ); + setDirection( static_cast<TQChar::Direction>(layout.direction) ); // Don't call applyStyle from here, it would overwrite any paragraph-specific settings - setStyle( tqlayout.style ); + setStyle( layout.style ); } } @@ -2421,7 +2421,7 @@ void KoTextParag::printRTDebug( int info ) attrs.truncate( attrs.length() - 1 ); kdDebug(32500) << i << ": '" << TQString(ch.c).rightJustify(2) - << "' (" << TQString::number( ch.c.tqunicode() ).rightJustify(3) << ")" + << "' (" << TQString::number( ch.c.unicode() ).rightJustify(3) << ")" << " x(LU)=" << ch.x << " w(LU)=" << ch.width//s->width(i) << " x(PIX)=" << pixelx @@ -2849,7 +2849,7 @@ void KoTextParag::loadOasisSpan( const TQDomElement& parent, KoOasisContext& con KoParagLayout KoTextParag::loadParagLayout( KoOasisContext& context, KoStyleCollection *styleCollection, bool findStyle ) { - KoParagLayout tqlayout; + KoParagLayout layout; // Only when loading paragraphs, not when loading styles if ( findStyle ) @@ -2877,17 +2877,17 @@ KoParagLayout KoTextParag::loadParagLayout( KoOasisContext& context, KoStyleColl style = styleCollection->findStyle( "Standard" ); } Q_ASSERT(style); - tqlayout.style = style; + layout.style = style; } - KoParagLayout::loadOasisParagLayout( tqlayout, context ); + KoParagLayout::loadOasisParagLayout( layout, context ); - return tqlayout; + return layout; } void KoTextParag::loadOasis( const TQDomElement& parent, KoOasisContext& context, KoStyleCollection *styleCollection, uint& pos ) { - // First load tqlayout from style + // First load layout from style KoParagLayout paragLayout = loadParagLayout( context, styleCollection, true ); setParagLayout( paragLayout ); @@ -2915,7 +2915,7 @@ void KoTextParag::saveOasis( KoXmlWriter& writer, KoSavingContext& context, { KoGenStyles& mainStyles = context.mainStyles(); - // Write paragtqlayout to styles (with parent == the parag's style) + // Write paraglayout to styles (with parent == the parag's style) TQString parentStyleName; if ( m_layout.style ) parentStyleName = m_layout.style->name(); @@ -2924,11 +2924,11 @@ void KoTextParag::saveOasis( KoXmlWriter& writer, KoSavingContext& context, paragFormat()->save( autoStyle, context ); m_layout.saveOasis( autoStyle, context, false ); - // First paragraph is special, it includes page-tqlayout info (for word-processing at least) + // First paragraph is special, it includes page-layout info (for word-processing at least) if ( !prev() ) { if ( context.variableSettings() ) autoStyle.addProperty( "style:page-number", context.variableSettings()->startingPageNumber() ); - // Well we support only one page tqlayout, so the first parag always points to "Standard". + // Well we support only one page layout, so the first parag always points to "Standard". autoStyle.addAttribute( "style:master-page-name", "Standard" ); } @@ -3212,7 +3212,7 @@ void KoTextParag::drawFormattingChars( TQPainter &painter, int start, int len, #endif if ( ch.isCustom() ) continue; - if ( (ch.c == ' ' || ch.c.tqunicode() == 0x00a0U) + if ( (ch.c == ' ' || ch.c.unicode() == 0x00a0U) && (whichFormattingChars & FormattingSpace)) { // Don't use ch.pixelwidth here. We want a square with diff --git a/lib/kotext/KoTextParag.h b/lib/kotext/KoTextParag.h index f42c3285..d8e0c29b 100644 --- a/lib/kotext/KoTextParag.h +++ b/lib/kotext/KoTextParag.h @@ -214,7 +214,7 @@ public: /** Sets all or some parameters from a paragLayout struct. * @param flags selects which settings to apply, see KoParagLayout's enum. */ - virtual void setParagLayout( const KoParagLayout &tqlayout, int flags = KoParagLayout::All, + virtual void setParagLayout( const KoParagLayout &layout, int flags = KoParagLayout::All, int marginIndex = -1 ); const KoParagLayout & paragLayout() { return m_layout; } diff --git a/lib/kotext/KoTextView.cpp b/lib/kotext/KoTextView.cpp index 6211e1d8..9733e123 100644 --- a/lib/kotext/KoTextView.cpp +++ b/lib/kotext/KoTextView.cpp @@ -291,7 +291,7 @@ void KoTextView::handleKeyPressEvent( TQKeyEvent * e, TQWidget *widget, const TQ break; } default: { - //kdDebug(32500) << "KoTextView::keyPressEvent ascii=" << e->ascii() << " text=" << e->text()[0].tqunicode() << " state=" << e->state() << endl; + //kdDebug(32500) << "KoTextView::keyPressEvent ascii=" << e->ascii() << " text=" << e->text()[0].unicode() << " state=" << e->state() << endl; if (e->key() == TQt::Key_Tab) { if (doToolTipCompletion(m_cursor, m_cursor->parag(), m_cursor->index() - 1, e->key()) ) @@ -331,7 +331,7 @@ void KoTextView::handleKeyPressEvent( TQKeyEvent * e, TQWidget *widget, const TQ // Bidi support: need to reverse mirrored chars (e.g. parenthesis) KoTextParag *p = m_cursor->parag(); if ( p && p->string() && p->string()->isRightToLeft() ) { - TQChar *c = (TQChar *)text.tqunicode(); + TQChar *c = (TQChar *)text.unicode(); int l = text.length(); while( l-- ) { if ( c->mirrored() ) @@ -643,9 +643,9 @@ KoTextCursor KoTextView::selectParagUnderCursor( const KoTextCursor& cursor, int { textObject()->selectionChangedNotify(); // Copy the selection. - TQApplication::tqclipboard()->setSelectionMode( true ); + TQApplication::clipboard()->setSelectionMode( true ); emit copy(); - TQApplication::tqclipboard()->setSelectionMode( false ); + TQApplication::clipboard()->setSelectionMode( false ); } return c2; } @@ -808,9 +808,9 @@ void KoTextView::handleMouseReleaseEvent() textObject()->selectionChangedNotify(); // Copy the selection. - TQApplication::tqclipboard()->setSelectionMode( true ); + TQApplication::clipboard()->setSelectionMode( true ); emit copy(); - TQApplication::tqclipboard()->setSelectionMode( false ); + TQApplication::clipboard()->setSelectionMode( false ); } inDoubleClick = FALSE; @@ -831,9 +831,9 @@ void KoTextView::handleMouseDoubleClickEvent( TQMouseEvent*ev, const TQPoint& i *m_cursor = selectWordUnderCursor( *m_cursor ); textObject()->selectionChangedNotify(); // Copy the selection. - TQApplication::tqclipboard()->setSelectionMode( true ); + TQApplication::clipboard()->setSelectionMode( true ); emit copy(); - TQApplication::tqclipboard()->setSelectionMode( false ); + TQApplication::clipboard()->setSelectionMode( false ); possibleTripleClick=true; @@ -1450,10 +1450,10 @@ void KoTextView::copyTextOfComment() { KURL::List lst; lst.append( var->note() ); - TQApplication::tqclipboard()->setSelectionMode(true); - TQApplication::tqclipboard()->setData( new KURLDrag(lst, 0, 0) ); - TQApplication::tqclipboard()->setSelectionMode(false); - TQApplication::tqclipboard()->setData( new KURLDrag(lst, 0, 0) ); + TQApplication::clipboard()->setSelectionMode(true); + TQApplication::clipboard()->setData( new KURLDrag(lst, 0, 0) ); + TQApplication::clipboard()->setSelectionMode(false); + TQApplication::clipboard()->setData( new KURLDrag(lst, 0, 0) ); } } @@ -1476,13 +1476,13 @@ KoParagStyle * KoTextView::createStyleFromSelection(const TQString & name) if ( textDocument()->hasSelection( KoTextDocument::Standard ) ) cursor = textDocument()->selectionStartCursor( KoTextDocument::Standard ); KoParagStyle * style = new KoParagStyle (name); - KoParagLayout tqlayout(cursor.parag()->paragLayout()); - tqlayout.style = style; + KoParagLayout layout(cursor.parag()->paragLayout()); + layout.style = style; style->setFollowingStyle( style ); style->format() = *(cursor.parag()->at(cursor.index())->format()); - style->paragLayout() = tqlayout; - // Select this new style - hmm only the parag tqlayout, we don't want to erase any text-formatting + style->paragLayout() = layout; + // Select this new style - hmm only the parag layout, we don't want to erase any text-formatting cursor.parag()->setParagLayout( style->paragLayout() ); return style; } @@ -1515,10 +1515,10 @@ void KoTextView::copyLink() { KURL::List lst; lst.append( var->url() ); - TQApplication::tqclipboard()->setSelectionMode(true); - TQApplication::tqclipboard()->setData( new KURLDrag(lst, 0, 0) ); - TQApplication::tqclipboard()->setSelectionMode(false); - TQApplication::tqclipboard()->setData( new KURLDrag(lst, 0, 0) ); + TQApplication::clipboard()->setSelectionMode(true); + TQApplication::clipboard()->setData( new KURLDrag(lst, 0, 0) ); + TQApplication::clipboard()->setSelectionMode(false); + TQApplication::clipboard()->setData( new KURLDrag(lst, 0, 0) ); } } diff --git a/lib/kotext/KoTextZoomHandler.h b/lib/kotext/KoTextZoomHandler.h index f8c2ef12..d1bc6025 100644 --- a/lib/kotext/KoTextZoomHandler.h +++ b/lib/kotext/KoTextZoomHandler.h @@ -33,7 +33,7 @@ public: //// Support for WYSIWYG text layouting ///// - /** The "[zoomed] view pixel" -> "tqlayout unit pixel" conversions. */ + /** The "[zoomed] view pixel" -> "layout unit pixel" conversions. */ int pixelToLayoutUnitX( int x ) const; int pixelToLayoutUnitY( int y ) const; TQPoint pixelToLayoutUnit( const TQPoint &p ) const @@ -43,7 +43,7 @@ public: { return TQRect( pixelToLayoutUnit( r.topLeft() ), pixelToLayoutUnit( r.bottomRight() ) ); } - /** The "tqlayout unit pixel" -> "[zoomed] view pixel" conversions. */ + /** The "layout unit pixel" -> "[zoomed] view pixel" conversions. */ int layoutUnitToPixelX( int lupix ) const; int layoutUnitToPixelY( int lupix ) const; @@ -89,26 +89,26 @@ public: } /** - * Given the font size for the font in tqlayout units, in pt (use pointSize()) + * Given the font size for the font in layout units, in pt (use pointSize()) * this returns the font size to use on screen the current zoom, in pt (use setPointSizeFloat()), */ double layoutUnitToFontSize( int luSize, bool /*forPrint*/ ) const; - // Note: For converting fontsizes from/to tqlayout units and zoom-independent + // Note: For converting fontsizes from/to layout units and zoom-independent // pt sizes (like the one the user sees, e.g. 12pt), // use ptToLayoutUnit and layoutUnitToPt, not layoutToFontSize. - // The conversions below convert between an internal text tqlayout resolution of + // The conversions below convert between an internal text layout resolution of // ~1440 DPI (by default) and the point-size for the fonts (those known by the user). // Those conversions don't depend on the zoom level. /** Change the factor that converts between pointsizes - * and tqlayout units (by default 20 - for 1440 DPI at 72 DPI) */ + * and layout units (by default 20 - for 1440 DPI at 72 DPI) */ static void setPtToLayoutUnitFactor( int factor ) { m_layoutUnitFactor = factor; } /** Not zoom dependent. Simply convert a pt value (e.g. a frame) - * to high-resolution tqlayout unit coordinates (in pt). */ + * to high-resolution layout unit coordinates (in pt). */ static double ptToLayoutUnitPt( double pt ) { return pt * static_cast<double>( m_layoutUnitFactor ); } /** Same thing for integer values, e.g. a font size in pt */ diff --git a/lib/kotext/KoVariable.cpp b/lib/kotext/KoVariable.cpp index 70eab87e..489752f0 100644 --- a/lib/kotext/KoVariable.cpp +++ b/lib/kotext/KoVariable.cpp @@ -123,7 +123,7 @@ void KoVariableSettings::saveOasis( KoXmlWriter &settingsWriter ) const settingsWriter.addConfigItem( "displayfieldcode", m_displayFieldCode); // m_startingPageNumber isn't saved to OASIS. Applications must use either // style:page-number in the first parag of a page (see KoTextParag), or - // style:first-page-number in style:page-tqlayout, for spreadsheets etc. + // style:first-page-number in style:page-layout, for spreadsheets etc. if ( d->m_lastPrintingDate.isValid()) settingsWriter.addConfigItem("lastPrintingDate", d->m_lastPrintingDate.toString(Qt::ISODate)); @@ -978,7 +978,7 @@ void KoVariable::drawCustomItemHelper( TQPainter* p, int x, int y, int wpix, int //p->drawText( x, posY, str ); // We can't just drawText, it wouldn't use the same kerning as the one // that resize() planned for [which is zoom-independent]. - // We need to do the tqlayout using tqlayout units instead, so for simplicity + // We need to do the layout using layout units instead, so for simplicity // I just draw every char individually (whereas KoTextFormatter/KoTextParag // detect runs of text that can be drawn together) const int len = str.length(); @@ -988,9 +988,9 @@ void KoVariable::drawCustomItemHelper( TQPainter* p, int x, int y, int wpix, int { const TQChar ch = str[i]; p->drawText( x, posY, TQString(ch) ); - // Do like KoTextFormatter: do the tqlayout in tqlayout units. + // Do like KoTextFormatter: do the layout in layout units. xLU += KoTextZoomHandler::ptToLayoutUnitPt( fm.width( ch ) ); - // And then compute the X position in pixels from the tqlayout unit X. + // And then compute the X position in pixels from the layout unit X. x = zh->layoutUnitToPixelX( xLU ); } diff --git a/lib/kotext/kolayouttabbase.ui b/lib/kotext/kolayouttabbase.ui index e7e03d58..646bc795 100644 --- a/lib/kotext/kolayouttabbase.ui +++ b/lib/kotext/kolayouttabbase.ui @@ -40,7 +40,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <vbox> <property name="name"> @@ -103,7 +103,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <grid> <property name="name"> diff --git a/lib/kotext/timedateformatwidget.ui b/lib/kotext/timedateformatwidget.ui index 77a261ea..ded1c906 100644 --- a/lib/kotext/timedateformatwidget.ui +++ b/lib/kotext/timedateformatwidget.ui @@ -38,7 +38,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <vbox> <property name="name"> @@ -59,7 +59,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -113,7 +113,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> diff --git a/lib/kross/main/wdgscriptsmanagerbase.ui b/lib/kross/main/wdgscriptsmanagerbase.ui index d04223a4..1140e848 100644 --- a/lib/kross/main/wdgscriptsmanagerbase.ui +++ b/lib/kross/main/wdgscriptsmanagerbase.ui @@ -56,7 +56,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> diff --git a/lib/kross/python/cxx/Objects.hxx b/lib/kross/python/cxx/Objects.hxx index 3aa790e6..41648320 100644 --- a/lib/kross/python/cxx/Objects.hxx +++ b/lib/kross/python/cxx/Objects.hxx @@ -1470,8 +1470,8 @@ namespace Py // Python strings return strings as individual elements. // I'll try having a class Char which is a String of length 1 // - typedef std::basic_string<Py_UNICODE> tqunicodestring; - extern Py_UNICODE tqunicode_null_string[1]; + typedef std::basic_string<Py_UNICODE> unicodestring; + extern Py_UNICODE unicode_null_string[1]; class Char: public Object { @@ -1535,7 +1535,7 @@ namespace Py return *this; } - Char& operator= (const tqunicodestring& v) + Char& operator= (const unicodestring& v) { set(PyUnicode_FromUnicode (const_cast<Py_UNICODE*>(v.data()),1), true); return *this; @@ -1650,7 +1650,7 @@ namespace Py static_cast<int>( v.length() ) ), true ); return *this; } - String& operator= (const tqunicodestring& v) + String& operator= (const unicodestring& v) { set( PyUnicode_FromUnicode( const_cast<Py_UNICODE*>( v.data() ), static_cast<int>( v.length() ) ), true ); @@ -1706,16 +1706,16 @@ namespace Py } } - tqunicodestring as_tqunicodestring() const + unicodestring as_unicodestring() const { if( isUnicode() ) { - return tqunicodestring( PyUnicode_AS_UNICODE( ptr() ), + return unicodestring( PyUnicode_AS_UNICODE( ptr() ), static_cast<size_type>( PyUnicode_GET_SIZE( ptr() ) ) ); } else { - throw TypeError("can only return tqunicodestring from Unicode object"); + throw TypeError("can only return unicodestring from Unicode object"); } } }; diff --git a/lib/kross/python/cxx/PyCXX.html b/lib/kross/python/cxx/PyCXX.html index e162e601..46d065bb 100644 --- a/lib/kross/python/cxx/PyCXX.html +++ b/lib/kross/python/cxx/PyCXX.html @@ -62,7 +62,7 @@ integrates Python with C++ in these ways: </p> <p>Download PyCXX from <a href="http://sourceforge.net/projects/cxx/">http://sourceforge.net/projects/cxx/</a>.</p> -<p>The distribution tqlayout is:</p> +<p>The distribution layout is:</p> <table> <tr><th>Directory</th><th>Description</th></tr> <tr><td class=code>.</td><td>Makefile for Unix and Windows, Release documentation</td> @@ -1188,8 +1188,8 @@ sequence.</p> <td class=code>as_std_string() const</td> </tr> <tr> - <td class=code>tqunicodestring</td> - <td class=code>as_tqunicodestring() const</td> + <td class=code>unicodestring</td> + <td class=code>as_unicodestring() const</td> </tr> </table> diff --git a/lib/kross/python/cxx/cxxsupport.cxx b/lib/kross/python/cxx/cxxsupport.cxx index b7bcaa0a..61329b60 100644 --- a/lib/kross/python/cxx/cxxsupport.cxx +++ b/lib/kross/python/cxx/cxxsupport.cxx @@ -6,7 +6,7 @@ #include "Objects.hxx" namespace Py { -Py_UNICODE tqunicode_null_string[1] = { 0 }; +Py_UNICODE unicode_null_string[1] = { 0 }; Type Object::type () const { diff --git a/lib/kross/python/pythonextension.cpp b/lib/kross/python/pythonextension.cpp index 9d8c3ece..dbbe9bf6 100644 --- a/lib/kross/python/pythonextension.cpp +++ b/lib/kross/python/pythonextension.cpp @@ -206,7 +206,7 @@ Kross::Api::Object::Ptr PythonExtension::toObject(const Py::Object& object) #ifdef Py_USING_UNICODE /* TODO if(type == &PyUnicode_Type) { - Py::tqunicodestring u = Py::String(object).as_tqunicodestring(); + Py::unicodestring u = Py::String(object).as_unicodestring(); std::string s; std::copy(u.begin(), u.end(), std::back_inserter(s)); return new Kross::Api::Variant(s.c_str()); diff --git a/lib/kross/python/scripts/RestrictedPython/Guards.py b/lib/kross/python/scripts/RestrictedPython/Guards.py index 295ba791..4fbdcad1 100644 --- a/lib/kross/python/scripts/RestrictedPython/Guards.py +++ b/lib/kross/python/scripts/RestrictedPython/Guards.py @@ -24,7 +24,7 @@ for name in ['False', 'None', 'True', 'abs', 'basestring', 'bool', 'callable', 'chr', 'cmp', 'complex', 'divmod', 'float', 'hash', 'hex', 'id', 'int', 'isinstance', 'issubclass', 'len', 'long', 'oct', 'ord', 'pow', 'range', 'repr', 'round', - 'str', 'tuple', 'unichr', 'tqunicode', 'xrange', 'zip']: + 'str', 'tuple', 'unichr', 'unicode', 'xrange', 'zip']: safe_builtins[name] = __builtins__[name] diff --git a/lib/kross/python/scripts/gui.py b/lib/kross/python/scripts/gui.py index 7461447a..9b8e0f8c 100755 --- a/lib/kross/python/scripts/gui.py +++ b/lib/kross/python/scripts/gui.py @@ -190,9 +190,9 @@ class QtDialog: def __init__(self, parent = None, name = None, modal = 0, fl = 0): qt.QDialog.__init__(self, parent, name, modal, fl) qt.QDialog.accept = self.accept - self.tqlayout = qt.QVBoxLayout(self) - self.tqlayout.setSpacing(6) - self.tqlayout.setMargin(11) + self.layout = qt.QVBoxLayout(self) + self.layout.setSpacing(6) + self.layout.setMargin(11) class Label(qt.QLabel): def __init__(self, dialog, parent, caption): @@ -323,7 +323,7 @@ class QtDialog: self.widget = qt.QVBox(self.dialog) self.widget.setSpacing(6) - self.dialog.tqlayout.addWidget(self.widget) + self.dialog.layout.addWidget(self.widget) self.Frame = Frame self.Label = Label diff --git a/lib/kross/test/testcase.py b/lib/kross/test/testcase.py index 9fa58bc2..f1540201 100644 --- a/lib/kross/test/testcase.py +++ b/lib/kross/test/testcase.py @@ -79,8 +79,8 @@ class TestPlugin(unittest.TestCase): self.assert_( self.pluginobject1.stringfunc(" Another \n\r Test! $%&\"") == " Another \n\r Test! $%&\"" ) #TODO - #self.assert_( self.pluginobject1.stringfunc( tqunicode(" Unicode test ") ) == " Unicode test " ) - #self.assert_( self.pluginobject1.stringfunc(tqunicode(" Another Test! ")) == tqunicode(" Another Test! ") ) + #self.assert_( self.pluginobject1.stringfunc( unicode(" Unicode test ") ) == " Unicode test " ) + #self.assert_( self.pluginobject1.stringfunc(unicode(" Another Test! ")) == unicode(" Another Test! ") ) self.assert_( self.pluginobject1.stringstringfunc("MyString1", "MyString2") == "MyString1" ) self.assert_( self.pluginobject1.uintdoublestringfunc(8529,285.246,"String") == 8529 ) diff --git a/lib/kross/test/testgui.py b/lib/kross/test/testgui.py index 6a629c66..22b6f04b 100644 --- a/lib/kross/test/testgui.py +++ b/lib/kross/test/testgui.py @@ -89,27 +89,27 @@ class QtTest: qt.QDialog.__init__(self, parent, name, modal, fl) qt.QDialog.accept = self.accept self.setCaption("Export to HTML") - #self.tqlayout() + #self.layout() - self.tqlayout = qt.QVBoxLayout(self) - self.tqlayout.setSpacing(6) - self.tqlayout.setMargin(11) + self.layout = qt.QVBoxLayout(self) + self.layout.setSpacing(6) + self.layout.setMargin(11) infolabel = qt.QLabel("Export the data of a table or a query to a HTML-file.", self) - self.tqlayout.addWidget(infolabel) + self.layout.addWidget(infolabel) source = ComboBox(self, "Datasource:") - self.tqlayout.addWidget(source) + self.layout.addWidget(source) self.exporttype = ComboBox(self, "Style:", ["Plain","Paper","Desert","Blues"]) - self.tqlayout.addWidget(self.exporttype) + self.layout.addWidget(self.exporttype) self.filechooser = FileChooser(self) - self.tqlayout.addWidget(self.filechooser) + self.layout.addWidget(self.filechooser) buttonbox = qt.QHBox(self) buttonbox.setSpacing(6) - self.tqlayout.addWidget(buttonbox) + self.layout.addWidget(buttonbox) savebutton = Button("Save", buttonbox) qt.QObject.connect(savebutton, qt.SIGNAL("clicked()"), self, qt.SLOT("accept()")) diff --git a/lib/kwmf/kowmfstruct.h b/lib/kwmf/kowmfstruct.h index d94a9d79..84281f4e 100644 --- a/lib/kwmf/kowmfstruct.h +++ b/lib/kwmf/kowmfstruct.h @@ -57,7 +57,7 @@ struct WmfEnhMetaHeader TQ_UINT16 numHandles; // Number of handles in the handle table // Handle index zero is reserved. TQ_UINT16 reserved; // always 0 - TQ_UINT32 sizeOfDescription; // Number of chars in the tqunicode description string + TQ_UINT32 sizeOfDescription; // Number of chars in the unicode description string // This is 0 if there is no description string TQ_UINT32 offsetOfDescription; // Offset to the metafile description record. // This is 0 if there is no description string diff --git a/lib/kwmf/kwmf.cc b/lib/kwmf/kwmf.cc index d8965537..38d520db 100644 --- a/lib/kwmf/kwmf.cc +++ b/lib/kwmf/kwmf.cc @@ -400,7 +400,7 @@ bool KWmf::parse( S16 nHandles; // Number of handles in the handle table // Handle index zero is reserved. S16 sReserved; // Reserved. Must be zero. - S32 nDescription; // Number of chars in the tqunicode description string + S32 nDescription; // Number of chars in the unicode description string // This is 0 if there is no description string S32 offDescription; // Offset to the metafile description record. // This is 0 if there is no description string diff --git a/lib/kwmf/wmfstruct.h b/lib/kwmf/wmfstruct.h index 33a4a67c..7400e896 100644 --- a/lib/kwmf/wmfstruct.h +++ b/lib/kwmf/wmfstruct.h @@ -53,7 +53,7 @@ struct WmfEnhMetaHeader WORD nHandles; // Number of handles in the handle table // Handle index zero is reserved. WORD sReserved; // Reserved. Must be zero. - DWORD nDescription; // Number of chars in the tqunicode description string + DWORD nDescription; // Number of chars in the unicode description string // This is 0 if there is no description string DWORD offDescription; // Offset to the metafile description record. // This is 0 if there is no description string diff --git a/lib/store/KoXmlWriter.cpp b/lib/store/KoXmlWriter.cpp index 5fff1e83..6c3459f4 100644 --- a/lib/store/KoXmlWriter.cpp +++ b/lib/store/KoXmlWriter.cpp @@ -387,7 +387,7 @@ void KoXmlWriter::addTextSpan( const TQString& text, const TQMap<int, int>& tabC nrSpaces = 0; leadingSpace = false; } - switch ( ch.tqunicode() ) { + switch ( ch.unicode() ) { case '\t': if ( !str.isEmpty() ) addTextNode( str ); diff --git a/lib/store/tests/storedroptest.cpp b/lib/store/tests/storedroptest.cpp index fccb27c0..7845a393 100644 --- a/lib/store/tests/storedroptest.cpp +++ b/lib/store/tests/storedroptest.cpp @@ -65,7 +65,7 @@ void StoreDropTest::keyPressEvent( TQKeyEvent * e ) void StoreDropTest::paste() { qDebug( "paste" ); - TQMimeSource* m = TQApplication::tqclipboard()->data(); + TQMimeSource* m = TQApplication::clipboard()->data(); if ( !m ) return; processMimeSource( m ); diff --git a/tools/kthesaurus/main.cc b/tools/kthesaurus/main.cc index a7e74822..bc1f4c06 100644 --- a/tools/kthesaurus/main.cc +++ b/tools/kthesaurus/main.cc @@ -59,7 +59,7 @@ extern "C" KOFFICETOOLS_EXPORT int kdemain(int argc, char **argv) } /* TODO: get selection(), not only clipboard! - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); TQString text = cb->text(); if( text.isNull() || text.length() > 50 ) { // long texts are probably not supposed to be searched for diff --git a/tools/thesaurus/main.cc b/tools/thesaurus/main.cc index dc0d9d68..32271af8 100644 --- a/tools/thesaurus/main.cc +++ b/tools/thesaurus/main.cc @@ -604,7 +604,7 @@ void Thesaurus::findTermWordnet(const TQString &term) m_combobox->insertItem(i18n("Overview of Senses")); /** NOT todo: - * -Hypernym tree: tqlayout is difficult, you can get the same information + * -Hypernym tree: layout is difficult, you can get the same information * by following links * -Coordinate terms (sisters): just go to synset and then use hyponyms * -Has Part Meronyms, Has Substance Meronyms, Has Member Meronyms, @@ -677,7 +677,7 @@ void Thesaurus::wnExited(KProcess *) // TODO?: // move "=>" in own column? l = formatLine(l); - // Table tqlayout: + // Table layout: result += "<tr>"; if( l.startsWith(" ") ) { result += "\t<td width=\"15\"></td>"; diff --git a/tools/thesaurus/thesaurus.txt b/tools/thesaurus/thesaurus.txt index 057cb079..6f2f47ed 100644 --- a/tools/thesaurus/thesaurus.txt +++ b/tools/thesaurus/thesaurus.txt @@ -4976,7 +4976,7 @@ ;organization;organisation;arrangement;#;activity; ;order;ordering;#;organization;organisation;arrangement; ;succession;sequence;#;order;ordering; -;tqlayout;#;order;ordering; +;layout;#;order;ordering; ;listing;itemization;itemisation;#;organization;organisation;arrangement; ;grouping;#;activity; ;categorization;categorisation;classification;compartmentalization;compartmentalisation;#;grouping; @@ -8314,7 +8314,7 @@ ;concept;conception;construct;#;idea;thought; ;perception;#;conceptualization;conceptualisation;conceptuality; ;notion;#;concept;conception;construct; -;tqlayout;#;design;plan; +;layout;#;design;plan; ;redundancy;#;configuration;constellation; ;trap;snare;#;design;plan; ;idea;#;opinion;sentiment;persuasion;view;thought; |