Browse Source

Rename old tq methods that no longer need a unique name

tags/r14.0.0
Timothy Pearson 7 years ago
parent
commit
11191ef0b9
100 changed files with 287 additions and 287 deletions
  1. 2
    2
      chalk/chalkcolor/kis_colorspace_factory_registry.cc
  2. 3
    3
      chalk/core/kis_exif_value.cc
  3. 3
    3
      chalk/core/kis_fill_painter.cc
  4. 2
    2
      chalk/core/kis_filter_registry.cc
  5. 2
    2
      chalk/core/kis_paintop_registry.cc
  6. 2
    2
      chalk/doc/chalk.xmi
  7. 4
    4
      chalk/plugins/filters/blur/wdgblur.ui
  8. 1
    1
      chalk/plugins/filters/bumpmap/wdgbumpmap.ui
  9. 1
    1
      chalk/plugins/filters/cimg/wdg_cimg.ui
  10. 2
    2
      chalk/plugins/filters/colorify/WdgColorifyBase.ui
  11. 2
    2
      chalk/plugins/filters/colors/wdgcolortoalphabase.ui
  12. 9
    9
      chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui
  13. 4
    4
      chalk/plugins/filters/colorsfilters/wdg_perchannel.ui
  14. 4
    4
      chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui
  15. 1
    1
      chalk/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui
  16. 4
    4
      chalk/plugins/filters/lenscorrectionfilter/wdglenscorrectionoptions.ui
  17. 11
    11
      chalk/plugins/filters/levelfilter/wdg_level.ui
  18. 2
    2
      chalk/plugins/filters/noisefilter/wdgnoiseoptions.ui
  19. 1
    1
      chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cc
  20. 2
    2
      chalk/plugins/filters/randompickfilter/wdgrandompickoptions.ui
  21. 2
    2
      chalk/plugins/filters/unsharp/wdgunsharp.ui
  22. 2
    2
      chalk/plugins/filters/wavefilter/wdgwaveoptions.ui
  23. 1
    1
      chalk/plugins/paintops/defaultpaintops/kis_brushop.cc
  24. 1
    1
      chalk/plugins/paintops/defaultpaintops/kis_dlgbrushcurvecontrol.ui
  25. 1
    1
      chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc
  26. 2
    2
      chalk/plugins/tools/defaulttools/wdgcolorpicker.ui
  27. 1
    1
      chalk/plugins/tools/tool_crop/wdg_tool_crop.ui
  28. 1
    1
      chalk/plugins/tools/tool_transform/wdg_tool_transform.ui
  29. 1
    1
      chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc
  30. 1
    1
      chalk/plugins/viewplugins/colorrange/wdg_colorrange.ui
  31. 1
    1
      chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc
  32. 1
    1
      chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc
  33. 4
    4
      chalk/plugins/viewplugins/dropshadow/wdg_dropshadow.ui
  34. 4
    4
      chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc
  35. 1
    1
      chalk/plugins/viewplugins/filtersgallery/kis_wdg_filtersgallery.ui
  36. 1
    1
      chalk/plugins/viewplugins/histogram/dlg_histogram.cc
  37. 4
    4
      chalk/plugins/viewplugins/histogram/wdghistogram.ui
  38. 1
    1
      chalk/plugins/viewplugins/imagesize/dlg_imagesize.cc
  39. 1
    1
      chalk/plugins/viewplugins/imagesize/dlg_layersize.cc
  40. 3
    3
      chalk/plugins/viewplugins/imagesize/wdg_imagesize.ui
  41. 1
    1
      chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cc
  42. 1
    1
      chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cc
  43. 1
    1
      chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc
  44. 1
    1
      chalk/plugins/viewplugins/performancetest/dlg_perftest.cc
  45. 1
    1
      chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.cc
  46. 4
    4
      chalk/plugins/viewplugins/rotateimage/wdg_rotateimage.ui
  47. 1
    1
      chalk/plugins/viewplugins/screenshot/ksnapshot.h
  48. 4
    4
      chalk/plugins/viewplugins/screenshot/ksnapshotwidget.ui
  49. 2
    2
      chalk/plugins/viewplugins/screenshot/regiongrabber.cpp
  50. 1
    1
      chalk/plugins/viewplugins/separate_channels/dlg_separate.cc
  51. 1
    1
      chalk/plugins/viewplugins/separate_channels/wdg_separations.ui
  52. 1
    1
      chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc
  53. 1
    1
      chalk/plugins/viewplugins/shearimage/wdg_shearimage.ui
  54. 28
    28
      chalk/plugins/viewplugins/variations/wdg_variations.ui
  55. 1
    1
      chalk/ui/imageviewer.cc
  56. 1
    1
      chalk/ui/kis_birdeye_box.cc
  57. 9
    9
      chalk/ui/kis_canvas_painter.cc
  58. 6
    6
      chalk/ui/kis_canvas_painter.h
  59. 2
    2
      chalk/ui/kis_clipboard.cc
  60. 6
    6
      chalk/ui/kis_color_cup.cc
  61. 1
    1
      chalk/ui/kis_color_cup.h
  62. 1
    1
      chalk/ui/kis_dlg_adj_layer_props.cc
  63. 1
    1
      chalk/ui/kis_dlg_adjustment_layer.cc
  64. 1
    1
      chalk/ui/kis_dlg_apply_profile.cc
  65. 1
    1
      chalk/ui/kis_dlg_image_properties.cc
  66. 4
    4
      chalk/ui/kis_dlg_preferences.cc
  67. 1
    1
      chalk/ui/kis_filter_manager.cc
  68. 1
    1
      chalk/ui/kis_filters_listview.cc
  69. 2
    2
      chalk/ui/kis_gradient_slider_widget.cc
  70. 1
    1
      chalk/ui/kis_int_spinbox.cc
  71. 1
    1
      chalk/ui/kis_layerbox.cc
  72. 2
    2
      chalk/ui/kis_matrix_widget.ui
  73. 3
    3
      chalk/ui/kis_opengl_canvas_painter.cc
  74. 3
    3
      chalk/ui/kis_opengl_canvas_painter.h
  75. 1
    1
      chalk/ui/kis_palette_view.cc
  76. 1
    1
      chalk/ui/kis_palette_widget.cc
  77. 3
    3
      chalk/ui/kis_previewwidgetbase.ui
  78. 9
    9
      chalk/ui/kis_qpaintdevice_canvas_painter.cc
  79. 3
    3
      chalk/ui/kis_qpaintdevice_canvas_painter.h
  80. 2
    2
      chalk/ui/kis_ruler.cc
  81. 1
    1
      chalk/ui/kis_tool.cc
  82. 1
    1
      chalk/ui/kis_tool_dummy.cc
  83. 2
    2
      chalk/ui/kis_tool_registry.cc
  84. 6
    6
      chalk/ui/kis_view.cc
  85. 2
    2
      chalk/ui/kobirdeyepanel.cpp
  86. 7
    7
      chalk/ui/layerlist.cpp
  87. 2
    2
      chalk/ui/squeezedcombobox.cpp
  88. 2
    2
      chalk/ui/squeezedcombobox.h
  89. 6
    6
      chalk/ui/wdgautobrush.ui
  90. 3
    3
      chalk/ui/wdgautogradient.ui
  91. 8
    8
      chalk/ui/wdgbirdeye.ui
  92. 2
    2
      chalk/ui/wdgcolorsettings.ui
  93. 3
    3
      chalk/ui/wdgcustombrush.ui
  94. 3
    3
      chalk/ui/wdgcustompattern.ui
  95. 2
    2
      chalk/ui/wdgdisplaysettings.ui
  96. 4
    4
      chalk/ui/wdggeneralsettings.ui
  97. 7
    7
      chalk/ui/wdggridsettings.ui
  98. 12
    12
      chalk/ui/wdglayerbox.ui
  99. 3
    3
      chalk/ui/wdgnewimage.ui
  100. 0
    0
      chalk/ui/wdgpalettechooser.ui

