Browse Source

Rename obsolete tq methods to standard names

tags/r14.0.0
Timothy Pearson 8 years ago
parent
commit
2d6954f69c
100 changed files with 257 additions and 257 deletions
  1. +1
    -1
      chalk/HACKING
  2. +1
    -1
      chalk/chalkcolor/kis_basic_histogram_producers.h
  3. +1
    -1
      chalk/colorspaces/wet/kis_wet_palette_widget.cc
  4. +2
    -2
      chalk/doc/doc-outline
  5. +1
    -1
      chalk/doc/the preview widget
  6. +1
    -1
      chalk/plugins/filters/blur/wdgblur.ui
  7. +1
    -1
      chalk/plugins/filters/colorify/WdgColorifyBase.ui
  8. +1
    -1
      chalk/plugins/filters/colors/wdgcolortoalphabase.ui
  9. +2
    -2
      chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui
  10. +2
    -2
      chalk/plugins/filters/colorsfilters/wdg_perchannel.ui
  11. +3
    -3
      chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui
  12. +1
    -1
      chalk/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui
  13. +5
    -5
      chalk/plugins/filters/levelfilter/wdg_level.ui
  14. +3
    -3
      chalk/plugins/paintops/defaultpaintops/kis_dlgbrushcurvecontrol.ui
  15. +2
    -2
      chalk/plugins/tools/defaulttools/wdgcolorpicker.ui
  16. +1
    -1
      chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc
  17. +1
    -1
      chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc
  18. +1
    -1
      chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc
  19. +1
    -1
      chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc
  20. +1
    -1
      chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc
  21. +1
    -1
      chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc
  22. +1
    -1
      chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc
  23. +2
    -2
      chalk/plugins/tools/tool_crop/wdg_tool_crop.ui
  24. +1
    -1
      chalk/plugins/tools/tool_curves/kis_tool_curve.cc
  25. +1
    -1
      chalk/plugins/tools/tool_curves/kis_tool_moutline.cc
  26. +2
    -2
      chalk/plugins/tools/tool_curves/wdg_tool_example.ui
  27. +2
    -2
      chalk/plugins/tools/tool_star/wdg_tool_star.ui
  28. +7
    -7
      chalk/plugins/tools/tool_transform/wdg_tool_transform.ui
  29. +4
    -4
      chalk/plugins/viewplugins/colorrange/wdg_colorrange.ui
  30. +3
    -3
      chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc
  31. +1
    -1
      chalk/plugins/viewplugins/histogram/wdghistogram.ui
  32. +1
    -1
      chalk/plugins/viewplugins/performancetest/wdg_perftest.ui
  33. +2
    -2
      chalk/plugins/viewplugins/rotateimage/wdg_rotateimage.ui
  34. +1
    -1
      chalk/plugins/viewplugins/screenshot/ksnapshot.cpp
  35. +1
    -1
      chalk/plugins/viewplugins/screenshot/regiongrabber.cpp
  36. +1
    -1
      chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc
  37. +2
    -2
      chalk/plugins/viewplugins/substrate/wdgsubstrate.ui
  38. +1
    -1
      chalk/plugins/viewplugins/variations/wdg_variations.ui
  39. +1
    -1
      chalk/ui/kis_brush_chooser.cc
  40. +5
    -5
      chalk/ui/kis_clipboard.cc
  41. +7
    -7
      chalk/ui/kis_color_cup.cc
  42. +3
    -3
      chalk/ui/kis_controlframe.cc
  43. +3
    -3
      chalk/ui/kis_dlg_adj_layer_props.cc
  44. +3
    -3
      chalk/ui/kis_dlg_adjustment_layer.cc
  45. +1
    -1
      chalk/ui/kis_dlg_layer_properties.cc
  46. +1
    -1
      chalk/ui/kis_dlg_new_layer.cc
  47. +1
    -1
      chalk/ui/kis_double_widget.cc
  48. +1
    -1
      chalk/ui/kis_gradient_chooser.cc
  49. +2
    -2
      chalk/ui/kis_int_spinbox.cc
  50. +3
    -3
      chalk/ui/kis_palette_widget.cc
  51. +1
    -1
      chalk/ui/kis_pattern_chooser.cc
  52. +5
    -5
      chalk/ui/kis_previewdialog.cc
  53. +3
    -3
      chalk/ui/kis_previewwidgetbase.ui
  54. +1
    -1
      chalk/ui/kis_selection_manager.cc
  55. +2
    -2
      chalk/ui/kis_tool_paint.cc
  56. +2
    -2
      chalk/ui/kis_tool_paint.h
  57. +1
    -1
      chalk/ui/kis_view.cc
  58. +1
    -1
      chalk/ui/layerlist.cpp
  59. +1
    -1
      chalk/ui/squeezedcombobox.cpp
  60. +4
    -4
      chalk/ui/wdgautobrush.ui
  61. +6
    -6
      chalk/ui/wdgautogradient.ui
  62. +3
    -3
      chalk/ui/wdgbirdeye.ui
  63. +2
    -2
      chalk/ui/wdgcolorsettings.ui
  64. +3
    -3
      chalk/ui/wdgcustombrush.ui
  65. +3
    -3
      chalk/ui/wdgcustompattern.ui
  66. +1
    -1
      chalk/ui/wdgdisplaysettings.ui
  67. +3
    -3
      chalk/ui/wdggeneralsettings.ui
  68. +3
    -3
      chalk/ui/wdggridsettings.ui
  69. +2
    -2
      chalk/ui/wdglayerbox.ui
  70. +1
    -1
      chalk/ui/wdgnewimage.ui
  71. +1
    -1
      chalk/ui/wdgpalettechooser.ui
  72. +2
    -2
      chalk/ui/wdgperformancesettings.ui
  73. +1
    -1
      chalk/ui/wdgselectionoptions.ui
  74. +6
    -6
      chalk/ui/wdgtabletdevicesettings.ui
  75. +2
    -2
      chalk/ui/wdgtabletsettings.ui
  76. +3
    -3
      chalk/ui/wdgtextbrush.ui
  77. +3
    -3
      filters/chalk/jpeg/kis_wdg_options_jpeg.ui
  78. +4
    -4
      filters/chalk/pdf/pdfimportwidgetbase.ui
  79. +3
    -3
      filters/chalk/png/kis_wdg_options_png.ui
  80. +3
    -3
      filters/chalk/raw/wdgrawimport.ui
  81. +8
    -8
      filters/chalk/tiff/kis_wdg_options_tiff.ui
  82. +1
    -1
      filters/karbon/applixgraphics/applixgraphicimport.cc
  83. +2
    -2
      filters/karbon/kontour/kontourimport.cpp
  84. +6
    -6
      filters/karbon/xfig/xfigimport.cc
  85. +13
    -13
      filters/kformula/png/pngexportdia.cc
  86. +1
    -1
      filters/kpresenter/magicpoint/mgp2kpr.py
  87. +1
    -1
      filters/kpresenter/ooimpress/ooimpressexport.cc
  88. +21
    -21
      filters/kpresenter/powerpoint/import/powerpointimport.cc
  89. +1
    -1
      filters/kpresenter/powerpoint/libppt/pole.cpp
  90. +3
    -3
      filters/kpresenter/powerpoint/libppt/ustring.cpp
  91. +2
    -2
      filters/kpresenter/powerpoint/libppt/ustring.h
  92. +1
    -1
      filters/kspread/csv/dialogui.ui
  93. +1
    -1
      filters/kspread/csv/exportdialogui.ui
  94. +14
    -14
      filters/kspread/excel/sidewinder/excel.cpp
  95. +2
    -2
      filters/kspread/excel/sidewinder/excel.h
  96. +1
    -1
      filters/kspread/excel/sidewinder/pole.cpp
  97. +2
    -2
      filters/kspread/excel/sidewinder/ustring.cpp
  98. +2
    -2
      filters/kspread/excel/sidewinder/ustring.h
  99. +1
    -1
      filters/kspread/gnumeric/gnumericexport.cc
  100. +1
    -1
      filters/kspread/gnumeric/status.html