+ 2
- 2
chalk/chalkcolor/kis_colorspace_factory_registry.cc View File

@@ -62,8 +62,8 @@ KisColorSpaceFactoryRegistry::KisColorSpaceFactoryRegistry(TQStringList profileF
*/

// Load all colorspace modules
KTrader::OfferList offers = KTrader::self()->query(TQString::tqfromLatin1("Chalk/ColorSpace"),
TQString::tqfromLatin1("(Type == 'Service') and "
KTrader::OfferList offers = KTrader::self()->query(TQString::fromLatin1("Chalk/ColorSpace"),
TQString::fromLatin1("(Type == 'Service') and "
"([X-Chalk-Version] == 2)"));

if (offers.empty()) {

+ 3
- 3
chalk/core/kis_exif_value.cc View File

@@ -340,10 +340,10 @@ TQDomElement ExifValue::save(TQDomDocument& doc)
UByteArray value = asUndefined();
TQByteArray data;
data.setRawData((char*)value.data(), value.size());
TQByteArray tqencodedData;
KCodecs::base64Encode( data, tqencodedData );
TQByteArray encodedData;
KCodecs::base64Encode( data, encodedData );
data.resetRawData( (char*)value.data(), value.size());
elmt.setAttribute("value", TQString(tqencodedData));
elmt.setAttribute("value", TQString(encodedData));
}
break;
case EXIF_TYPE_SSHORT:

+ 3
- 3
chalk/core/kis_fill_painter.cc View File

@@ -209,7 +209,7 @@ struct FillSegment {
// FillSegment* parent;
};

typedef enum { None = 0, Added = 1, Checked = 2 } tqStatus;
typedef enum { None = 0, Added = 1, Checked = 2 } Status;

KisSelectionSP KisFillPainter::createFloodSelection(int startX, int startY) {
if (m_width < 0 || m_height < 0) {
@@ -260,9 +260,9 @@ KisSelectionSP KisFillPainter::createFloodSelection(int startX, int startY) {

stack.push(new FillSegment(startX, startY/*, 0*/));

tqStatus* map = new tqStatus[m_size];
Status* map = new Status[m_size];

memset(map, None, m_size * sizeof(tqStatus));
memset(map, None, m_size * sizeof(Status));

int progressPercent = 0; int pixelsDone = 0; int currentPercent = 0;
emit notifyProgressStage(i18n("Making fill outline..."), 0);

+ 2
- 2
chalk/core/kis_filter_registry.cc View File

@@ -40,8 +40,8 @@ KisFilterRegistry::KisFilterRegistry()
Q_ASSERT(KisFilterRegistry::m_singleton == 0);
KisFilterRegistry::m_singleton = this;

KTrader::OfferList offers = KTrader::self()->query(TQString::tqfromLatin1("Chalk/Filter"),
TQString::tqfromLatin1("(Type == 'Service') and "
KTrader::OfferList offers = KTrader::self()->query(TQString::fromLatin1("Chalk/Filter"),
TQString::fromLatin1("(Type == 'Service') and "
"([X-Chalk-Version] == 2)"));

KTrader::OfferList::ConstIterator iter;

+ 2
- 2
chalk/core/kis_paintop_registry.cc View File

@@ -43,8 +43,8 @@ KisPaintOpRegistry::KisPaintOpRegistry()
Q_ASSERT(KisPaintOpRegistry::m_singleton == 0);
KisPaintOpRegistry::m_singleton = this;

KTrader::OfferList offers = KTrader::self()->query(TQString::tqfromLatin1("Chalk/Paintop"),
TQString::tqfromLatin1("(Type == 'Service') and "
KTrader::OfferList offers = KTrader::self()->query(TQString::fromLatin1("Chalk/Paintop"),
TQString::fromLatin1("(Type == 'Service') and "
"([X-Chalk-Version] == 2)"));

KTrader::OfferList::ConstIterator iter;

+ 2
- 2
chalk/doc/chalk.xmi View File

@@ -645,7 +645,7 @@ of tile in x and y." visibility="public" xmi.id="408" type="void" name="tileCoor
<UML:Operation visibility="public" xmi.id="476" type="virtual void" isAbstract="true" name="insert" >
<UML:Parameter visibility="private" xmi.id="477" value="" type="KisTileSP" name="tile" />
</UML:Operation>
<UML:Operation visibility="public" xmi.id="478" type="virtual void" isAbstract="true" name="tqsizeHint" >
<UML:Operation visibility="public" xmi.id="478" type="virtual void" isAbstract="true" name="sizeHint" >
<UML:Parameter visibility="private" xmi.id="479" value="" type="Q_INT32" name="nelements" />
</UML:Operation>
<UML:Operation visibility="public" xmi.id="480" type="virtual " name="~KisTileCacheInterface" />
@@ -4485,7 +4485,7 @@ in the constructor, you have to call loadAsync.
<listitem open="0" type="815" id="473" label="KisTileCacheInterface" />
<listitem open="0" type="815" id="474" label="flush" />
<listitem open="0" type="815" id="476" label="insert" />
<listitem open="0" type="815" id="478" label="tqsizeHint" />
<listitem open="0" type="815" id="478" label="sizeHint" />
<listitem open="0" type="815" id="480" label="~KisTileCacheInterface" />
</listitem>
<listitem open="0" type="813" id="1996" label="KisTileCommand" >

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

@@ -32,7 +32,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -49,7 +49,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -76,13 +76,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>16</width>
<height>0</height>
</size>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>16</width>
<height>32767</height>

+ 1
- 1
chalk/plugins/filters/bumpmap/wdgbumpmap.ui View File

@@ -66,7 +66,7 @@ layer, the current layer will be used.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>40</height>

+ 1
- 1
chalk/plugins/filters/cimg/wdg_cimg.ui View File

@@ -42,7 +42,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>51</width>
<height>20</height>

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

@@ -29,7 +29,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>61</width>
<height>20</height>
@@ -79,7 +79,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>50</height>

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

@@ -29,7 +29,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>61</width>
<height>20</height>
@@ -95,7 +95,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>50</height>

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

@@ -50,13 +50,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>250</width>
<height>20</height>
</size>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>250</width>
<height>20</height>
@@ -84,13 +84,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>254</width>
<height>254</height>
</size>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>254</width>
<height>254</height>
@@ -116,13 +116,13 @@
<property name="name">
<cstring>kCurve</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>250</width>
<height>250</height>
</size>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>250</width>
<height>250</height>
@@ -143,13 +143,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>20</width>
<height>250</height>
</size>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>20</width>
<height>250</height>
@@ -253,7 +253,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>131</width>
<height>20</height>

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

@@ -65,13 +65,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>32767</width>
<height>20</height>
@@ -134,13 +134,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>20</width>
<height>0</height>
</size>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>20</width>
<height>32767</height>

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

@@ -69,7 +69,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>21</width>
<height>20</height>
@@ -115,7 +115,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>24</width>
<height>20</height>
@@ -134,7 +134,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
@@ -153,7 +153,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>20</height>

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

@@ -55,7 +55,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>101</height>

+ 4
- 4
chalk/plugins/filters/lenscorrectionfilter/wdglenscorrectionoptions.ui View File

@@ -29,7 +29,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>90</height>
@@ -46,7 +46,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -118,7 +118,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -135,7 +135,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>51</width>
<height>20</height>

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

@@ -20,13 +20,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -70,13 +70,13 @@
<property name="name">
<cstring>histview</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>256</width>
<height>256</height>
</size>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>256</width>
<height>256</height>
@@ -98,7 +98,7 @@
<property name="name">
<cstring>ingradient</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>256</width>
<height>20</height>
@@ -134,7 +134,7 @@
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>25</width>
<height>20</height>
@@ -162,7 +162,7 @@
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>25</width>
<height>20</height>
@@ -204,7 +204,7 @@
<property name="name">
<cstring>outgradient</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>256</width>
<height>20</height>
@@ -240,7 +240,7 @@
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>50</width>
<height>20</height>
@@ -274,7 +274,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>21</width>
<height>20</height>
@@ -291,7 +291,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>20</height>

+ 2
- 2
chalk/plugins/filters/noisefilter/wdgnoiseoptions.ui View File

@@ -73,7 +73,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>21</width>
<height>20</height>
@@ -90,7 +90,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>21</height>

+ 1
- 1
chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cc View File

@@ -124,7 +124,7 @@ void KisRainDropsFilter::rainDrops(KisPaintDeviceSP src, KisPaintDeviceSP dst, c

KisColorSpace * cs = src->colorSpace();

TQDateTime dt = TQDateTime::tqcurrentDateTime();
TQDateTime dt = TQDateTime::currentDateTime();
TQDateTime Y2000( TQDate(2000, 1, 1), TQTime(0, 0, 0) );

srand ((uint) dt.secsTo(Y2000));

+ 2
- 2
chalk/plugins/filters/randompickfilter/wdgrandompickoptions.ui View File

@@ -37,7 +37,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>50</height>
@@ -98,7 +98,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>16</width>
<height>20</height>

+ 2
- 2
chalk/plugins/filters/unsharp/wdgunsharp.ui View File

@@ -84,7 +84,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>21</width>
<height>20</height>
@@ -115,7 +115,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>21</height>

+ 2
- 2
chalk/plugins/filters/wavefilter/wdgwaveoptions.ui View File

@@ -29,7 +29,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>60</width>
<height>20</height>
@@ -46,7 +46,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>60</height>

+ 1
- 1
chalk/plugins/paintops/defaultpaintops/kis_brushop.cc View File

@@ -68,7 +68,7 @@ KisBrushOpSettings::KisBrushOpSettings(TQWidget *parent)
m_darken = new TQCheckBox(i18n("Darken"), m_optionsWidget);
m_curveControl = new WdgBrushCurveControl(m_optionsWidget);
TQToolButton* moreButton = new TQToolButton(TQt::UpArrow, m_optionsWidget);
moreButton->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
moreButton->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
moreButton->setMinimumSize(TQSize(24,24)); // Bah, I had hoped the above line would make this unneeded
connect(moreButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCustomCurves()));


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

@@ -183,7 +183,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>20</height>

+ 1
- 1
chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc View File

@@ -77,7 +77,7 @@ KisSmudgeOpSettings::KisSmudgeOpSettings(TQWidget *parent, bool isTablet)
m_curveControl->tabWidget->setTabToolTip(m_curveControl->tabWidget->page(2),
i18n("Modifies the rate. Bottom is 0% of the rate top is 100% of the original rate."));
TQToolButton* moreButton = new TQToolButton(TQt::UpArrow, m_optionsWidget);
moreButton->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
moreButton->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
moreButton->setMinimumSize(TQSize(24,24)); // Bah, I had hoped the above line would make this unneeded
connect(moreButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCustomCurves()));
} else {

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

@@ -47,13 +47,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
</size>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>200</width>
<height>32767</height>

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

@@ -185,7 +185,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>16</height>

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

@@ -197,7 +197,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>21</height>

+ 1
- 1
chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc View File

@@ -187,7 +187,7 @@ DlgColorRange::DlgColorRange( KisView * view, KisPaintDeviceSP dev, TQWidget *

setCaption(i18n("Color Range"));
setMainWidget(m_page);
resize(m_page->tqsizeHint());
resize(m_page->sizeHint());

if (m_dev->image()->undo()) m_transaction = new KisSelectedTransaction(i18n("Select by Color Range"), m_dev);


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

@@ -176,7 +176,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>40</height>

+ 1
- 1
chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc View File

@@ -47,7 +47,7 @@ DlgColorSpaceConversion::DlgColorSpaceConversion( TQWidget * parent,
Q_CHECK_PTR(m_page);

setMainWidget(m_page);
resize(m_page->tqsizeHint());
resize(m_page->sizeHint());

m_page->cmbColorSpaces->setIDList(KisMetaRegistry::instance()->csRegistry()->listKeys());


+ 1
- 1
chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc View File

@@ -46,7 +46,7 @@ DlgDropshadow::DlgDropshadow( const TQString & /*imageCS*/,
m_page = new WdgDropshadow(this, "dropshadow");
Q_CHECK_PTR(m_page);
setMainWidget(m_page);
resize(m_page->tqsizeHint());
resize(m_page->sizeHint());

KConfig * cfg = KGlobal::config();
m_page->xOffsetSpinBox->setValue( cfg->readNumEntry("dropshadow_x", 8) );

+ 4
- 4
chalk/plugins/viewplugins/dropshadow/wdg_dropshadow.ui View File

@@ -116,7 +116,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>200</width>
<height>20</height>
@@ -144,7 +144,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>200</width>
<height>20</height>
@@ -169,7 +169,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>190</width>
<height>20</height>
@@ -194,7 +194,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>120</width>
<height>31</height>

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

@@ -56,7 +56,7 @@ KisDlgFiltersGallery::KisDlgFiltersGallery(KisView* view, TQWidget* parent,const
connect(m_widget->filtersList , TQT_SIGNAL(selectionChanged(TQIconViewItem*)), this, TQT_SLOT(selectionHasChanged(TQIconViewItem* )));
// Initialize configWidgetHolder
m_widget->configWidgetHolder->setColumnLayout ( 0, Qt::Horizontal );
//m_widget->configWidgetHolder->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum);
//m_widget->configWidgetHolder->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum);
// Initialize preview widget
if (m_view->canvasSubject()->currentImg() && m_view->canvasSubject()->currentImg()->activeDevice())
@@ -64,8 +64,8 @@ KisDlgFiltersGallery::KisDlgFiltersGallery(KisView* view, TQWidget* parent,const
m_widget->previewWidget->slotSetDevice( m_view->canvasSubject()->currentImg()->activeDevice().data() );
}
connect( m_widget->previewWidget, TQT_SIGNAL(updated()), this, TQT_SLOT(refreshPreview()));
resize( tqminimumSizeHint());
m_widget->previewWidget->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::MinimumExpanding);
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_labelNoCW->hide();
@@ -94,7 +94,7 @@ void KisDlgFiltersGallery::selectionHasChanged ( TQIconViewItem * item )
m_currentConfigWidget = m_currentFilter->createConfigurationWidget(m_widget->configWidgetHolder, activeLayer->paintDevice());
if(m_currentConfigWidget != 0) {
//m_currentConfigWidget->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
//m_currentConfigWidget->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
m_widget->configWidgetHolder->tqlayout()->add(m_currentConfigWidget);
m_currentConfigWidget->show();
connect(m_currentConfigWidget, TQT_SIGNAL(sigPleaseUpdatePreview()), this, TQT_SLOT(slotConfigChanged()));

+ 1
- 1
chalk/plugins/viewplugins/filtersgallery/kis_wdg_filtersgallery.ui View File

@@ -49,7 +49,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>

+ 1
- 1
chalk/plugins/viewplugins/histogram/dlg_histogram.cc View File

@@ -47,7 +47,7 @@ DlgHistogram::DlgHistogram( TQWidget * parent, const char * name)

setCaption(i18n("Histogram"));
setMainWidget(m_page);
resize(m_page->tqsizeHint());
resize(m_page->sizeHint());
}

DlgHistogram::~DlgHistogram()

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

@@ -56,7 +56,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -75,7 +75,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -103,7 +103,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>21</height>
@@ -124,7 +124,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>256</width>
<height>150</height>

+ 1
- 1
chalk/plugins/viewplugins/imagesize/dlg_imagesize.cc View File

@@ -58,7 +58,7 @@ DlgImageSize::DlgImageSize( TQWidget * parent,
m_page->cmbFilterType->setCurrentText("Mitchell");

setMainWidget(m_page);
resize(m_page->tqsizeHint());
resize(m_page->sizeHint());

unblockAll();


+ 1
- 1
chalk/plugins/viewplugins/imagesize/dlg_layersize.cc View File

@@ -59,7 +59,7 @@ DlgLayerSize::DlgLayerSize( TQWidget * parent,
m_page->cmbFilterType->setCurrentText("Mitchell");

setMainWidget(m_page);
resize(m_page->tqsizeHint());
resize(m_page->sizeHint());

unblockAll();


+ 3
- 3
chalk/plugins/viewplugins/imagesize/wdg_imagesize.ui View File

@@ -51,7 +51,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>65</width>
<height>20</height>
@@ -68,7 +68,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>65</width>
<height>20</height>
@@ -123,7 +123,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>121</width>
<height>20</height>

+ 1
- 1
chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cc View File

@@ -45,7 +45,7 @@ DlgBorderSelection::DlgBorderSelection( TQWidget * parent, const char * name) :
Q_CHECK_PTR(m_page);

setMainWidget(m_page);
resize(m_page->tqsizeHint());
resize(m_page->sizeHint());

connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(okClicked()));
}

+ 1
- 1
chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cc View File

@@ -45,7 +45,7 @@ DlgGrowSelection::DlgGrowSelection( TQWidget * parent, const char * name) : sup
Q_CHECK_PTR(m_page);

setMainWidget(m_page);
resize(m_page->tqsizeHint());
resize(m_page->sizeHint());

connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(okClicked()));
}

+ 1
- 1
chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc View File

@@ -45,7 +45,7 @@ DlgShrinkSelection::DlgShrinkSelection( TQWidget * parent, const char * name) :
Q_CHECK_PTR(m_page);

setMainWidget(m_page);
resize(m_page->tqsizeHint());
resize(m_page->sizeHint());

connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(okClicked()));
}

+ 1
- 1
chalk/plugins/viewplugins/performancetest/dlg_perftest.cc View File

@@ -49,7 +49,7 @@ DlgPerfTest::DlgPerfTest( TQWidget * parent,
Q_CHECK_PTR(m_page);

setMainWidget(m_page);
resize(m_page->tqsizeHint());
resize(m_page->sizeHint());

connect(this, TQT_SIGNAL(okClicked()),
this, TQT_SLOT(okClicked()));

+ 1
- 1
chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.cc View File

@@ -49,7 +49,7 @@ DlgRotateImage::DlgRotateImage( TQWidget * parent,
Q_CHECK_PTR(m_page);

setMainWidget(m_page);
resize(m_page->tqsizeHint());
resize(m_page->sizeHint());

connect(this, TQT_SIGNAL(okClicked()),
this, TQT_SLOT(okClicked()));

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

@@ -48,7 +48,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -79,7 +79,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>41</width>
<height>20</height>
@@ -110,7 +110,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>31</width>
<height>20</height>
@@ -219,7 +219,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>91</height>

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

@@ -44,7 +44,7 @@ public:
KSnapshotThumb(TQWidget *parent, const char *name = 0)
: TQLabel(parent, name)
{
tqsetAlignment(AlignHCenter | AlignVCenter);
setAlignment(AlignHCenter | AlignVCenter);
}
virtual ~KSnapshotThumb() {}


+ 4
- 4
chalk/plugins/viewplugins/screenshot/ksnapshotwidget.ui View File

@@ -23,7 +23,7 @@
<property name="name">
<cstring>lblImage</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>200</width>
<height>130</height>
@@ -76,7 +76,7 @@ The image can be dragged to another application or document to copy the full scr
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>16</width>
<height>16</height>
@@ -167,7 +167,7 @@ If &lt;i&gt;no delay&lt;/i&gt; is set, the program will wait for a mouse click b
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>156</width>
<height>16</height>
@@ -225,7 +225,7 @@ If &lt;i&gt;no delay&lt;/i&gt; is set, the program will wait for a mouse click b
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>31</height>

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

@@ -161,8 +161,8 @@ void RegionGrabber::drawRubber()
p.setPen( TQPen( color0, 1 ) );
p.setBrush( NoBrush );

tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, grabRect, tqcolorGroup(),
TQStyle::Style_Default, TQStyleOption( tqcolorGroup().base() ) );
tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, grabRect, colorGroup(),
TQStyle::Style_Default, TQStyleOption( colorGroup().base() ) );

p.end();
}

+ 1
- 1
chalk/plugins/viewplugins/separate_channels/dlg_separate.cc View File

@@ -43,7 +43,7 @@ DlgSeparate::DlgSeparate( const TQString & imageCS,
m_page = new WdgSeparations(this, "separate_image");
Q_CHECK_PTR(m_page);
setMainWidget(m_page);
resize(m_page->tqsizeHint());
resize(m_page->sizeHint());

m_page->lblColormodel->setText(layerCS);
m_page->grpOutput->hide();

+ 1
- 1
chalk/plugins/viewplugins/separate_channels/wdg_separations.ui View File

@@ -82,7 +82,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>16</height>

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

@@ -50,7 +50,7 @@ DlgShearImage::DlgShearImage( TQWidget * parent,
Q_CHECK_PTR(m_page);

setMainWidget(m_page);
resize(m_page->tqsizeHint());
resize(m_page->sizeHint());

connect(this, TQT_SIGNAL(okClicked()),
this, TQT_SLOT(okClicked()));

+ 1
- 1
chalk/plugins/viewplugins/shearimage/wdg_shearimage.ui View File

@@ -56,7 +56,7 @@
<property name="name">
<cstring>shearAngleY</cstring>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>32767</width>
<height>100</height>

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

@@ -64,13 +64,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>150</width>
<height>150</height>
</size>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>150</width>
<height>150</height>
@@ -95,13 +95,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>150</width>
<height>150</height>
</size>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>150</width>
<height>150</height>
@@ -268,7 +268,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>187</height>
@@ -287,7 +287,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>32767</width>
<height>556</height>
@@ -322,13 +322,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>150</width>
<height>150</height>
</size>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>150</width>
<height>150</height>
@@ -364,13 +364,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>150</width>
<height>150</height>
</size>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>150</width>
<height>150</height>
@@ -406,13 +406,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>150</width>
<height>150</height>
</size>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>150</width>
<height>150</height>
@@ -460,13 +460,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>540</width>
<height>556</height>
</size>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>540</width>
<height>556</height>
@@ -497,13 +497,13 @@
<height>150</height>
</rect>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>150</width>
<height>150</height>
</size>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>150</width>
<height>150</height>
@@ -574,13 +574,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>150</width>
<height>150</height>
</size>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>150</width>
<height>150</height>
@@ -632,13 +632,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>150</width>
<height>150</height>
</size>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>150</width>
<height>150</height>
@@ -671,13 +671,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>150</width>
<height>150</height>
</size>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>150</width>
<height>150</height>
@@ -710,13 +710,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>150</width>
<height>150</height>
</size>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>150</width>
<height>150</height>
@@ -787,13 +787,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>150</width>
<height>150</height>
</size>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>150</width>
<height>150</height>
@@ -829,13 +829,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>150</width>
<height>150</height>
</size>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>150</width>
<height>150</height>

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

@@ -35,7 +35,7 @@ ImageViewer::ImageViewer(TQWidget *widget, const char * name)
, m_image(TQPixmap())
{
m_label = new TQLabel( viewport());
tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
setCursor(KisCursor::handCursor());
addChild(m_label);
}

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

@@ -203,7 +203,7 @@ KisBirdEyeBox::KisBirdEyeBox(KisView * view, TQWidget* parent, const char* name)
hl->addWidget(m_exposureLabel);

m_exposureDoubleWidget = new KisDoubleWidget(-10, 10, this);
m_exposureDoubleWidget->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed);
m_exposureDoubleWidget->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed);
hl->addWidget(m_exposureDoubleWidget);
TQToolTip::add(m_exposureDoubleWidget, i18n("Select the exposure (stops) for HDR images"));
l->addItem(new TQSpacerItem(0, 1, TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding));

+ 9
- 9
chalk/ui/kis_canvas_painter.cc View File

@@ -184,7 +184,7 @@ void KisCanvasWidgetPainter::setWorldXForm(bool /*enable*/)
{
}

const TQWMatrix& KisCanvasWidgetPainter::tqworldMatrix() const
const TQWMatrix& KisCanvasWidgetPainter::worldMatrix() const
{
return m_defaultWorldMatrix;
}
@@ -501,11 +501,11 @@ void KisCanvasWidgetPainter::drawText(const TQRect& /*r*/, int /*flags*/, const
{
}

void KisCanvasWidgetPainter::tqdrawTextItem(int /*x*/, int /*y*/, const TQTextItem& /*ti*/, int /*textflags*/)
void KisCanvasWidgetPainter::drawTextItem(int /*x*/, int /*y*/, const TQTextItem& /*ti*/, int /*textflags*/)
{
}

void KisCanvasWidgetPainter::tqdrawTextItem(const TQPoint& /*p*/, const TQTextItem& /*ti*/, int /*textflags*/)
void KisCanvasWidgetPainter::drawTextItem(const TQPoint& /*p*/, const TQTextItem& /*ti*/, int /*textflags*/)
{
}

@@ -833,10 +833,10 @@ void KisCanvasPainter::setWorldXForm(bool enable)
}
}

const TQWMatrix& KisCanvasPainter::tqworldMatrix() const
const TQWMatrix& KisCanvasPainter::worldMatrix() const
{
if (m_canvasWidgetPainter != 0) {
return m_canvasWidgetPainter->tqworldMatrix();
return m_canvasWidgetPainter->worldMatrix();
}
return m_defaultWorldMatrix;
}
@@ -1378,17 +1378,17 @@ void KisCanvasPainter::drawText(const TQRect& r, int flags, const TQString& text
}
}

void KisCanvasPainter::tqdrawTextItem(int x, int y, const TQTextItem& ti, int textflags)
void KisCanvasPainter::drawTextItem(int x, int y, const TQTextItem& ti, int textflags)
{
if (m_canvasWidgetPainter != 0) {
m_canvasWidgetPainter->tqdrawTextItem(x, y, ti, textflags);
m_canvasWidgetPainter->drawTextItem(x, y, ti, textflags);
}
}

void KisCanvasPainter::tqdrawTextItem(const TQPoint& p, const TQTextItem& ti, int textflags)
void KisCanvasPainter::drawTextItem(const TQPoint& p, const TQTextItem& ti, int textflags)
{
if (m_canvasWidgetPainter != 0) {
m_canvasWidgetPainter->tqdrawTextItem(p, ti, textflags);
m_canvasWidgetPainter->drawTextItem(p, ti, textflags);
}
}


+ 6
- 6
chalk/ui/kis_canvas_painter.h View File

@@ -78,7 +78,7 @@ public:
virtual void setViewport(int x, int y, int w, int h);

virtual void setWorldXForm(bool);
virtual const TQWMatrix&tqworldMatrix() const;
virtual const TQWMatrix&worldMatrix() const;
virtual void setWorldMatrix(const TQWMatrix&, bool combine=FALSE);

virtual void saveWorldMatrix();
@@ -168,8 +168,8 @@ public:
virtual void drawText(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0);
virtual void drawText(const TQRect&, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0);

virtual void tqdrawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0);
virtual void tqdrawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0);
virtual void drawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0);
virtual void drawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0);

virtual TQRect boundingRect(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQTextParag **intern=0);
virtual TQRect boundingRect(const TQRect&, int flags, const TQString&, int len = -1, TQTextParag **intern=0);
@@ -241,7 +241,7 @@ public:
void setViewport(int x, int y, int w, int h);

void setWorldXForm(bool);
const TQWMatrix&tqworldMatrix() const;
const TQWMatrix&worldMatrix() const;
void setWorldMatrix(const TQWMatrix&, bool combine=FALSE);

void saveWorldMatrix();
@@ -331,8 +331,8 @@ public:
void drawText(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0);
void drawText(const TQRect&, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0);

void tqdrawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0);
void tqdrawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0);
void drawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0);
void drawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0);

TQRect boundingRect(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQTextParag **intern=0);
TQRect boundingRect(const TQRect&, int flags, const TQString&, int len = -1, TQTextParag **intern=0);

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

@@ -145,7 +145,7 @@ KisPaintDeviceSP KisClipboard::clip()

if(cbData && cbData->provides(mimeType))
{
TQBuffer buffer(cbData->tqencodedData(mimeType));
TQBuffer buffer(cbData->encodedData(mimeType));
KoStore* store = KoStore::createStore( TQT_TQIODEVICE(&buffer), KoStore::Read, mimeType );
KisProfile *profile=0;

@@ -243,7 +243,7 @@ TQSize KisClipboard::clipSize()
if(cbData && cbData->provides(mimeType)) {
TQBuffer buffer(cbData->tqencodedData(mimeType));
TQBuffer buffer(cbData->encodedData(mimeType));
KoStore* store = KoStore::createStore( TQT_TQIODEVICE(&buffer), KoStore::Read, mimeType );
KisProfile *profile=0;


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

@@ -81,7 +81,7 @@ void KisColorCup::slotClicked()
emit changed(m_color);
}

TQSize KisColorCup::tqsizeHint() const
TQSize KisColorCup::sizeHint() const
{
return tqstyle().tqsizeFromContents(TQStyle::CT_PushButton, this, TQSize(24, 24)).
expandedTo(TQApplication::globalStrut());
@@ -93,24 +93,24 @@ void KisColorCup::drawButtonLabel( TQPainter *painter )
TQRect r = tqstyle().subRect( TQStyle::SR_PushButtonContents, this );
r.rect(&x, &y, &w, &h);

int margin = 2; //tqstyle().tqpixelMetric( TQStyle::PM_ButtonMargin, this );
int margin = 2; //tqstyle().pixelMetric( TQStyle::PM_ButtonMargin, this );
x += margin;
y += margin;
w -= 2*margin;
h -= 2*margin;

if (isOn() || isDown()) {
x += tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftHorizontal, this );
y += tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftVertical, this );
x += tqstyle().pixelMetric( TQStyle::PM_ButtonShiftHorizontal, this );
y += tqstyle().pixelMetric( TQStyle::PM_ButtonShiftVertical, this );
}