+ 1
- 1
chalk/HACKING View File

@@ -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


+ 1
- 1
chalk/chalkcolor/kis_basic_histogram_producers.h View File

@@ -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)
**/

+ 1
- 1
chalk/colorspaces/wet/kis_wet_palette_widget.cc View File

@@ -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");


+ 2
- 2
chalk/doc/doc-outline View File

@@ -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

+ 1
- 1
chalk/doc/the preview widget View File

@@ -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.
>

+ 1
- 1
chalk/plugins/filters/blur/wdgblur.ui View File

@@ -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">

+ 1
- 1
chalk/plugins/filters/colorify/WdgColorifyBase.ui View File

@@ -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">

+ 1
- 1
chalk/plugins/filters/colors/wdgcolortoalphabase.ui View File

@@ -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">

+ 2
- 2
chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui View File

@@ -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">

+ 2
- 2
chalk/plugins/filters/colorsfilters/wdg_perchannel.ui View File

@@ -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">

+ 3
- 3
chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui View File

@@ -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">

+ 1
- 1
chalk/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui View File

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

+ 5
- 5
chalk/plugins/filters/levelfilter/wdg_level.ui View File

@@ -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">

+ 3
- 3
chalk/plugins/paintops/defaultpaintops/kis_dlgbrushcurvecontrol.ui View File