qDrawShadePanel( painter, x, y, w, h, tqcolorGroup(), true, 1, NULL);
qDrawShadePanel( painter, x, y, w, h, colorGroup(), true, 1, NULL);
if ( m_color.isValid() )
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, tqcolorGroup() );
tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, painter, focusRect, colorGroup() );
}

}

+ 1
- 1
chalk/ui/kis_color_cup.h View File

@@ -72,7 +72,7 @@ signals:

public:

TQSize tqsizeHint() const;
TQSize sizeHint() const;

public slots:


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

@@ -102,7 +102,7 @@ KisDlgAdjLayerProps::KisDlgAdjLayerProps(KisAdjustmentLayerSP layer,

m_layerName = new KLineEdit(page, "m_layerName");
m_layerName->setText(layerName);
m_layerName->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed);
m_layerName->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed);
hl->addWidget(m_layerName, 0, 1);
connect( m_layerName, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotNameChanged( const TQString & ) ) );


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

@@ -105,7 +105,7 @@ KisDlgAdjustmentLayer::KisDlgAdjustmentLayer(KisImage * img,
m_configWidgetHolder->tqlayout()->add(m_labelNoConfigWidget);
m_labelNoConfigWidget->hide();

resize( TQSize(600, 480).expandedTo(tqminimumSizeHint()) );
resize( TQSize(600, 480).expandedTo(minimumSizeHint()) );

m_currentConfigWidget = 0;


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

@@ -42,7 +42,7 @@ KisDlgApplyProfile::KisDlgApplyProfile(TQWidget *parent, const char *name)
m_page = new WdgApplyProfile(this);

setMainWidget(m_page);
resize(m_page->tqsizeHint());
resize(m_page->sizeHint());

// XXX: This is BAD! (bsar)
fillCmbProfiles(KisID("RGBA", ""));

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

@@ -58,7 +58,7 @@ KisDlgImageProperties::KisDlgImageProperties(KisImageSP image, TQWidget *parent,
m_image = image;

setMainWidget(m_page);
resize(m_page->tqsizeHint());
resize(m_page->sizeHint());

m_page->txtName->setText(image->name());
m_page->m_createButton->hide();

+ 4
- 4
chalk/ui/kis_dlg_preferences.cc View File

@@ -77,7 +77,7 @@ GeneralTab::GeneralTab( TQWidget *_parent, const char *_name )

KisConfig cfg;

m_cmbtqCursorShape->setCurrentItem(cfg.cursorStyle());
m_cmbCursorShape->setCurrentItem(cfg.cursorStyle());
grpDockability->setButton(cfg.dockability());
numDockerFontSize->setValue((int)cfg.dockerFontSize());
}
@@ -86,14 +86,14 @@ void GeneralTab::setDefault()
{
KisConfig cfg;

m_cmbtqCursorShape->setCurrentItem( cfg.getDefaultCursorStyle());
m_cmbCursorShape->setCurrentItem( cfg.getDefaultCursorStyle());
grpDockability->setButton(cfg.getDefaultDockability());
numDockerFontSize->setValue((int)(cfg.getDefaultDockerFontSize()));
}

enumCursorStyle GeneralTab::cursorStyle()
{
return (enumCursorStyle)m_cmbtqCursorShape->currentItem();
return (enumCursorStyle)m_cmbCursorShape->currentItem();
}

enumKoDockability GeneralTab::dockability()
@@ -388,7 +388,7 @@ TabletSettingsTab::TabletDeviceSettingsDialog::TabletDeviceSettingsDialog(const
m_page = new WdgTabletDeviceSettings(this);

setMainWidget(m_page);
resize(m_page->tqsizeHint());
resize(m_page->sizeHint());

for (TQ_INT32 axis = 0; axis < settings.numAxes(); axis++) {
TQString axisString;

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

@@ -359,7 +359,7 @@ void KisFilterManager::slotApplyFilter(int i)

widgetLayout->addWidget(m_lastWidget, 0 , 0);

m_lastDialog->container()->setMinimumSize(m_lastWidget->tqminimumSize());
m_lastDialog->container()->setMinimumSize(m_lastWidget->minimumSize());

refreshPreview();


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

@@ -154,7 +154,7 @@ void KisFiltersListView::init()
setCaption(i18n("Filters List"));
setItemsMovable(false);
setSelectionMode(TQIconView::Single);
tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding ));
setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding ));
setMinimumWidth(160);

}

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

@@ -57,7 +57,7 @@ void KisGradientSliderWidget::paintEvent ( TQPaintEvent* pe )
{
TQWidget::paintEvent( pe );
TQPixmap pixmap( width(), height() );
pixmap.fill( tqcolorGroup().background() );
pixmap.fill( colorGroup().background() );
TQPainter painter( &pixmap );
painter.setPen( TQt::black );
painter.drawRect( MARGIN, MARGIN, width() - 2 * MARGIN, height()- 2 * MARGIN - HANDLE_SIZE );
@@ -77,7 +77,7 @@ void KisGradientSliderWidget::paintEvent ( TQPaintEvent* pe )
height()- HANDLE_SIZE - MARGIN,
tqRound( ( m_selectedSegment->endOffset() - m_selectedSegment->startOffset() )*(double)(width()-12) ),
HANDLE_SIZE );
painter.fillRect( selection, TQBrush( tqcolorGroup().highlight() ) );
painter.fillRect( selection, TQBrush( colorGroup().highlight() ) );
}

TQPointArray triangle(3);

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

@@ -81,7 +81,7 @@ void KisIntSpinbox::init(int val)
l->insertStretch(0, 1);
d->m_numinput = new KIntSpinBox(0, 100, 1, val, 10, this, "KisIntSpinbox::KIntSpinBox");