@@ -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">

+ 2
- 2
chalk/plugins/tools/defaulttools/wdgcolorpicker.ui View File

@@ -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">

+ 1
- 1
chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc View File

@@ -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;

+ 1
- 1
chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc View File

@@ -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)));

+ 1
- 1
chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc View File

@@ -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;

+ 1
- 1
chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc View File

@@ -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;

+ 1
- 1
chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc View File

@@ -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;

+ 1
- 1
chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc View File

@@ -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;

+ 1
- 1
chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc View File

@@ -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;

+ 2
- 2
chalk/plugins/tools/tool_crop/wdg_tool_crop.ui View File

@@ -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">

+ 1
- 1
chalk/plugins/tools/tool_curves/kis_tool_curve.cc View File

@@ -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;

+ 1
- 1
chalk/plugins/tools/tool_curves/kis_tool_moutline.cc View File

@@ -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);

+ 2
- 2
chalk/plugins/tools/tool_curves/wdg_tool_example.ui View File

@@ -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">

+ 2
- 2
chalk/plugins/tools/tool_star/wdg_tool_star.ui View File

@@ -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">

+ 7
- 7
chalk/plugins/tools/tool_transform/wdg_tool_transform.ui View File

@@ -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">

+ 4
- 4
chalk/plugins/viewplugins/colorrange/wdg_colorrange.ui View File

@@ -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">

+ 3
- 3
chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc View File

@@ -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()));
}

+ 1
- 1
chalk/plugins/viewplugins/histogram/wdghistogram.ui View File

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

+ 1
- 1
chalk/plugins/viewplugins/performancetest/wdg_perftest.ui View File

@@ -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">

+ 2
- 2
chalk/plugins/viewplugins/rotateimage/wdg_rotateimage.ui View File

@@ -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">

+ 1
- 1
chalk/plugins/viewplugins/screenshot/ksnapshot.cpp View File

@@ -162,7 +162,7 @@ bool KSnapshot::save( const KURL& url )

void KSnapshot::slotCopy()
{
TQClipboard *cb = TQApplication::tqclipboard();
TQClipboard *cb = TQApplication::clipboard();
cb->setPixmap( snapshot );
}


+ 1
- 1
chalk/plugins/viewplugins/screenshot/regiongrabber.cpp View File

@@ -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();

+ 1
- 1
chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc View File

@@ -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);

+ 2
- 2
chalk/plugins/viewplugins/substrate/wdgsubstrate.ui View File

@@ -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">

+ 1
- 1
chalk/plugins/viewplugins/variations/wdg_variations.ui View File

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

+ 1
- 1
chalk/ui/kis_brush_chooser.cc View File

@@ -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);

+ 5
- 5
chalk/ui/kis_clipboard.cc View File

@@ -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();


+ 7
- 7
chalk/ui/kis_color_cup.cc View File

@@ -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() );
}

}

+ 3
- 3
chalk/ui/kis_controlframe.cc View File

@@ -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);

+ 3
- 3
chalk/ui/kis_dlg_adj_layer_props.cc View File

@@ -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");

+ 3
- 3
chalk/ui/kis_dlg_adjustment_layer.cc View File