d->m_numinput->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed);
d->m_numinput->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed);
d->m_numinput->setSuffix("%");
l->addWidget( d->m_numinput );


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

@@ -68,7 +68,7 @@ KisLayerBox::KisLayerBox(KisCanvasSubject *subject, TQWidget *parent, const char
vbox->setAutoAdd(true);

m_lst = new WdgLayerBox(this);
setMinimumSize(m_lst->tqminimumSizeHint());
setMinimumSize(m_lst->minimumSizeHint());

TQToolTip::add(m_lst->bnAdd, i18n("Create new layer"));


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

@@ -104,7 +104,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>41</height>
@@ -121,7 +121,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>21</width>
<height>20</height>

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

@@ -317,7 +317,7 @@ void KisOpenGLCanvasPainter::setWorldXForm(bool /*enable*/)
{
}

const TQWMatrix& KisOpenGLCanvasPainter::tqworldMatrix() const
const TQWMatrix& KisOpenGLCanvasPainter::worldMatrix() const
{
return m_defaultWorldMatrix;
}
@@ -809,11 +809,11 @@ void KisOpenGLCanvasPainter::drawText(const TQRect& /*r*/, int /*flags*/, const
{
}

void KisOpenGLCanvasPainter::tqdrawTextItem(int /*x*/, int /*y*/, const TQTextItem& /*ti*/, int /*textflags*/)
void KisOpenGLCanvasPainter::drawTextItem(int /*x*/, int /*y*/, const TQTextItem& /*ti*/, int /*textflags*/)
{
}

void KisOpenGLCanvasPainter::tqdrawTextItem(const TQPoint& /*p*/, const TQTextItem& /*ti*/, int /*textflags*/)
void KisOpenGLCanvasPainter::drawTextItem(const TQPoint& /*p*/, const TQTextItem& /*ti*/, int /*textflags*/)
{
}


+ 3
- 3
chalk/ui/kis_opengl_canvas_painter.h View File

@@ -85,7 +85,7 @@ public:
virtual void setViewport(int x, int y, int w, int h);

virtual void setWorldXForm(bool);
virtual const TQWMatrix&tqworldMatrix() const;
virtual const TQWMatrix&worldMatrix() const;
virtual void setWorldMatrix(const TQWMatrix&, bool combine=FALSE);

virtual void saveWorldMatrix();
@@ -175,8 +175,8 @@ public:
virtual void drawText(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0);
virtual void drawText(const TQRect&, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0);

virtual void tqdrawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0);
virtual void tqdrawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0);
virtual void drawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0);
virtual void drawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0);