@@ -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 {

+ 1
- 1
chalk/ui/kis_dlg_layer_properties.cc View File

@@ -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);


+ 1
- 1
chalk/ui/kis_dlg_new_layer.cc View File

@@ -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"));


+ 1
- 1
chalk/ui/kis_double_widget.cc View File

@@ -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);

+ 1
- 1
chalk/ui/kis_gradient_chooser.cc View File

@@ -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);

+ 2
- 2
chalk/ui/kis_int_spinbox.cc View File

@@ -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)

+ 3
- 3
chalk/ui/kis_palette_widget.cc View File

@@ -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());


+ 1
- 1
chalk/ui/kis_pattern_chooser.cc View File

@@ -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);

+ 5
- 5
chalk/ui/kis_previewdialog.cc View File

@@ -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()

+ 3
- 3
chalk/ui/kis_previewwidgetbase.ui View File

@@ -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">

+ 1
- 1
chalk/ui/kis_selection_manager.cc View File

@@ -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()));
}


+ 2
- 2
chalk/ui/kis_tool_paint.cc View File

@@ -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)

+ 2
- 2
chalk/ui/kis_tool_paint.h View File

@@ -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();

+ 1
- 1
chalk/ui/kis_view.cc View File

@@ -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;

+ 1
- 1
chalk/ui/layerlist.cpp View File

@@ -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()

+ 1
- 1
chalk/ui/squeezedcombobox.cpp View File

@@ -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());
}

+ 4
- 4
chalk/ui/wdgautobrush.ui View File

@@ -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">

+ 6
- 6
chalk/ui/wdgautogradient.ui View File

@@ -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>

+ 3
- 3
chalk/ui/wdgbirdeye.ui View File

@@ -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">

+ 2
- 2
chalk/ui/wdgcolorsettings.ui View File

@@ -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">

+ 3
- 3
chalk/ui/wdgcustombrush.ui View File

@@ -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">

+ 3
- 3
chalk/ui/wdgcustompattern.ui View File

@@ -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">

+ 1
- 1
chalk/ui/wdgdisplaysettings.ui View File

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

+ 3
- 3
chalk/ui/wdggeneralsettings.ui View File

@@ -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">

+ 3
- 3
chalk/ui/wdggridsettings.ui View File

@@ -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">

+ 2
- 2
chalk/ui/wdglayerbox.ui View File

@@ -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">

+ 1
- 1
chalk/ui/wdgnewimage.ui View File

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

+ 1
- 1
chalk/ui/wdgpalettechooser.ui View File

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

+ 2
- 2
chalk/ui/wdgperformancesettings.ui View File

@@ -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">

+ 1
- 1
chalk/ui/wdgselectionoptions.ui View File

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

+ 6
- 6
chalk/ui/wdgtabletdevicesettings.ui View File

@@ -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">

+ 2
- 2
chalk/ui/wdgtabletsettings.ui View File

@@ -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">

+ 3
- 3
chalk/ui/wdgtextbrush.ui View File

@@ -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">

+ 3
- 3
filters/chalk/jpeg/kis_wdg_options_jpeg.ui View File

@@ -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">

+ 4
- 4
filters/chalk/pdf/pdfimportwidgetbase.ui View File

@@ -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">

+ 3
- 3
filters/chalk/png/kis_wdg_options_png.ui View File

@@ -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">

+ 3
- 3
filters/chalk/raw/wdgrawimport.ui View File

@@ -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">

+ 8
- 8
filters/chalk/tiff/kis_wdg_options_tiff.ui View File

@@ -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">

+ 1
- 1
filters/karbon/applixgraphics/applixgraphicimport.cc View File

@@ -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";

+ 2
- 2
filters/karbon/kontour/kontourimport.cpp View File

@@ -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
{

+ 6
- 6
filters/karbon/xfig/xfigimport.cc View File

@@ -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;


+ 13
- 13
filters/kformula/png/pngexportdia.cc View File

@@ -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();
}

+ 1
- 1
filters/kpresenter/magicpoint/mgp2kpr.py View File

@@ -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)

+ 1
- 1
filters/kpresenter/ooimpress/ooimpressexport.cc View File

@@ -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 ) {

+ 21
- 21
filters/kpresenter/powerpoint/import/powerpointimport.cc View File

@@ -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", "tq<