virtual TQRect boundingRect(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQTextParag **intern=0);
virtual TQRect boundingRect(const TQRect&, int flags, const TQString&, int len = -1, TQTextParag **intern=0);

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

@@ -78,7 +78,7 @@ KisPaletteView::KisPaletteView(TQWidget *parent, const char* name, int minWidth,
minSize += TQSize(cellSize);

setMinimumSize(minSize);
tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored));
setSizePolicy(TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored));
}

KisPaletteView::~KisPaletteView()

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

@@ -76,7 +76,7 @@ KisPaletteWidget::KisPaletteWidget( TQWidget *parent, int minWidth, int cols)
m_view = new KisPaletteView(this, 0, minWidth, cols);
tqlayout->addWidget( m_view );

//setFixedSize(tqsizeHint());
//setFixedSize(sizeHint());

connect(combo, TQT_SIGNAL(activated(const TQString &)),
this, TQT_SLOT(slotSetPalette(const TQString &)));

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

@@ -20,7 +20,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -56,13 +56,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>200</width>
<height>150</height>
</size>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>1000</width>
<height>1000</height>

+ 9
- 9
chalk/ui/kis_qpaintdevice_canvas_painter.cc View File

@@ -224,9 +224,9 @@ void KisTQPaintDeviceCanvasPainter::setWorldXForm(bool enable)
m_painter.setWorldXForm(enable);
}

const TQWMatrix& KisTQPaintDeviceCanvasPainter::tqworldMatrix() const
const TQWMatrix& KisTQPaintDeviceCanvasPainter::worldMatrix() const
{
return m_painter.tqworldMatrix();
return m_painter.worldMatrix();
}

void KisTQPaintDeviceCanvasPainter::setWorldMatrix(const TQWMatrix& matrix, bool combine)
@@ -481,17 +481,17 @@ void KisTQPaintDeviceCanvasPainter::drawLineSegments(const TQPointArray& pointAr

void KisTQPaintDeviceCanvasPainter::drawPolyline(const TQPointArray& pointArray, int index, int npoints)
{
m_painter.tqdrawPolyline(pointArray, index, npoints);
m_painter.drawPolyline(pointArray, index, npoints);
}

void KisTQPaintDeviceCanvasPainter::drawPolygon(const TQPointArray& pointArray, bool winding, int index, int npoints)
{
m_painter.tqdrawPolygon(pointArray, winding, index, npoints);
m_painter.drawPolygon(pointArray, winding, index, npoints);
}

void KisTQPaintDeviceCanvasPainter::drawConvexPolygon(const TQPointArray& pointArray, int index, int npoints)
{
m_painter.tqdrawConvexPolygon(pointArray, index, npoints);
m_painter.drawConvexPolygon(pointArray, index, npoints);
}

void KisTQPaintDeviceCanvasPainter::drawCubicBezier(const TQPointArray& pointArray, int index)
@@ -614,14 +614,14 @@ void KisTQPaintDeviceCanvasPainter::drawText(const TQRect& r, int flags, const T
#endif // USE_QT4
}

void KisTQPaintDeviceCanvasPainter::tqdrawTextItem(int x, int y, const TQTextItem& ti, int textflags)
void KisTQPaintDeviceCanvasPainter::drawTextItem(int x, int y, const TQTextItem& ti, int textflags)
{
m_painter.tqdrawTextItem(x, y, ti, textflags);
m_painter.drawTextItem(x, y, ti, textflags);
}

void KisTQPaintDeviceCanvasPainter::tqdrawTextItem(const TQPoint& p, const TQTextItem& ti, int textflags)
void KisTQPaintDeviceCanvasPainter::drawTextItem(const TQPoint& p, const TQTextItem& ti, int textflags)
{
m_painter.tqdrawTextItem(p, ti, textflags);
m_painter.drawTextItem(p, ti, textflags);
}

TQRect KisTQPaintDeviceCanvasPainter::boundingRect(int x, int y, int w, int h, int flags, const TQString& text, int len, TQTextParag **intern)

+ 3
- 3
chalk/ui/kis_qpaintdevice_canvas_painter.h View File

@@ -80,7 +80,7 @@ public:
virtual void setViewport(int x, int y, int w, int h);

virtual void setWorldXForm(bool);
virtual const TQWMatrix&tqworldMatrix() const;
virtual const TQWMatrix&worldMatrix() const;
virtual void setWorldMatrix(const TQWMatrix&, bool combine=FALSE);

virtual void saveWorldMatrix();
@@ -170,8 +170,8 @@ public:
virtual void drawText(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0);
virtual void drawText(const TQRect&, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0);

virtual void tqdrawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0);
virtual void tqdrawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0);
virtual void drawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0);
virtual void drawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0);

virtual TQRect boundingRect(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQTextParag **intern=0);
virtual TQRect boundingRect(const TQRect&, int flags, const TQString&, int len = -1, TQTextParag **intern=0);

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

@@ -184,8 +184,8 @@ void KisRuler::drawRuler()
return;

p.begin(m_pixmapBuffer);
p.setPen(tqcolorGroup().text());
p.setBackgroundColor(tqcolorGroup().base());
p.setPen(colorGroup().text());
p.setBackgroundColor(colorGroup().base());
p.eraseRect(0, 0, m_pixmapBuffer->width(), m_pixmapBuffer->height());

switch (m_unit) {

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

@@ -58,7 +58,7 @@ TQWidget* KisTool::createOptionWidget(TQWidget* parent)
d->optionWidget = new TQLabel(i18n("No options for %1.").tqarg(d->uiname), parent);
d->optionWidget->setCaption(d->uiname);
d->optionWidget->tqsetAlignment(TQt::AlignCenter);
d->optionWidget->setAlignment(TQt::AlignCenter);
return d->optionWidget;
}


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

@@ -98,7 +98,7 @@ TQWidget* KisToolDummy::createOptionWidget(TQWidget* parent)
{
m_optionWidget = new TQLabel(i18n("Layer is locked or invisible."), parent);
m_optionWidget->setCaption(i18n("No Active Tool"));
m_optionWidget->tqsetAlignment(TQt::AlignCenter);
m_optionWidget->setAlignment(TQt::AlignCenter);
return m_optionWidget;
}


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

@@ -37,8 +37,8 @@ KisToolRegistry *KisToolRegistry::m_singleton = 0;
KisToolRegistry::KisToolRegistry()
{
// Load all modules: color models, paintops, filters
KTrader::OfferList offers = KTrader::self()->query(TQString::tqfromLatin1("Chalk/Tool"),
TQString::tqfromLatin1("(Type == 'Service') and "
KTrader::OfferList offers = KTrader::self()->query(TQString::fromLatin1("Chalk/Tool"),
TQString::fromLatin1("(Type == 'Service') and "
"([X-Chalk-Version] == 2)"));

KTrader::OfferList::ConstIterator iter;

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

@@ -313,8 +313,8 @@ KisView::KisView(KisDoc *doc, KisUndoAdapter *adapter, TQWidget *parent, const c
m_brushesAndStuffToolBar = new KisControlFrame(mainWindow(), this);

// Load all plugins
KTrader::OfferList offers = KTrader::self()->query(TQString::tqfromLatin1("Chalk/ViewPlugin"),
TQString::tqfromLatin1("(Type == 'Service') and "
KTrader::OfferList offers = KTrader::self()->query(TQString::fromLatin1("Chalk/ViewPlugin"),
TQString::fromLatin1("(Type == 'Service') and "
"([X-Chalk-Version] == 2)"));
KTrader::OfferList::ConstIterator iter;
for(iter = offers.begin(); iter != offers.end(); ++iter)
@@ -694,7 +694,7 @@ void KisView::resizeEvent(TQResizeEvent *)
}

KisImageSP img = currentImg();
TQ_INT32 scrollBarExtent = tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent);
TQ_INT32 scrollBarExtent = tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent);
TQ_INT32 drawH;
TQ_INT32 drawW;
TQ_INT32 docW;
@@ -962,7 +962,7 @@ void KisView::updateTQPaintDeviceCanvas(const TQRect& imageRect)

for (unsigned int i = 0; i < rects.count(); i++) {
TQRect er = rects[i];
gc.fillRect(er, tqcolorGroup().mid());
gc.fillRect(er, colorGroup().mid());
}
wr &= TQRect(0, 0, img->width(), img->height());
}
@@ -1014,7 +1014,7 @@ void KisView::updateTQPaintDeviceCanvas(const TQRect& imageRect)
}
// paintGuides();
} else {
gc.fillRect(vr, tqcolorGroup().mid());
gc.fillRect(vr, colorGroup().mid());
}
}
}
@@ -1066,7 +1066,7 @@ void KisView::paintOpenGLView(const TQRect& canvasRect)

glDrawBuffer(GL_BACK);

TQColor widgetBackgroundColor = tqcolorGroup().mid();
TQColor widgetBackgroundColor = colorGroup().mid();

glClearColor(widgetBackgroundColor.red() / 255.0, widgetBackgroundColor.green() / 255.0, widgetBackgroundColor.blue() / 255.0, 1.0);
glClear(GL_COLOR_BUFFER_BIT);

+ 2
- 2
chalk/ui/kobirdeyepanel.cpp View File

@@ -238,7 +238,7 @@ void KoBirdEyePanel::slotUpdate(const TQRect & r)

TQPainter painter(&m_thumbnail);