summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chalk/doc/chalk.xmi118
-rw-r--r--chalk/doc/colorspaces.xmi12
-rw-r--r--chalk/doc/controller.xmi24
-rw-r--r--chalk/doc/histograms.xmi6
-rw-r--r--chalk/ui/kis_view.cpp2
-rw-r--r--filters/karbon/ai/aielement.cpp6
-rw-r--r--filters/karbon/xfig/xfigimport_factory.h2
-rw-r--r--filters/kword/libexport/ProcessDocument.cpp8
-rw-r--r--filters/kword/libexport/TagProcessing.cpp2
-rw-r--r--kdgantt/KDGanttViewSubwidgets.cpp2
-rw-r--r--kexi/core/kexidialogbase.cpp2
-rw-r--r--kexi/core/kexiviewbase.cpp2
-rw-r--r--kexi/examples/Simple_Database.kexi.sql6
-rw-r--r--kexi/formeditor/commands.cpp8
-rw-r--r--kexi/formeditor/container.cpp18
-rw-r--r--kexi/formeditor/factories/containerfactory.cpp72
-rw-r--r--kexi/formeditor/factories/stdwidgetfactory.cpp72
-rw-r--r--kexi/formeditor/form.cpp4
-rw-r--r--kexi/formeditor/form.h2
-rw-r--r--kexi/formeditor/formIO.cpp12
-rw-r--r--kexi/formeditor/formmanager.cpp12
-rw-r--r--kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp2
-rw-r--r--kexi/formeditor/test/kfd_part.cpp2
-rw-r--r--kexi/formeditor/utils.cpp4
-rw-r--r--kexi/formeditor/utils.h2
-rw-r--r--kexi/formeditor/widgetfactory.cpp2
-rw-r--r--kexi/formeditor/widgetpropertyset.cpp2
-rw-r--r--kexi/kexidb/field.h2
-rw-r--r--kexi/main/keximainwindowimpl.cpp4
-rw-r--r--kexi/main/startup/KexiStartupFileDialog.cpp4
-rw-r--r--kexi/main/startup/KexiStartupFileDialog_win.cpp4
-rw-r--r--kexi/plugins/forms/kexidataprovider.cpp2
-rw-r--r--kexi/plugins/forms/kexidbfactory.cpp32
-rw-r--r--kexi/plugins/forms/kexiformpart.cpp6
-rw-r--r--kexi/plugins/forms/widgets/kexidbcombobox.cpp2
-rw-r--r--kexi/plugins/forms/widgets/kexidbform.cpp6
-rw-r--r--kexi/plugins/macros/lib/metamethod.cpp2
-rw-r--r--kexi/plugins/reports/kexireportform.cpp2
-rw-r--r--kexi/plugins/scripting/kexidb/kexidbfield.h2
-rw-r--r--kexi/widget/kexiscrollview.cpp2
-rw-r--r--kexi/widget/kexisectionheader.cpp2
-rw-r--r--kexi/widget/tableview/kexitableview.cpp2
-rw-r--r--kexi/widget/utils/kexigradientwidget.cpp8
-rw-r--r--kexi/widget/utils/kexirecordnavigator.cpp2
-rw-r--r--kivio/kiviopart/kivioarrowheadaction.cpp4
-rw-r--r--kivio/kiviopart/kiviostencilsetaction.cpp4
-rw-r--r--kivio/plugins/kivioconnectortool/plugin.h2
-rw-r--r--kivio/plugins/kivioselecttool/plugin.h2
-rw-r--r--kivio/plugins/kiviosmlconnector/plugin.h2
-rw-r--r--kivio/plugins/kiviotargettool/kiviotargettoolfactory.h2
-rw-r--r--kivio/plugins/kiviotexttool/plugin.h2
-rw-r--r--kivio/plugins/kiviozoomtool/plugin.h2
-rw-r--r--kspread/kspread_view.cpp4
-rw-r--r--kspread/plugins/calculator/main.h2
-rwxr-xr-xkspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py6
-rw-r--r--lib/kformula/symbolaction.cpp2
-rw-r--r--lib/kofficecore/KoDocument.cpp2
-rw-r--r--lib/kofficecore/KoSpeaker.cpp28
-rw-r--r--lib/kofficeui/KoSelectAction.cpp4
-rw-r--r--lib/kofficeui/KoTemplateChooseDia.cpp2
-rw-r--r--lib/kofficeui/KoTooluButton.cpp4
-rw-r--r--lib/kofficeui/kcoloractions.cpp2
-rw-r--r--lib/kofficeui/tkcoloractions.cpp2
-rw-r--r--lib/koproperty/editors/spinbox.cpp8
-rw-r--r--lib/kotext/KoTextView.cpp6
-rw-r--r--lib/kross/api/qtobject.cpp2
-rw-r--r--tools/kthesaurus/main.cpp2
-rw-r--r--tools/spell/main.cpp2
-rw-r--r--tools/thesaurus/main.cpp2
69 files changed, 295 insertions, 295 deletions
diff --git a/chalk/doc/chalk.xmi b/chalk/doc/chalk.xmi
index 66fc04cf..17678b05 100644
--- a/chalk/doc/chalk.xmi
+++ b/chalk/doc/chalk.xmi
@@ -55,8 +55,8 @@
<UML:Parameter visibility="private" xmi.id="39" value="" type="KisUndoAdapter *" name="adapter" />
</UML:Operation>
<UML:Operation visibility="public" xmi.id="40" type="virtual void" name="intr" />
- <UML:Operation visibility="public" xmi.id="41" type=TQSTRING_OBJECT_NAME_STRING name="readFilters" ownerScope="classifier" />
- <UML:Operation visibility="public" xmi.id="42" type=TQSTRING_OBJECT_NAME_STRING name="writeFilters" ownerScope="classifier" />
+ <UML:Operation visibility="public" xmi.id="41" type="TQString" name="readFilters" ownerScope="classifier" />
+ <UML:Operation visibility="public" xmi.id="42" type="TQString" name="writeFilters" ownerScope="classifier" />
<UML:Operation visibility="public" xmi.id="43" type="virtual " name="~KisImageMagickConverter" />
<UML:Attribute visibility="private" xmi.id="13" value="" type="KisUndoAdapter *" name="m_adapter" />
<UML:Attribute visibility="private" xmi.id="14" value="" type="QValueVector" name="m_data" />
@@ -170,7 +170,7 @@ This replaces the KisKrayon facility that used to be present in Krayon." visibil
<UML:Operation visibility="public" xmi.id="134" type="virtual " name="~KisStrategyColorSpaceCMYK" />
<UML:Attribute visibility="private" xmi.id="82" value="" type="QUANTUM *" name="m_buf" />
<UML:Attribute visibility="private" xmi.id="83" value="" type="KPixmapIO" name="m_pixio" />
- <UML:Attribute visibility="private" xmi.id="84" value="" type=TQPIXMAP_OBJECT_NAME_STRING name="m_pixmap" />
+ <UML:Attribute visibility="private" xmi.id="84" value="" type="TQPixmap" name="m_pixmap" />
<UML:Attribute visibility="private" xmi.id="85" value="" type="ColorLUT" name="m_rgbLUT" />
</UML:Class>
<UML:Class stereotype="class" visibility="public" xmi.id="135" name="RGB" >
@@ -322,7 +322,7 @@ This replaces the KisKrayon facility that used to be present in Krayon." visibil
<UML:Operation visibility="public" xmi.id="258" type="virtual " name="~KisStrategyColorSpaceRGB" />
<UML:Attribute visibility="private" xmi.id="207" value="" type="QUANTUM *" name="m_buf" />
<UML:Attribute visibility="private" xmi.id="208" value="" type="KPixmapIO" name="m_pixio" />
- <UML:Attribute visibility="private" xmi.id="209" value="" type=TQPIXMAP_OBJECT_NAME_STRING name="m_pixmap" />
+ <UML:Attribute visibility="private" xmi.id="209" value="" type="TQPixmap" name="m_pixmap" />
</UML:Class>
<UML:Class stereotype="class" comment="This class implements the conversion of the Chalk images that contain cmy + transparency
data to rbg for screen rendering." visibility="public" xmi.id="259" name="CMYK" >
@@ -400,10 +400,10 @@ data to rbg for screen rendering." visibility="public" xmi.id="259" name="CMYK"
<UML:Operation visibility="public" xmi.id="324" type="virtual " name="~KisStrategyMove" />
<UML:Attribute visibility="private" xmi.id="293" value="" type="KisCanvasControllerInterface *" name="m_controller" />
<UML:Attribute visibility="private" xmi.id="294" value="" type="KoDocument *" name="m_doc" />
- <UML:Attribute visibility="private" xmi.id="295" value="" type=TQPOINT_OBJECT_NAME_STRING name="m_dragStart" />
+ <UML:Attribute visibility="private" xmi.id="295" value="" type="TQPoint" name="m_dragStart" />
<UML:Attribute visibility="private" xmi.id="296" value="" type="bool" name="m_dragging" />
- <UML:Attribute visibility="private" xmi.id="297" value="" type=TQPOINT_OBJECT_NAME_STRING name="m_layerPosition" />
- <UML:Attribute visibility="private" xmi.id="298" value="" type=TQPOINT_OBJECT_NAME_STRING name="m_layerStart" />
+ <UML:Attribute visibility="private" xmi.id="297" value="" type="TQPoint" name="m_layerPosition" />
+ <UML:Attribute visibility="private" xmi.id="298" value="" type="TQPoint" name="m_layerStart" />
<UML:Attribute visibility="private" xmi.id="299" value="" type="KisCanvasSubject *" name="m_subject" />
</UML:Class>
<UML:Class stereotype="class" comment="KisTileMgr manages the imagedata that for implementations of KisRenderInterface.
@@ -922,7 +922,7 @@ dcop." visibility="public" xmi.id="645" name="KRayonViewIface" >
<UML:Operation visibility="protected" xmi.id="700" type="void" name="createMasks" >
<UML:Parameter visibility="private" xmi.id="701" value="" type="const QImage &amp;" name="img" />
</UML:Operation>
- <UML:Operation visibility="public" xmi.id="702" type=TQPOINT_OBJECT_NAME_STRING name="hotSpot" />
+ <UML:Operation visibility="public" xmi.id="702" type="TQPoint" name="hotSpot" />
<UML:Operation visibility="public" xmi.id="703" type="virtual QImage" name="img" />
<UML:Operation visibility="public" xmi.id="704" type="virtual bool" name="loadAsync" />
<UML:Operation comment="@return a mask computed from the grey-level values of the
@@ -931,7 +931,7 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas
</UML:Operation>
<UML:Operation visibility="public" xmi.id="707" type="virtual bool" name="saveAsync" />
<UML:Operation visibility="public" xmi.id="708" type="void" name="setHotSpot" >
- <UML:Parameter visibility="private" xmi.id="709" value="" type=TQPOINT_OBJECT_NAME_STRING />
+ <UML:Parameter visibility="private" xmi.id="709" value="" type="TQPoint" />
</UML:Operation>
<UML:Operation visibility="public" xmi.id="710" type="virtual " name="~KisBrush" />
<UML:Attribute visibility="private" xmi.id="682" value="" type="enumBrushType" name="m_brushType" />
@@ -939,7 +939,7 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas
<UML:Attribute visibility="private" xmi.id="684" value="" type="QValueVector" name="m_data" />
<UML:Attribute visibility="private" xmi.id="685" value="" type="TQ_UINT32" name="m_header_size" />
<UML:Attribute visibility="private" xmi.id="686" value="" type="TQ_UINT32" name="m_height" />
- <UML:Attribute visibility="private" xmi.id="687" value="" type=TQPOINT_OBJECT_NAME_STRING name="m_hotSpot" />
+ <UML:Attribute visibility="private" xmi.id="687" value="" type="TQPoint" name="m_hotSpot" />
<UML:Attribute visibility="private" xmi.id="688" value="" type="QImage" name="m_img" />
<UML:Attribute visibility="private" xmi.id="689" value="" type="TQ_UINT32" name="m_magic_number" />
<UML:Attribute visibility="private" xmi.id="690" value="" type="QPtrList" name="m_masks" />
@@ -978,7 +978,7 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas
<UML:Operation visibility="public" xmi.id="737" type="virtual QString" name="name" />
<UML:Operation visibility="public" xmi.id="738" type="virtual void" isAbstract="true" name="unexecute" />
<UML:Operation visibility="public" xmi.id="739" type="virtual " name="~KisCommand" />
- <UML:Attribute visibility="private" xmi.id="728" value="" type=TQSTRING_OBJECT_NAME_STRING name="m_name" />
+ <UML:Attribute visibility="private" xmi.id="728" value="" type="TQString" name="m_name" />
<UML:Attribute visibility="private" xmi.id="729" value="" type="KisUndoAdapter *" name="m_undoAdapter" />
</UML:Class>
<UML:Class stereotype="class" visibility="public" xmi.id="740" name="KisGuide" >
@@ -988,7 +988,7 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas
<UML:Operation visibility="public" xmi.id="747" type="bool" name="isSelected" />
<UML:Operation visibility="public" xmi.id="748" type="double" name="position" />
<UML:Operation visibility="public" xmi.id="749" type="virtual " name="~KisGuide" />
- <UML:Attribute visibility="public" xmi.id="741" value="" type=TQPIXMAP_OBJECT_NAME_STRING name="buffer" />
+ <UML:Attribute visibility="public" xmi.id="741" value="" type="TQPixmap" name="buffer" />
<UML:Attribute visibility="public" xmi.id="742" value="" type="bool" name="hasBuffer" />
<UML:Attribute visibility="public" xmi.id="743" value="" type="double" name="pos" />
<UML:Attribute visibility="public" xmi.id="744" value="" type="bool" name="selected" />
@@ -1116,15 +1116,15 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas
</UML:Operation>
<UML:Operation visibility="public" xmi.id="854" type="void" name="unselectAll" />
<UML:Operation visibility="public" xmi.id="855" type="" name="~KisGuideMgr" />
- <UML:Attribute visibility="private" xmi.id="791" value="" type=TQPIXMAP_OBJECT_NAME_STRING name="m_hGuideLines" />
- <UML:Attribute visibility="private" xmi.id="792" value="" type=TQPIXMAP_OBJECT_NAME_STRING name="m_hGuideLinesSelected" />
+ <UML:Attribute visibility="private" xmi.id="791" value="" type="TQPixmap" name="m_hGuideLines" />
+ <UML:Attribute visibility="private" xmi.id="792" value="" type="TQPixmap" name="m_hGuideLinesSelected" />
<UML:Attribute visibility="private" xmi.id="793" value="" type="vKisGuideSP" name="m_lines" />
- <UML:Attribute visibility="private" xmi.id="794" value="" type=TQPIXMAP_OBJECT_NAME_STRING name="m_pattern" />
- <UML:Attribute visibility="private" xmi.id="795" value="" type=TQPIXMAP_OBJECT_NAME_STRING name="m_patternSelected" />
+ <UML:Attribute visibility="private" xmi.id="794" value="" type="TQPixmap" name="m_pattern" />
+ <UML:Attribute visibility="private" xmi.id="795" value="" type="TQPixmap" name="m_patternSelected" />
<UML:Attribute visibility="private" xmi.id="796" value="" type="QSize" name="m_size" />
<UML:Attribute visibility="private" xmi.id="797" value="" type="vKisGuideSP" name="m_slines" />
- <UML:Attribute visibility="private" xmi.id="798" value="" type=TQPIXMAP_OBJECT_NAME_STRING name="m_vGuideLines" />
- <UML:Attribute visibility="private" xmi.id="799" value="" type=TQPIXMAP_OBJECT_NAME_STRING name="m_vGuideLinesSelected" />
+ <UML:Attribute visibility="private" xmi.id="798" value="" type="TQPixmap" name="m_vGuideLines" />
+ <UML:Attribute visibility="private" xmi.id="799" value="" type="TQPixmap" name="m_vGuideLinesSelected" />
<UML:Attribute visibility="private" xmi.id="800" value="" type="const char * []" name="s_xbm" />
<UML:Attribute visibility="private" xmi.id="801" value="" type="const char * []" name="s_xbm_selected" />
</UML:Class>
@@ -1227,7 +1227,7 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas
<UML:Operation visibility="public" xmi.id="943" type="KisImageSP" name="imageNum" >
<UML:Parameter visibility="private" xmi.id="944" value="" type="TQ_UINT32" name="num" />
</UML:Operation>
- <UML:Operation visibility="public" xmi.id="945" type=TQSTRINGLIST_OBJECT_NAME_STRING name="images" />
+ <UML:Operation visibility="public" xmi.id="945" type="TQStringList" name="images" />
<UML:Operation visibility="public" xmi.id="946" type="bool" name="importImage" >
<UML:Parameter visibility="private" xmi.id="947" value="" type="const QString &amp;" name="filename" />
</UML:Operation>
@@ -1247,7 +1247,7 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas
<UML:Parameter visibility="private" xmi.id="960" value="" type="const QString &amp;" name="name" />
<UML:Parameter visibility="private" xmi.id="961" value="" type="CompositeOp" name="compositeOp" />
<UML:Parameter visibility="private" xmi.id="962" value="" type="QUANTUM" name="opacity" />
- <UML:Parameter visibility="private" xmi.id="963" value="" type=TQPOINT_OBJECT_NAME_STRING name="pos" />
+ <UML:Parameter visibility="private" xmi.id="963" value="" type="TQPoint" name="pos" />
<UML:Parameter visibility="private" xmi.id="964" value="" type="enumImgType" name="type" />
</UML:Operation>
<UML:Operation visibility="public" xmi.id="965" type="KisLayerSP" name="layerAdd" >
@@ -1311,7 +1311,7 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas
<UML:Parameter visibility="private" xmi.id="1010" value="" type="TQ_INT32" name="height" />
<UML:Parameter visibility="private" xmi.id="1011" value="" type="enumImgType" name="type" />
</UML:Operation>
- <UML:Operation visibility="public" xmi.id="1012" type=TQSTRING_OBJECT_NAME_STRING name="nextImageName" />
+ <UML:Operation visibility="public" xmi.id="1012" type="TQString" name="nextImageName" />
<UML:Operation visibility="public" xmi.id="1013" type="TQ_INT32" name="nimages" />
<UML:Operation visibility="public" xmi.id="1014" type="virtual void" name="paintContent" >
<UML:Parameter visibility="private" xmi.id="1015" value="" type="QPainter &amp;" name="painter" />
@@ -1732,10 +1732,10 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas
<UML:Parameter visibility="private" xmi.id="1379" value="" type="KisLayerSP" name="layer" />
</UML:Operation>
<UML:Operation visibility="public" xmi.id="1380" type="KisChannelSP" name="mask" />
- <UML:Operation visibility="public" xmi.id="1381" type=TQSTRING_OBJECT_NAME_STRING name="name" />
+ <UML:Operation visibility="public" xmi.id="1381" type="TQString" name="name" />
<UML:Operation visibility="public" xmi.id="1382" type="enumImgType" name="nativeImgType" />
<UML:Operation visibility="public" xmi.id="1383" type="TQ_INT32" name="nchannels" />
- <UML:Operation visibility="public" xmi.id="1384" type=TQSTRING_OBJECT_NAME_STRING name="nextLayerName" />
+ <UML:Operation visibility="public" xmi.id="1384" type="TQString" name="nextLayerName" />
<UML:Operation visibility="public" xmi.id="1385" type="TQ_INT32" name="nlayers" />
<UML:Operation visibility="public" xmi.id="1386" type="void" name="notify" />
<UML:Operation visibility="public" xmi.id="1387" type="void" name="notify" >
@@ -1842,7 +1842,7 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas
<UML:Attribute visibility="private" xmi.id="1274" value="" type="KoColor" name="m_maskClr" />
<UML:Attribute visibility="private" xmi.id="1275" value="" type="bool" name="m_maskEnabled" />
<UML:Attribute visibility="private" xmi.id="1276" value="" type="bool" name="m_maskInverted" />
- <UML:Attribute visibility="private" xmi.id="1277" value="" type=TQSTRING_OBJECT_NAME_STRING name="m_name" />
+ <UML:Attribute visibility="private" xmi.id="1277" value="" type="TQString" name="m_name" />
<UML:Attribute visibility="private" xmi.id="1278" value="" type="KisNameServer *" name="m_nserver" />
<UML:Attribute visibility="private" xmi.id="1279" value="" type="TQ_INT32" name="m_ntileCols" />
<UML:Attribute visibility="private" xmi.id="1280" value="" type="TQ_INT32" name="m_ntileRows" />
@@ -1959,7 +1959,7 @@ cannot be abstract, because otherwise this class would be abstract." visibility=
<UML:Operation visibility="public" xmi.id="1551" type="virtual void" name="move" >
<UML:Parameter visibility="private" xmi.id="1552" value="" type="const QPoint &amp;" name="pt" />
</UML:Operation>
- <UML:Operation visibility="public" xmi.id="1553" type=TQSTRING_OBJECT_NAME_STRING name="name" />
+ <UML:Operation visibility="public" xmi.id="1553" type="TQString" name="name" />
<UML:Operation visibility="public" xmi.id="1554" type="void" name="offsetBy" >
<UML:Parameter visibility="private" xmi.id="1555" value="" type="TQ_INT32" name="x" />
<UML:Parameter visibility="private" xmi.id="1556" value="" type="TQ_INT32" name="y" />
@@ -2047,13 +2047,13 @@ cannot be abstract, because otherwise this class would be abstract." visibility=
<UML:Attribute visibility="private" xmi.id="1454" value="" type="bool" name="m_alpha" />
<UML:Attribute visibility="private" xmi.id="1456" value="" type="TQ_INT32" name="m_depth" />
<UML:Attribute visibility="private" xmi.id="1457" value="" type="TQ_INT32" name="m_height" />
- <UML:Attribute visibility="private" xmi.id="1459" value="" type=TQSTRING_OBJECT_NAME_STRING name="m_name" />
+ <UML:Attribute visibility="private" xmi.id="1459" value="" type="TQString" name="m_name" />
<UML:Attribute visibility="private" xmi.id="1460" value="" type="TQ_INT32" name="m_offH" />
<UML:Attribute visibility="private" xmi.id="1461" value="" type="TQ_INT32" name="m_offW" />
<UML:Attribute visibility="private" xmi.id="1462" value="" type="TQ_INT32" name="m_offX" />
<UML:Attribute visibility="private" xmi.id="1463" value="" type="TQ_INT32" name="m_offY" />
<UML:Attribute visibility="private" xmi.id="1464" value="" type="KisImageSP" name="m_owner" />
- <UML:Attribute visibility="private" xmi.id="1465" value="" type=TQPIXMAP_OBJECT_NAME_STRING name="m_projection" />
+ <UML:Attribute visibility="private" xmi.id="1465" value="" type="TQPixmap" name="m_projection" />
<UML:Attribute visibility="private" xmi.id="1466" value="" type="bool" name="m_projectionValid" />
<UML:Attribute visibility="private" xmi.id="1467" value="" type="TQ_INT32" name="m_quantumSize" />
<UML:Attribute visibility="private" xmi.id="1468" value="" type="KisTileMgrSP" name="m_shadow" />
@@ -2128,11 +2128,11 @@ cannot be abstract, because otherwise this class would be abstract." visibility=
<UML:Parameter visibility="private" xmi.id="1672" value="" type="TQ_INT32" name="seed" />
</UML:Operation>
<UML:Operation visibility="public" xmi.id="1673" type="TQ_INT32" name="currentSeed" />
- <UML:Operation visibility="public" xmi.id="1674" type=TQSTRING_OBJECT_NAME_STRING name="name" />
+ <UML:Operation visibility="public" xmi.id="1674" type="TQString" name="name" />
<UML:Operation visibility="public" xmi.id="1675" type="TQ_INT32" name="number" />
<UML:Operation visibility="public" xmi.id="1676" type="" name="~KisNameServer" />
<UML:Attribute visibility="private" xmi.id="1668" value="" type="TQ_INT32" name="m_generator" />
- <UML:Attribute visibility="private" xmi.id="1669" value="" type=TQSTRING_OBJECT_NAME_STRING name="m_prefix" />
+ <UML:Attribute visibility="private" xmi.id="1669" value="" type="TQString" name="m_prefix" />
</UML:Class>
<UML:Class stereotype="class" visibility="public" xmi.id="1677" name="KisMemento" >
<UML:Operation visibility="public" xmi.id="1678" type="virtual " name="~KisMemento" />
@@ -2225,7 +2225,7 @@ cannot be abstract, because otherwise this class would be abstract." visibility=
<UML:Parameter visibility="private" xmi.id="1751" value="" type="const QString &amp;" name="filename" />
</UML:Operation>
<UML:Operation visibility="public" xmi.id="1752" type="virtual enumBrushType" name="brushType" />
- <UML:Operation visibility="public" xmi.id="1753" type=TQPOINT_OBJECT_NAME_STRING name="hotSpot" />
+ <UML:Operation visibility="public" xmi.id="1753" type="TQPoint" name="hotSpot" />
<UML:Operation comment="@return the next image in the pipe." visibility="public" xmi.id="1754" type="virtual QImage" name="img" />
<UML:Operation visibility="public" xmi.id="1755" type="virtual bool" name="loadAsync" />
<UML:Operation comment="@return the next mask in the pipe." visibility="public" xmi.id="1756" type="virtual KisAlphaMask *" name="mask" >
@@ -2233,7 +2233,7 @@ cannot be abstract, because otherwise this class would be abstract." visibility=
</UML:Operation>
<UML:Operation visibility="public" xmi.id="1758" type="virtual bool" name="saveAsync" />
<UML:Operation visibility="public" xmi.id="1759" type="void" name="setHotSpot" >
- <UML:Parameter visibility="private" xmi.id="1760" value="" type=TQPOINT_OBJECT_NAME_STRING />
+ <UML:Parameter visibility="private" xmi.id="1760" value="" type="TQPoint" />
</UML:Operation>
<UML:Operation visibility="protected" xmi.id="1761" type="void" name="setParasite" >
<UML:Parameter visibility="private" xmi.id="1762" value="" type="const QString &amp;" name="parasite" />
@@ -2242,10 +2242,10 @@ cannot be abstract, because otherwise this class would be abstract." visibility=
<UML:Attribute visibility="private" xmi.id="1743" value="" type="QPtrList" name="m_brushes" />
<UML:Attribute visibility="private" xmi.id="1744" value="" type="TQ_UINT32" name="m_currentBrush" />
<UML:Attribute visibility="private" xmi.id="1745" value="" type="QValueVector" name="m_data" />
- <UML:Attribute visibility="private" xmi.id="1746" value="" type=TQPOINT_OBJECT_NAME_STRING name="m_hotSpot" />
- <UML:Attribute visibility="private" xmi.id="1747" value="" type=TQSTRING_OBJECT_NAME_STRING name="m_name" />
+ <UML:Attribute visibility="private" xmi.id="1746" value="" type="TQPoint" name="m_hotSpot" />
+ <UML:Attribute visibility="private" xmi.id="1747" value="" type="TQString" name="m_name" />
<UML:Attribute visibility="private" xmi.id="1748" value="" type="TQ_UINT32" name="m_numOfBrushes" />
- <UML:Attribute visibility="private" xmi.id="1749" value="" type=TQSTRING_OBJECT_NAME_STRING name="m_parasite" />
+ <UML:Attribute visibility="private" xmi.id="1749" value="" type="TQString" name="m_parasite" />
</UML:Class>
<UML:Class stereotype="class" visibility="public" xmi.id="1767" name="KisPainter" >
<UML:Operation visibility="protected" xmi.id="1784" type="KisPainter &amp;" name="=" >
@@ -2401,7 +2401,7 @@ cannot be abstract, because otherwise this class would be abstract." visibility=
<UML:Attribute visibility="private" xmi.id="1773" value="" type="KisPaintDeviceSP" name="m_device" />
<UML:Attribute visibility="private" xmi.id="1774" value="" type="QRect" name="m_dirtyRect" />
<UML:Attribute visibility="private" xmi.id="1775" value="" type="KoColor" name="m_fillColor" />
- <UML:Attribute visibility="private" xmi.id="1777" value="" type=TQPOINT_OBJECT_NAME_STRING name="m_hotSpot" />
+ <UML:Attribute visibility="private" xmi.id="1777" value="" type="TQPoint" name="m_hotSpot" />
<UML:Attribute visibility="private" xmi.id="1778" value="" type="TQ_INT32" name="m_hotSpotX" />
<UML:Attribute visibility="private" xmi.id="1779" value="" type="TQ_INT32" name="m_hotSpotY" />
<UML:Attribute visibility="private" xmi.id="1780" value="" type="QUANTUM" name="m_opacity" />
@@ -2454,7 +2454,7 @@ cannot be abstract, because otherwise this class would be abstract." visibility=
<UML:Attribute visibility="private" xmi.id="1905" value="" type="QImage" name="m_clipImg" />
<UML:Attribute visibility="private" xmi.id="1906" value="" type="bool" name="m_firstMove" />
<UML:Attribute visibility="private" xmi.id="1907" value="" type="KisImageSP" name="m_img" />
- <UML:Attribute visibility="private" xmi.id="1908" value="" type=TQSTRING_OBJECT_NAME_STRING name="m_name" />
+ <UML:Attribute visibility="private" xmi.id="1908" value="" type="TQString" name="m_name" />
<UML:Attribute visibility="private" xmi.id="1909" value="" type="KisPaintDeviceSP" name="m_parent" />
<UML:Attribute visibility="private" xmi.id="1910" value="" type="QRect" name="m_rc" />
</UML:Class>
@@ -2499,11 +2499,11 @@ cannot be abstract, because otherwise this class would be abstract." visibility=
<UML:Operation visibility="public" xmi.id="1982" type="TQ_INT32" name="pipebrushCount" />
<UML:Operation visibility="public" xmi.id="1983" type="QPtrList" name="pipebrushes" />
<UML:Operation visibility="public" xmi.id="1984" type="virtual " name="~KisResourceServer" />
- <UML:Attribute visibility="private" xmi.id="1965" value="" type=TQSTRINGLIST_OBJECT_NAME_STRING name="m_brushFilenames" />
+ <UML:Attribute visibility="private" xmi.id="1965" value="" type="TQStringList" name="m_brushFilenames" />
<UML:Attribute visibility="private" xmi.id="1966" value="" type="QPtrList" name="m_brushes" />
- <UML:Attribute visibility="private" xmi.id="1967" value="" type=TQSTRINGLIST_OBJECT_NAME_STRING name="m_patternFilenames" />
+ <UML:Attribute visibility="private" xmi.id="1967" value="" type="TQStringList" name="m_patternFilenames" />
<UML:Attribute visibility="private" xmi.id="1968" value="" type="QPtrList" name="m_patterns" />
- <UML:Attribute visibility="private" xmi.id="1969" value="" type=TQSTRINGLIST_OBJECT_NAME_STRING name="m_pipebrushFilenames" />
+ <UML:Attribute visibility="private" xmi.id="1969" value="" type="TQStringList" name="m_pipebrushFilenames" />
<UML:Attribute visibility="private" xmi.id="1970" value="" type="QPtrList" name="m_pipebrushes" />
</UML:Class>
<UML:Class stereotype="class" visibility="public" xmi.id="1985" name="KisPluginServer" >
@@ -2548,7 +2548,7 @@ cannot be abstract, because otherwise this class would be abstract." visibility=
<UML:Operation visibility="public" xmi.id="2021" type="virtual void" name="unexecute" />
<UML:Operation visibility="public" xmi.id="2022" type="virtual " name="~KisTileCommand" />
<UML:Attribute visibility="private" xmi.id="1997" value="" type="KisPaintDeviceSP" name="m_device" />
- <UML:Attribute visibility="private" xmi.id="1998" value="" type=TQSTRING_OBJECT_NAME_STRING name="m_name" />
+ <UML:Attribute visibility="private" xmi.id="1998" value="" type="TQString" name="m_name" />
<UML:Attribute visibility="private" xmi.id="1999" value="" type="TileMap" name="m_originals" />
<UML:Attribute visibility="private" xmi.id="2000" value="" type="QRect" name="m_rc" />
<UML:Attribute visibility="private" xmi.id="2001" value="" type="TileMap" name="m_tiles" />
@@ -2562,22 +2562,22 @@ cannot be abstract, because otherwise this class would be abstract." visibility=
<UML:Parameter visibility="private" xmi.id="2036" value="" type="const QString &amp;" name="category" />
<UML:Parameter visibility="private" xmi.id="2037" value="" type="PluginType" name="type" />
</UML:Operation>
- <UML:Operation visibility="public" xmi.id="2038" type=TQSTRING_OBJECT_NAME_STRING name="category" />
- <UML:Operation visibility="public" xmi.id="2039" type=TQSTRING_OBJECT_NAME_STRING name="comment" />
- <UML:Operation visibility="public" xmi.id="2040" type=TQSTRING_OBJECT_NAME_STRING name="dir" />
+ <UML:Operation visibility="public" xmi.id="2038" type="TQString" name="category" />
+ <UML:Operation visibility="public" xmi.id="2039" type="TQString" name="comment" />
+ <UML:Operation visibility="public" xmi.id="2040" type="TQString" name="dir" />
<UML:Operation visibility="public" xmi.id="2041" type="int" name="id" />
- <UML:Operation visibility="public" xmi.id="2042" type=TQSTRING_OBJECT_NAME_STRING name="library" />
- <UML:Operation visibility="public" xmi.id="2043" type=TQSTRING_OBJECT_NAME_STRING name="name" />
+ <UML:Operation visibility="public" xmi.id="2042" type="TQString" name="library" />
+ <UML:Operation visibility="public" xmi.id="2043" type="TQString" name="name" />
<UML:Operation visibility="public" xmi.id="2044" type="void" name="setId" >
<UML:Parameter visibility="private" xmi.id="2045" value="" type="int" name="id" />
</UML:Operation>
<UML:Operation visibility="public" xmi.id="2046" type="PluginType" name="type" />
- <UML:Attribute visibility="private" xmi.id="2024" value="" type=TQSTRING_OBJECT_NAME_STRING name="m_category" />
- <UML:Attribute visibility="private" xmi.id="2025" value="" type=TQSTRING_OBJECT_NAME_STRING name="m_comment" />
- <UML:Attribute visibility="private" xmi.id="2026" value="" type=TQSTRING_OBJECT_NAME_STRING name="m_dir" />
+ <UML:Attribute visibility="private" xmi.id="2024" value="" type="TQString" name="m_category" />
+ <UML:Attribute visibility="private" xmi.id="2025" value="" type="TQString" name="m_comment" />
+ <UML:Attribute visibility="private" xmi.id="2026" value="" type="TQString" name="m_dir" />
<UML:Attribute visibility="private" xmi.id="2027" value="" type="int" name="m_id" />
- <UML:Attribute visibility="private" xmi.id="2028" value="" type=TQSTRING_OBJECT_NAME_STRING name="m_library" />
- <UML:Attribute visibility="private" xmi.id="2029" value="" type=TQSTRING_OBJECT_NAME_STRING name="m_name" />
+ <UML:Attribute visibility="private" xmi.id="2028" value="" type="TQString" name="m_library" />
+ <UML:Attribute visibility="private" xmi.id="2029" value="" type="TQString" name="m_name" />
<UML:Attribute visibility="private" xmi.id="2030" value="" type="PluginType" name="m_type" />
</UML:Class>
<UML:Class stereotype="class" comment="The KisResource class provides a representation of Chalk image resources. This
@@ -2597,12 +2597,12 @@ in the constructor, you have to call loadAsync.
<UML:Parameter visibility="private" xmi.id="2060" value="" type="const QString &amp;" name="filename" />
</UML:Operation>
<UML:Operation visibility="public" xmi.id="2061" type="bool" name="dirty" />
- <UML:Operation visibility="public" xmi.id="2062" type=TQSTRING_OBJECT_NAME_STRING name="filename" />
+ <UML:Operation visibility="public" xmi.id="2062" type="TQString" name="filename" />
<UML:Operation visibility="public" xmi.id="2063" type="TQ_INT32" name="height" />
<UML:Operation comment="Returns a QImage representing this resource. This image could be null." visibility="public" xmi.id="2064" type="virtual QImage" isAbstract="true" name="img" />
<UML:Operation comment="Load this resource asynchronously. The signal loadComplete is emitted when
the resource has been loaded and valid flag is set to true." visibility="public" xmi.id="2065" type="virtual bool" isAbstract="true" name="loadAsync" />
- <UML:Operation visibility="public" xmi.id="2066" type=TQSTRING_OBJECT_NAME_STRING name="name" />
+ <UML:Operation visibility="public" xmi.id="2066" type="TQString" name="name" />
<UML:Operation comment="Save this resource asynchronously. The signal saveComplete is emitted when
the resource has been saved." visibility="public" xmi.id="2067" type="virtual bool" isAbstract="true" name="saveAsync" />
<UML:Operation visibility="public" xmi.id="2068" type="void" name="setDirty" >
@@ -2634,9 +2634,9 @@ in the constructor, you have to call loadAsync.
@param filename the file name to save and load from." visibility="public" xmi.id="2085" type="virtual " name="~KisResource" />
<UML:Attribute visibility="private" xmi.id="2048" value="" type="bool" name="m_dirty" />
- <UML:Attribute visibility="private" xmi.id="2049" value="" type=TQSTRING_OBJECT_NAME_STRING name="m_filename" />
+ <UML:Attribute visibility="private" xmi.id="2049" value="" type="TQString" name="m_filename" />
<UML:Attribute visibility="private" xmi.id="2050" value="" type="TQ_INT32" name="m_height" />
- <UML:Attribute visibility="private" xmi.id="2051" value="" type=TQSTRING_OBJECT_NAME_STRING name="m_name" />
+ <UML:Attribute visibility="private" xmi.id="2051" value="" type="TQString" name="m_name" />
<UML:Attribute visibility="private" xmi.id="2052" value="" type="TQ_INT32" name="m_spacing" />
<UML:Attribute visibility="private" xmi.id="2053" value="" type="bool" name="m_valid" />
<UML:Attribute visibility="private" xmi.id="2054" value="" type="TQ_INT32" name="m_width" />
@@ -2676,7 +2676,7 @@ in the constructor, you have to call loadAsync.
<UML:Operation visibility="public" xmi.id="2117" type="" name="KisPattern" >
<UML:Parameter visibility="private" xmi.id="2118" value="" type="const QString &amp;" name="file" />
</UML:Operation>
- <UML:Operation visibility="public" xmi.id="2119" type=TQPOINT_OBJECT_NAME_STRING name="hotSpot" />
+ <UML:Operation visibility="public" xmi.id="2119" type="TQPoint" name="hotSpot" />
<UML:Operation visibility="public" xmi.id="2120" type="virtual QImage" name="img" />
<UML:Operation visibility="public" xmi.id="2121" type="bool" name="isValid" />
<UML:Operation visibility="public" xmi.id="2122" type="virtual bool" name="loadAsync" />
@@ -2684,8 +2684,8 @@ in the constructor, you have to call loadAsync.
<UML:Operation visibility="public" xmi.id="2124" type="virtual bool" name="saveAsync" />
<UML:Operation visibility="public" xmi.id="2125" type="QPixmap &amp;" name="thumbPixmap" />
<UML:Operation visibility="public" xmi.id="2126" type="virtual " name="~KisPattern" />
- <UML:Attribute visibility="private" xmi.id="2110" value="" type=TQBYTEARRAY_OBJECT_NAME_STRING name="m_data" />
- <UML:Attribute visibility="private" xmi.id="2111" value="" type=TQPOINT_OBJECT_NAME_STRING name="m_hotSpot" />
+ <UML:Attribute visibility="private" xmi.id="2110" value="" type="TQByteArray" name="m_data" />
+ <UML:Attribute visibility="private" xmi.id="2111" value="" type="TQPoint" name="m_hotSpot" />
<UML:Attribute visibility="private" xmi.id="2112" value="" type="QImage" name="m_img" />
<UML:Attribute visibility="private" xmi.id="2113" value="" type="QPixmap *" name="m_pixmap" />
<UML:Attribute visibility="private" xmi.id="2114" value="" type="QPixmap *" name="m_thumbPixmap" />
@@ -2810,7 +2810,7 @@ in the constructor, you have to call loadAsync.
<UML:Class stereotype="class" visibility="public" xmi.id="2218" name="KisUtil" >
<UML:Operation visibility="public" xmi.id="2219" type="void" name="enlargeRectToContainPoint" ownerScope="classifier" >
<UML:Parameter visibility="private" xmi.id="2220" value="" type="QRect &amp;" name="r" />
- <UML:Parameter visibility="private" xmi.id="2221" value="" type=TQPOINT_OBJECT_NAME_STRING name="p" />
+ <UML:Parameter visibility="private" xmi.id="2221" value="" type="TQPoint" name="p" />
</UML:Operation>
<UML:Operation visibility="public" xmi.id="2222" type="QRect" name="findBoundingTiles" ownerScope="classifier" >
<UML:Parameter visibility="private" xmi.id="2223" value="" type="const QRect &amp;" name="area" />
@@ -3170,7 +3170,7 @@ in the constructor, you have to call loadAsync.
<UML:Attribute visibility="private" xmi.id="2398" value="" type="TDEAction *" name="m_imgResizeToLayer" />
<UML:Attribute visibility="private" xmi.id="2399" value="" type="TDEAction *" name="m_imgRm" />
<UML:Attribute visibility="private" xmi.id="2400" value="" type="TDEAction *" name="m_imgScan" />
- <UML:Attribute visibility="private" xmi.id="2401" value="" type=TQPOINT_OBJECT_NAME_STRING name="m_lastGuidePoint" />
+ <UML:Attribute visibility="private" xmi.id="2401" value="" type="TQPoint" name="m_lastGuidePoint" />
<UML:Attribute visibility="private" xmi.id="2402" value="" type="TDEAction *" name="m_layerAdd" />
<UML:Attribute visibility="private" xmi.id="2403" value="" type="TDEAction *" name="m_layerBottom" />
<UML:Attribute visibility="private" xmi.id="2404" value="" type="KisListBox *" name="m_layerBox" />
diff --git a/chalk/doc/colorspaces.xmi b/chalk/doc/colorspaces.xmi
index 8fae7b48..d263e79f 100644
--- a/chalk/doc/colorspaces.xmi
+++ b/chalk/doc/colorspaces.xmi
@@ -500,7 +500,7 @@ model together." isSpecification="false" isLeaf="false" visibility="protected" x
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="44" isRoot="false" isAbstract="false" name="TQ_INT32" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="49" isRoot="false" isAbstract="false" name="bool" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="53" isRoot="false" isAbstract="false" name="TQ_UINT8" />
- <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="57" isRoot="false" isAbstract="false" name=TQSTRING_OBJECT_NAME_STRING />
+ <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="57" isRoot="false" isAbstract="false" name="TQString" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="69" isRoot="false" isAbstract="false" name="KisCompositeOpList" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="72" isRoot="false" isAbstract="false" name="vKisProfileSP" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="75" isRoot="false" isAbstract="false" name="QColor" />
@@ -513,7 +513,7 @@ model together." isSpecification="false" isLeaf="false" visibility="protected" x
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="175" isRoot="false" isAbstract="false" name="enumChannelFlags" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="201" isRoot="false" isAbstract="false" name="KisCompositeOp" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="222" isRoot="false" isAbstract="false" name="cmsHTRANSFORM" />
- <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="226" isRoot="false" isAbstract="false" name=TQSTRINGLIST_OBJECT_NAME_STRING />
+ <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="226" isRoot="false" isAbstract="false" name="TQStringList" />
<UML:Class comment=" Copyright (c) 2005 Boudewijn Rempt &lt;boud@valdyas.org>
This program is free software; you can redistribute it and/or modify
@@ -1691,7 +1691,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="865" isRoot="false" isAbstract="false" name="Plugin" />
</UML:Namespace.ownedElement>
</UML:Class>
- <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="870" isRoot="false" isAbstract="false" name=TQOBJECT_OBJECT_NAME_STRING />
+ <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="870" isRoot="false" isAbstract="false" name="TQObject" />
<UML:Class comment=" Copyright (c) 2002 Patrick Julien &lt;freak@codepimps.org>
Copyright (c) 2005 Adrian Page &lt;adrian@pagenet.plus.com>
@@ -7373,7 +7373,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
</header>
<classfields/>
</classifiercodedocument>
- <classifiercodedocument writeOutCode="true" package="" id="57" parent_class="57" fileExt=".java" fileName=TQSTRING_OBJECT_NAME_STRING >
+ <classifiercodedocument writeOutCode="true" package="" id="57" parent_class="57" fileExt=".java" fileName="TQString" >
<textblocks>
<codeblockwithcomments tag="packages" writeOutText="false" >
<header>
@@ -9248,7 +9248,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
</header>
<classfields/>
</classifiercodedocument>
- <classifiercodedocument writeOutCode="true" package="" id="226" parent_class="226" fileExt=".java" fileName=TQSTRINGLIST_OBJECT_NAME_STRING >
+ <classifiercodedocument writeOutCode="true" package="" id="226" parent_class="226" fileExt=".java" fileName="TQStringList" >
<textblocks>
<codeblockwithcomments tag="packages" writeOutText="false" >
<header>
@@ -13009,7 +13009,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
</codeclassfield>
</classfields>
</classifiercodedocument>
- <classifiercodedocument writeOutCode="true" package="" id="870" parent_class="870" fileExt=".java" fileName=TQOBJECT_OBJECT_NAME_STRING >
+ <classifiercodedocument writeOutCode="true" package="" id="870" parent_class="870" fileExt=".java" fileName="TQObject" >
<textblocks>
<codeblockwithcomments tag="packages" writeOutText="false" >
<header>
diff --git a/chalk/doc/controller.xmi b/chalk/doc/controller.xmi
index 539d9cf1..7579734d 100644
--- a/chalk/doc/controller.xmi
+++ b/chalk/doc/controller.xmi
@@ -1797,12 +1797,12 @@ and contains data that must be associated with an image for purposes of import/e
<UML:Class stereotype="362" isSpecification="false" isLeaf="false" visibility="public" xmi.id="452" isRoot="false" isAbstract="false" name="vKisFileFormatSP" />
<UML:Class stereotype="362" isSpecification="false" isLeaf="false" visibility="public" xmi.id="453" isRoot="false" isAbstract="false" name="vKisFileFormatSP_it" />
<UML:Class stereotype="362" isSpecification="false" isLeaf="false" visibility="public" xmi.id="454" isRoot="false" isAbstract="false" name="vKisFileFormatSP_cit" />
- <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="455" isRoot="false" isAbstract="false" name=TQWIDGET_OBJECT_NAME_STRING />
+ <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="455" isRoot="false" isAbstract="false" name="TQWidget" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="456" isRoot="false" isAbstract="false" name="KisRect" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="457" isRoot="false" isAbstract="false" name="KisPoint" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="463" isRoot="false" isAbstract="false" name="TQ_INT32" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="475" isRoot="false" isAbstract="false" name="QRect" />
- <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="497" isRoot="false" isAbstract="false" name=TQPOINT_OBJECT_NAME_STRING />
+ <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="497" isRoot="false" isAbstract="false" name="TQPoint" />
<UML:Class comment="The canvas subject is the subset of operations that are directy available to
tools." isSpecification="false" isLeaf="false" visibility="public" xmi.id="528" isRoot="false" isAbstract="false" name="KisPainterControllerInterface" >
<UML:Classifier.feature>
@@ -2056,7 +2056,7 @@ That last bit has not been solved yet.
</UML:Classifier.feature>
</UML:Class>
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="542" isRoot="false" isAbstract="false" name="TDEShared" />
- <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="548" isRoot="false" isAbstract="false" name=TQSTRING_OBJECT_NAME_STRING />
+ <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="548" isRoot="false" isAbstract="false" name="TQString" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="558" isRoot="false" isAbstract="false" name="bool" />
<UML:Class stereotype="362" isSpecification="false" isLeaf="false" visibility="public" xmi.id="570" isRoot="false" isAbstract="false" name="KisIDList" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="571" isRoot="false" isAbstract="false" name="KoDocument" />
@@ -2209,13 +2209,13 @@ and the clipboard." isSpecification="false" isLeaf="false" visibility="public" x
<UML:Class stereotype="362" isSpecification="false" isLeaf="false" visibility="public" xmi.id="633" isRoot="false" isAbstract="false" name="storageMap" />
</UML:Namespace.ownedElement>
</UML:Class>
- <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="662" isRoot="false" isAbstract="false" name=TQBYTEARRAY_OBJECT_NAME_STRING />
+ <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="662" isRoot="false" isAbstract="false" name="TQByteArray" />
<UML:Package isSpecification="false" isLeaf="false" visibility="public" xmi.id="677" isRoot="false" isAbstract="false" name="Qt" >
<UML:Namespace.ownedElement>
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="678" isRoot="false" isAbstract="false" name="Orientation" />
</UML:Namespace.ownedElement>
</UML:Package>
- <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="685" isRoot="false" isAbstract="false" name=TQPIXMAP_OBJECT_NAME_STRING />
+ <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="685" isRoot="false" isAbstract="false" name="TQPixmap" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="690" isRoot="false" isAbstract="false" name="KisGuideMgr" >
<UML:Classifier.feature>
<UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="756" isRoot="false" initialValue="" type="728" isAbstract="false" name="m_size" />
@@ -2677,7 +2677,7 @@ the resource has been saved." isSpecification="false" isLeaf="false" visibility=
</UML:Operation>
</UML:Classifier.feature>
</UML:Class>
- <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="869" isRoot="false" isAbstract="false" name=TQOBJECT_OBJECT_NAME_STRING />
+ <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="869" isRoot="false" isAbstract="false" name="TQObject" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="879" isRoot="false" isAbstract="false" name="QImage" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="924" isRoot="false" isAbstract="false" name="TQ_UINT32" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="930" isRoot="false" isAbstract="false" name="cmsHPROFILE" />
@@ -15867,7 +15867,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
</header>
<classfields/>
</classifiercodedocument>
- <classifiercodedocument writeOutCode="true" package="" id="455" parent_class="455" fileExt=".java" fileName=TQWIDGET_OBJECT_NAME_STRING >
+ <classifiercodedocument writeOutCode="true" package="" id="455" parent_class="455" fileExt=".java" fileName="TQWidget" >
<textblocks>
<codeblockwithcomments tag="packages" writeOutText="false" >
<header>
@@ -16467,7 +16467,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
</header>
<classfields/>
</classifiercodedocument>
- <classifiercodedocument writeOutCode="true" package="" id="497" parent_class="497" fileExt=".java" fileName=TQPOINT_OBJECT_NAME_STRING >
+ <classifiercodedocument writeOutCode="true" package="" id="497" parent_class="497" fileExt=".java" fileName="TQPoint" >
<textblocks>
<codeblockwithcomments tag="packages" writeOutText="false" >
<header>
@@ -17964,7 +17964,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
</codeclassfield>
</classfields>
</classifiercodedocument>
- <classifiercodedocument writeOutCode="true" package="" id="548" parent_class="548" fileExt=".java" fileName=TQSTRING_OBJECT_NAME_STRING >
+ <classifiercodedocument writeOutCode="true" package="" id="548" parent_class="548" fileExt=".java" fileName="TQString" >
<textblocks>
<codeblockwithcomments tag="packages" writeOutText="false" >
<header>
@@ -21542,7 +21542,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
</header>
<classfields/>
</classifiercodedocument>
- <classifiercodedocument writeOutCode="true" package="" id="662" parent_class="662" fileExt=".java" fileName=TQBYTEARRAY_OBJECT_NAME_STRING >
+ <classifiercodedocument writeOutCode="true" package="" id="662" parent_class="662" fileExt=".java" fileName="TQByteArray" >
<textblocks>
<codeblockwithcomments tag="packages" writeOutText="false" >
<header>
@@ -21917,7 +21917,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
</header>
<classfields/>
</classifiercodedocument>
- <classifiercodedocument writeOutCode="true" package="" id="685" parent_class="685" fileExt=".java" fileName=TQPIXMAP_OBJECT_NAME_STRING >
+ <classifiercodedocument writeOutCode="true" package="" id="685" parent_class="685" fileExt=".java" fileName="TQPixmap" >
<textblocks>
<codeblockwithcomments tag="packages" writeOutText="false" >
<header>
@@ -26390,7 +26390,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
</codeclassfield>
</classfields>
</classifiercodedocument>
- <classifiercodedocument writeOutCode="true" package="" id="869" parent_class="869" fileExt=".java" fileName=TQOBJECT_OBJECT_NAME_STRING >
+ <classifiercodedocument writeOutCode="true" package="" id="869" parent_class="869" fileExt=".java" fileName="TQObject" >
<textblocks>
<codeblockwithcomments tag="packages" writeOutText="false" >
<header>
diff --git a/chalk/doc/histograms.xmi b/chalk/doc/histograms.xmi
index fb6bc511..56ad1297 100644
--- a/chalk/doc/histograms.xmi
+++ b/chalk/doc/histograms.xmi
@@ -148,7 +148,7 @@
</UML:Operation>
</UML:Classifier.feature>
</UML:Class>
- <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="12" isRoot="false" isAbstract="false" name=TQSTRING_OBJECT_NAME_STRING />
+ <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="12" isRoot="false" isAbstract="false" name="TQString" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="13" isRoot="false" isAbstract="false" name="KisChannelInfo" />
<UML:Class comment="This class is an interface used in the generation of a histogram. It is a container of
data, all mathematically interesting things will calculated by a KisHistogram.
@@ -3153,7 +3153,7 @@ of choice, and rounded to a reasonable precision to avoid 0.999999" isSpecificat
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="883" isRoot="false" isAbstract="false" name="KisImageIface" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="884" isRoot="false" isAbstract="false" name="KisProfile" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="885" isRoot="false" isAbstract="false" name="KisProgressDisplayInterface" />
- <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="886" isRoot="false" isAbstract="false" name=TQOBJECT_OBJECT_NAME_STRING />
+ <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="886" isRoot="false" isAbstract="false" name="TQObject" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="912" isRoot="false" isAbstract="false" name="QPainter" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="925" isRoot="false" isAbstract="false" name="QImage" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1065" isRoot="false" isAbstract="false" name="KisGuideMgr" />
@@ -3163,7 +3163,7 @@ of choice, and rounded to a reasonable precision to avoid 0.999999" isSpecificat
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1133" isRoot="false" isAbstract="false" name="vKisAnnotationSP" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1136" isRoot="false" isAbstract="false" name="QMutex" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1138" isRoot="false" isAbstract="false" name="QSize" />
- <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1139" isRoot="false" isAbstract="false" name=TQPOINT_OBJECT_NAME_STRING />
+ <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1139" isRoot="false" isAbstract="false" name="TQPoint" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1140" isRoot="false" isAbstract="false" name="QWMatrix" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1141" isRoot="false" isAbstract="false" name="KNamedCommand" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1142" isRoot="false" isAbstract="false" name="KisRotateVisitor" />
diff --git a/chalk/ui/kis_view.cpp b/chalk/ui/kis_view.cpp
index 59da5189..bf029fb1 100644
--- a/chalk/ui/kis_view.cpp
+++ b/chalk/ui/kis_view.cpp
@@ -3515,7 +3515,7 @@ bool KisView::eventFilter(TQObject *o, TQEvent *e)
child->installEventFilter(this);
- TQObjectList *objectList = child->queryList(TQWIDGET_OBJECT_NAME_STRING);
+ TQObjectList *objectList = child->queryList("TQWidget");
TQObjectListIt it(*objectList);
TQObject *obj;
while ((obj = it.current()) != 0) {
diff --git a/filters/karbon/ai/aielement.cpp b/filters/karbon/ai/aielement.cpp
index 2f514d06..f6f45164 100644
--- a/filters/karbon/ai/aielement.cpp
+++ b/filters/karbon/ai/aielement.cpp
@@ -283,7 +283,7 @@ void AIElement::detach()
/*!
Returns the name of the type stored in the aielement.
The returned strings describe the C++ datatype used to store the
- data: for example, "TQFont", TQSTRING_OBJECT_NAME_STRING, or "TQValueList<AIElement>".
+ data: for example, "TQFont", "TQString", or "TQValueList<AIElement>".
An Invalid aielement returns 0.
*/
const char* AIElement::typeName() const
@@ -311,7 +311,7 @@ static const char* const type_map[ntypes] =
{
0,
// "TQValueList<AIElement>",
- TQSTRING_OBJECT_NAME_STRING,
+ "TQString",
"int",
"uint",
"double",
@@ -319,7 +319,7 @@ static const char* const type_map[ntypes] =
"Operator",
"Reference",
"TQValueVector<AIElement>",
- TQBYTEARRAY_OBJECT_NAME_STRING,
+ "TQByteArray",
"uchar",
};
diff --git a/filters/karbon/xfig/xfigimport_factory.h b/filters/karbon/xfig/xfigimport_factory.h
index 9760a92f..da49c273 100644
--- a/filters/karbon/xfig/xfigimport_factory.h
+++ b/filters/karbon/xfig/xfigimport_factory.h
@@ -37,7 +37,7 @@ public:
XFIGImportFactory(TQObject* parent = 0, const char* name = 0);
virtual ~XFIGImportFactory();
- virtual TQObject* createObject(TQObject* parent = 0, const char* name = 0, const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList());
+ virtual TQObject* createObject(TQObject* parent = 0, const char* name = 0, const char* classname = "TQObject", const TQStringList &args = TQStringList());
static TDEInstance* global();
diff --git a/filters/kword/libexport/ProcessDocument.cpp b/filters/kword/libexport/ProcessDocument.cpp
index 69b14857..1ec7bc8c 100644
--- a/filters/kword/libexport/ProcessDocument.cpp
+++ b/filters/kword/libexport/ProcessDocument.cpp
@@ -213,12 +213,12 @@ static void ProcessBoolIntValueTag ( TQDomNode myNode, void *tagData, KWEFKWordL
static void ProcessStringValueTag ( TQDomNode myNode, void *tagData, KWEFKWordLeader *leader )
{
- ProcessOneAttrTag (myNode, "value", TQSTRING_OBJECT_NAME_STRING, tagData, leader);
+ ProcessOneAttrTag (myNode, "value", "TQString", tagData, leader);
}
static void ProcessStringNameTag (TQDomNode myNode, void *tagData, KWEFKWordLeader *leader )
{
- ProcessOneAttrTag (myNode, "name", TQSTRING_OBJECT_NAME_STRING, tagData, leader);
+ ProcessOneAttrTag (myNode, "name", "TQString", tagData, leader);
}
@@ -311,7 +311,7 @@ void ProcessAnchorTag ( TQDomNode myNode,
*instance = TQString();
TQValueList<AttrProcessing> attrProcessingList;
attrProcessingList << AttrProcessing ( "type", type )
- << AttrProcessing ( "instance", TQSTRING_OBJECT_NAME_STRING, instance );
+ << AttrProcessing ( "instance", "TQString", instance );
ProcessAttributes (myNode, attrProcessingList);
if ( type != "frameset" )
@@ -851,7 +851,7 @@ static void ProcessAnyBorderTag ( TQDomNode myNode, void *tagData, KWEFKWordLead
static void ProcessFollowingTag ( TQDomNode myNode, void *tagData, KWEFKWordLeader *leader )
{
- ProcessOneAttrTag (myNode, "name", TQSTRING_OBJECT_NAME_STRING, tagData, leader);
+ ProcessOneAttrTag (myNode, "name", "TQString", tagData, leader);
}
static void ProcessLinespacingTag (TQDomNode myNode, void *tagData, KWEFKWordLeader* /*leader*/ )
diff --git a/filters/kword/libexport/TagProcessing.cpp b/filters/kword/libexport/TagProcessing.cpp
index 46a8fb35..1a993073 100644
--- a/filters/kword/libexport/TagProcessing.cpp
+++ b/filters/kword/libexport/TagProcessing.cpp
@@ -107,7 +107,7 @@ AttrProcessing::AttrProcessing ( const TQString& n, const TQString& t, void *d )
{
if ( t == "int" )
type = AttrInt;
- else if ( t == TQSTRING_OBJECT_NAME_STRING )
+ else if ( t == "TQString" )
type = AttrTQString;
else if ( t == "double" )
type = AttrDouble;
diff --git a/kdgantt/KDGanttViewSubwidgets.cpp b/kdgantt/KDGanttViewSubwidgets.cpp
index 8814176e..027e1b81 100644
--- a/kdgantt/KDGanttViewSubwidgets.cpp
+++ b/kdgantt/KDGanttViewSubwidgets.cpp
@@ -3222,7 +3222,7 @@ KDGanttCanvasView::KDGanttCanvasView( KDGanttView* sender,TQCanvas* canvas, TQWi
myMyContentsHeight = 0;
_showItemAddPopupMenu = false;
- TQObject *scrollViewTimer = child( "scrollview scrollbar timer", TQTIMER_OBJECT_NAME_STRING, false );
+ TQObject *scrollViewTimer = child( "scrollview scrollbar timer", "TQTimer", false );
Q_ASSERT( scrollViewTimer );
if ( scrollViewTimer ) {
disconnect( scrollViewTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateScrollBars() ) );
diff --git a/kexi/core/kexidialogbase.cpp b/kexi/core/kexidialogbase.cpp
index 34057696..7b57d673 100644
--- a/kexi/core/kexidialogbase.cpp
+++ b/kexi/core/kexidialogbase.cpp
@@ -100,7 +100,7 @@ void KexiDialogBase::addView(KexiViewBase *view, int mode)
// addActionProxyChild( view );
//set focus proxy inside this view
- TQWidget *ch = TQT_TQWIDGET(view->child( 0, TQWIDGET_OBJECT_NAME_STRING, false ));
+ TQWidget *ch = TQT_TQWIDGET(view->child( 0, "TQWidget", false ));
if (ch)
view->setFocusProxy(ch);
diff --git a/kexi/core/kexiviewbase.cpp b/kexi/core/kexiviewbase.cpp
index c4eb3eaa..c2a3f2a5 100644
--- a/kexi/core/kexiviewbase.cpp
+++ b/kexi/core/kexiviewbase.cpp
@@ -212,7 +212,7 @@ bool KexiViewBase::removeDataBlock( const TQString& dataID )
bool KexiViewBase::eventFilter( TQObject *o, TQEvent *e )
{
- if (e->type()==TQEvent::FocusIn || e->type()==TQEvent::FocusOut) {// && o->inherits(TQWIDGET_OBJECT_NAME_STRING)) {
+ if (e->type()==TQEvent::FocusIn || e->type()==TQEvent::FocusOut) {// && o->inherits("TQWidget")) {
// //hp==true if currently focused widget is a child of this table view
// const bool hp = Kexi::hasParent( static_cast<TQWidget*>(o), focusWidget());
// kexidbg << "KexiViewBase::eventFilter(): " << o->name() << " " << e->type() << endl;
diff --git a/kexi/examples/Simple_Database.kexi.sql b/kexi/examples/Simple_Database.kexi.sql
index 27ee93c3..97870fb2 100644
--- a/kexi/examples/Simple_Database.kexi.sql
+++ b/kexi/examples/Simple_Database.kexi.sql
@@ -23,7 +23,7 @@ INSERT INTO "kexi__objectdata" VALUES(4, '<!DOCTYPE UI>
<kfd:customHeader version="2" />
<pixmapinproject/>
<class>QWidget</class>
-<widget class=TQWIDGET_OBJECT_NAME_STRING >
+<widget class="TQWidget" >
<property name="name" >
<cstring>formularz1</cstring>
</property>
@@ -235,7 +235,7 @@ INSERT INTO "kexi__objectdata" VALUES(96, '<!DOCTYPE UI>
<UI stdsetdef="1" version="3.1" >
<pixmapinproject/>
<class>QWidget</class>
- <widget class=TQWIDGET_OBJECT_NAME_STRING >
+ <widget class="TQWidget" >
<property name="name" >
<cstring>report2</cstring>
</property>
@@ -428,7 +428,7 @@ INSERT INTO "kexi__objectdata" VALUES(105, '<!DOCTYPE UI>
<kfd:customHeader version="2" />
<pixmapinproject/>
<class>QWidget</class>
-<widget class=TQWIDGET_OBJECT_NAME_STRING >
+<widget class="TQWidget" >
<property name="name" >
<cstring>form1</cstring>
</property>
diff --git a/kexi/formeditor/commands.cpp b/kexi/formeditor/commands.cpp
index 3e22fcdd..10bd7eb3 100644
--- a/kexi/formeditor/commands.cpp
+++ b/kexi/formeditor/commands.cpp
@@ -378,10 +378,10 @@ AdjustSizeCommand::AdjustSizeCommand(int type, WidgetList &list, Form *form)
{
for(TQWidget *w = list.first(); w; w = list.next())
{
- if(w->parentWidget() && w->parentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING))
+ if(w->parentWidget() && w->parentWidget()->isA("TQWidgetStack"))
{
w = w->parentWidget(); // widget is WidgetStack page
- if(w->parentWidget() && w->parentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)) // widget is tabwidget page
+ if(w->parentWidget() && w->parentWidget()->inherits("TQTabWidget")) // widget is tabwidget page
w = w->parentWidget();
}
@@ -888,7 +888,7 @@ CreateLayoutCommand::execute()
TQCString classname;
switch(m_type) {
case Container::HSplitter: case Container::VSplitter:
- classname = TQSPLITTER_OBJECT_NAME_STRING; break;
+ classname = "TQSplitter"; break;
default:
classname = Container::layoutTypeToString(m_type).latin1();
}
@@ -1385,7 +1385,7 @@ DeleteWidgetCommand::DeleteWidgetCommand(WidgetList &list, Form *form)
{
TQWidget *w = it.current();
// Don't delete tabwidget or widgetstack pages
- if(w->parentWidget()->inherits(TQWIDGETSTACK_OBJECT_NAME_STRING))
+ if(w->parentWidget()->inherits("TQWidgetStack"))
{
list.remove(w);
continue;
diff --git a/kexi/formeditor/container.cpp b/kexi/formeditor/container.cpp
index a785893f..4ea7f97e 100644
--- a/kexi/formeditor/container.cpp
+++ b/kexi/formeditor/container.cpp
@@ -61,7 +61,7 @@ EventEater::eventFilter(TQObject *, TQEvent *ev)
// When the user click the empty part of tab bar, only MouseReleaseEvent is sent,
// we need to simulate the Press event
- if(ev->type() == TQEvent::MouseButtonRelease && m_widget->inherits(TQTABWIDGET_OBJECT_NAME_STRING))
+ if(ev->type() == TQEvent::MouseButtonRelease && m_widget->inherits("TQTabWidget"))
{
TQMouseEvent *mev = TQT_TQMOUSEEVENT(ev);
if(mev->button() == Qt::LeftButton)
@@ -225,7 +225,7 @@ Container::eventFilter(TQObject *s, TQEvent *e)
m_state = DrawingSelectionRect;
}
else {
- if(s->inherits(TQTABWIDGET_OBJECT_NAME_STRING)) // to allow changing page by clicking tab
+ if(s->inherits("TQTabWidget")) // to allow changing page by clicking tab
return false;
}
@@ -299,7 +299,7 @@ Container::eventFilter(TQObject *s, TQEvent *e)
{
if(!m_toplevel && m_moving == m_container) // no effect for form
return false;
- if((!m_moving) || (!m_moving->parentWidget()))// || (m_moving->parentWidget()->inherits(TQWIDGETSTACK_OBJECT_NAME_STRING)))
+ if((!m_moving) || (!m_moving->parentWidget()))// || (m_moving->parentWidget()->inherits("TQWidgetStack")))
return true;
moveSelectedWidgetsBy(mev->x() - m_grab.x(), mev->y() - m_grab.y());
@@ -1107,13 +1107,13 @@ Container::moveSelectedWidgetsBy(int realdx, int realdy, TQMouseEvent *mev)
for(TQWidget *w = m_form->selectedWidgets()->first(); w; w = m_form->selectedWidgets()->next())
{
- if(!w || !w->parent() || w->parent()->inherits(TQTABWIDGET_OBJECT_NAME_STRING) || w->parent()->inherits(TQWIDGETSTACK_OBJECT_NAME_STRING))
+ if(!w || !w->parent() || w->parent()->inherits("TQTabWidget") || w->parent()->inherits("TQWidgetStack"))
continue;
- if(w->parentWidget() && w->parentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING))
+ if(w->parentWidget() && w->parentWidget()->isA("TQWidgetStack"))
{
w = w->parentWidget(); // widget is WidgetStack page
- if(w->parentWidget() && w->parentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)) // widget is tabwidget page
+ if(w->parentWidget() && w->parentWidget()->inherits("TQTabWidget")) // widget is tabwidget page
w = w->parentWidget();
}
@@ -1133,13 +1133,13 @@ Container::moveSelectedWidgetsBy(int realdx, int realdy, TQMouseEvent *mev)
for(TQWidget *w = m_form->selectedWidgets()->first(); w; w = m_form->selectedWidgets()->next())
{
// Don't move tab widget pages (or widget stack pages)
- if(!w || !w->parent() || w->parent()->inherits(TQTABWIDGET_OBJECT_NAME_STRING) || w->parent()->inherits(TQWIDGETSTACK_OBJECT_NAME_STRING))
+ if(!w || !w->parent() || w->parent()->inherits("TQTabWidget") || w->parent()->inherits("TQWidgetStack"))
continue;
- if(w->parentWidget() && w->parentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING))
+ if(w->parentWidget() && w->parentWidget()->isA("TQWidgetStack"))
{
w = w->parentWidget(); // widget is WidgetStack page
- if(w->parentWidget() && w->parentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)) // widget is tabwidget page
+ if(w->parentWidget() && w->parentWidget()->inherits("TQTabWidget")) // widget is tabwidget page
w = w->parentWidget();
}
diff --git a/kexi/formeditor/factories/containerfactory.cpp b/kexi/formeditor/factories/containerfactory.cpp
index 8b0d5fc5..b0005dd9 100644
--- a/kexi/formeditor/factories/containerfactory.cpp
+++ b/kexi/formeditor/factories/containerfactory.cpp
@@ -244,11 +244,11 @@ InsertPageCommand::execute()
TQWidget *parent = m_form->objectTree()->lookup(m_parentname)->widget();
if(m_name.isEmpty()) {
m_name = container->form()->objectTree()->generateUniqueName(
- container->form()->library()->displayName(TQWIDGET_OBJECT_NAME_STRING).latin1(),
+ container->form()->library()->displayName("TQWidget").latin1(),
/*!numberSuffixRequired*/false);
}
- TQWidget *page = container->form()->library()->createWidget(TQWIDGET_OBJECT_NAME_STRING, parent, m_name.latin1(), container);
+ TQWidget *page = container->form()->library()->createWidget("TQWidget", parent, m_name.latin1(), container);
// TQWidget *page = new ContainerWidget(parent, m_name.latin1());
// new KFormDesigner::Container(container, page, parent);
@@ -263,7 +263,7 @@ InsertPageCommand::execute()
KFormDesigner::ObjectTreeItem *item = container->form()->objectTree()->lookup(m_name);
item->addModifiedProperty("title", n);
}
- else if(classname == TQWIDGETSTACK_OBJECT_NAME_STRING)
+ else if(classname == "TQWidgetStack")
{
TQWidgetStack *stack = (TQWidgetStack*)parent;
stack->addWidget(page, m_pageid);
@@ -291,7 +291,7 @@ InsertPageCommand::unexecute()
TabWidgetBase *tab = dynamic_cast<TabWidgetBase*>(parent);
tab->removePage(page);
}
- else if(classname == TQWIDGETSTACK_OBJECT_NAME_STRING)
+ else if(classname == "TQWidgetStack")
{
TQWidgetStack *stack = (TQWidgetStack*)parent;
int id = stack->id(page) - 1;
@@ -357,7 +357,7 @@ ContainerFactory::ContainerFactory(TQObject *parent, const char *, const TQStrin
{
KFormDesigner::WidgetInfo *wBtnGroup = new KFormDesigner::WidgetInfo(this);
wBtnGroup->setPixmap("frame");
- wBtnGroup->setClassName(TQBUTTONGROUP_OBJECT_NAME_STRING);
+ wBtnGroup->setClassName("TQButtonGroup");
wBtnGroup->setName(i18n("Button Group"));
wBtnGroup->setNamePrefix(
i18n("Widget name. This string will be used to name widgets of this class. It must _not_ contain white spaces and non latin1 characters.", "buttonGroup"));
@@ -369,11 +369,11 @@ ContainerFactory::ContainerFactory(TQObject *parent, const char *, const TQStrin
wTabWidget->setClassName("KFDTabWidget");
#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,9)
wTabWidget->addAlternateClassName("KTabWidget");
- wTabWidget->addAlternateClassName(TQTABWIDGET_OBJECT_NAME_STRING);
-//tmp: wTabWidget->setSavingName(TQTABWIDGET_OBJECT_NAME_STRING);
+ wTabWidget->addAlternateClassName("TQTabWidget");
+//tmp: wTabWidget->setSavingName("TQTabWidget");
wTabWidget->setSavingName("KTabWidget");
#else
- wTabWidget->setSavingName(TQTABWIDGET_OBJECT_NAME_STRING);
+ wTabWidget->setSavingName("TQTabWidget");
#endif
wTabWidget->setIncludeFileName("ktabwidget.h");
wTabWidget->setName(i18n("Tab Widget"));
@@ -384,7 +384,7 @@ ContainerFactory::ContainerFactory(TQObject *parent, const char *, const TQStrin
KFormDesigner::WidgetInfo *wWidget = new KFormDesigner::WidgetInfo(this);
wWidget->setPixmap("frame");
- wWidget->setClassName(TQWIDGET_OBJECT_NAME_STRING);
+ wWidget->setClassName("TQWidget");
wWidget->addAlternateClassName("ContainerWidget");
wWidget->setName(i18n("Basic container"));
wWidget->setNamePrefix(
@@ -394,7 +394,7 @@ ContainerFactory::ContainerFactory(TQObject *parent, const char *, const TQStrin
KFormDesigner::WidgetInfo *wGroupBox = new KFormDesigner::WidgetInfo(this);
wGroupBox->setPixmap("groupbox");
- wGroupBox->setClassName(TQGROUPBOX_OBJECT_NAME_STRING);
+ wGroupBox->setClassName("TQGroupBox");
wGroupBox->addAlternateClassName("GroupBox");
wGroupBox->setName(i18n("Group Box"));
wGroupBox->setNamePrefix(
@@ -404,7 +404,7 @@ ContainerFactory::ContainerFactory(TQObject *parent, const char *, const TQStrin
KFormDesigner::WidgetInfo *wFrame = new KFormDesigner::WidgetInfo(this);
wFrame->setPixmap("frame");
- wFrame->setClassName(TQFRAME_OBJECT_NAME_STRING);
+ wFrame->setClassName("TQFrame");
wFrame->setName(i18n("Frame"));
wFrame->setNamePrefix(
i18n("Widget name. This string will be used to name widgets of this class. It must _not_ contain white spaces and non latin1 characters.", "frame"));
@@ -413,7 +413,7 @@ ContainerFactory::ContainerFactory(TQObject *parent, const char *, const TQStrin
KFormDesigner::WidgetInfo *wWidgetStack = new KFormDesigner::WidgetInfo(this);
wWidgetStack->setPixmap("widgetstack");
- wWidgetStack->setClassName(TQWIDGETSTACK_OBJECT_NAME_STRING);
+ wWidgetStack->setClassName("TQWidgetStack");
wWidgetStack->setName(i18n("Widget Stack"));
wWidgetStack->setNamePrefix(
i18n("Widget name. This string will be used to name widgets of this class. It must _not_ contain white spaces and non latin1 characters.", "widgetStack"));
@@ -451,7 +451,7 @@ ContainerFactory::ContainerFactory(TQObject *parent, const char *, const TQStrin
//! @todo horizontal/vertical splitter icons
wSplitter->setPixmap("frame");
wSplitter->setClassName("Splitter");
- wSplitter->addAlternateClassName(TQSPLITTER_OBJECT_NAME_STRING);
+ wSplitter->addAlternateClassName("TQSplitter");
wSplitter->setName(i18n("Splitter"));
wSplitter->setNamePrefix(
i18n("Widget name. This string will be used to name widgets of this class. It must _not_ contain white spaces and non latin1 characters.", "splitter"));
@@ -508,7 +508,7 @@ TQWidget*
ContainerFactory::createWidget(const TQCString &c, TQWidget *p, const char *n,
KFormDesigner::Container *container, int options)
{
- if(c == TQBUTTONGROUP_OBJECT_NAME_STRING)
+ if(c == "TQButtonGroup")
{
TQString text = container->form()->library()->textForWidgetName(n, c);
TQButtonGroup *w = new TQButtonGroup(/*i18n("Button Group")*/text, p, n);
@@ -538,20 +538,20 @@ ContainerFactory::createWidget(const TQCString &c, TQWidget *p, const char *n,
return tab;
}
- else if(c == TQWIDGET_OBJECT_NAME_STRING || c=="ContainerWidget")
+ else if(c == "TQWidget" || c=="ContainerWidget")
{
TQWidget *w = new ContainerWidget(p, n);
new KFormDesigner::Container(container, w, TQT_TQOBJECT(p));
return w;
}
- else if(c == TQGROUPBOX_OBJECT_NAME_STRING || c == "GroupBox")
+ else if(c == "TQGroupBox" || c == "GroupBox")
{
TQString text = container->form()->library()->textForWidgetName(n, c);
TQGroupBox *w = new GroupBox(text, p, n);
new KFormDesigner::Container(container, w, container);
return w;
}
- else if(c == TQFRAME_OBJECT_NAME_STRING)
+ else if(c == "TQFrame")
{
TQFrame *w = new TQFrame(p, n);
w->setLineWidth(2);
@@ -559,7 +559,7 @@ ContainerFactory::createWidget(const TQCString &c, TQWidget *p, const char *n,
new KFormDesigner::Container(container, w, container);
return w;
}
- else if(c == TQWIDGETSTACK_OBJECT_NAME_STRING)
+ else if(c == "TQWidgetStack")
{
TQWidgetStack *stack = new TQWidgetStack(p, n);
stack->setLineWidth(2);
@@ -606,7 +606,7 @@ ContainerFactory::createWidget(const TQCString &c, TQWidget *p, const char *n,
SubForm *subform = new SubForm(p, n);
return subform;
}
- else if(c == TQSPLITTER_OBJECT_NAME_STRING) {
+ else if(c == "TQSplitter") {
TQSplitter *split = new TQSplitter(p, n);
if (0 == (options & WidgetFactory::AnyOrientation))
split->setOrientation(
@@ -651,9 +651,9 @@ ContainerFactory::createMenuActions(const TQCString &classname, TQWidget *w, TQP
//m_widget = w;
// m_container = container;
- if((classname == "KFDTabWidget") || (w->parentWidget()->parentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)))
+ if((classname == "KFDTabWidget") || (w->parentWidget()->parentWidget()->inherits("TQTabWidget")))
{
- if(w->parentWidget()->parentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING))
+ if(w->parentWidget()->parentWidget()->inherits("TQTabWidget"))
{
//m_widget = w->parentWidget()->parentWidget();
setWidget(w->parentWidget()->parentWidget(), m_container->toplevel());
@@ -668,7 +668,7 @@ ContainerFactory::createMenuActions(const TQCString &classname, TQWidget *w, TQP
menu->setItemEnabled(id, false);
return true;
}
- else if(w->parentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING) && !w->parentWidget()->parentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING))
+ else if(w->parentWidget()->isA("TQWidgetStack") && !w->parentWidget()->parentWidget()->inherits("TQTabWidget"))
{
//m_widget = w->parentWidget();
TQWidgetStack *stack = (TQWidgetStack*)w->parentWidget(); //m_widget;
@@ -702,14 +702,14 @@ bool
ContainerFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDesigner::Container *container)
{
m_container = container;
- if(classname == TQBUTTONGROUP_OBJECT_NAME_STRING)
+ if(classname == "TQButtonGroup")
{
TQButtonGroup *group = static_cast<TQButtonGroup*>(w);
TQRect r = TQRect(group->x()+2, group->y()-5, group->width()-10, w->fontMetrics().height() + 10);
createEditor(classname, group->title(), group, container, r, TQt::AlignAuto);
return true;
}
- if(classname == TQGROUPBOX_OBJECT_NAME_STRING || classname == "GroupBox")
+ if(classname == "TQGroupBox" || classname == "GroupBox")
{
TQGroupBox *group = static_cast<TQGroupBox*>(w);
TQRect r = TQRect(group->x()+2, group->y()-5, group->width()-10, w->fontMetrics().height() + 10);
@@ -722,12 +722,12 @@ ContainerFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDes
bool
ContainerFactory::saveSpecialProperty(const TQCString &, const TQString &name, const TQVariant &, TQWidget *w, TQDomElement &parentNode, TQDomDocument &parent)
{
- if((name == "title") && (w->parentWidget()->parentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)))
+ if((name == "title") && (w->parentWidget()->parentWidget()->inherits("TQTabWidget")))
{
TabWidgetBase *tab = dynamic_cast<TabWidgetBase*>(w->parentWidget()->parentWidget());
KFormDesigner::FormIO::savePropertyElement(parentNode, parent, "attribute", "title", tab->tabLabel(w));
}
- else if((name == "id") && (w->parentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING)))
+ else if((name == "id") && (w->parentWidget()->isA("TQWidgetStack")))
{
TQWidgetStack *stack = (TQWidgetStack*)w->parentWidget();
KFormDesigner::FormIO::savePropertyElement(parentNode, parent, "attribute", "id", stack->id(w));
@@ -741,7 +741,7 @@ bool
ContainerFactory::readSpecialProperty(const TQCString &, TQDomElement &node, TQWidget *w, KFormDesigner::ObjectTreeItem *item)
{
TQString name = node.attribute("name");
- if((name == "title") && (item->parent()->widget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)))
+ if((name == "title") && (item->parent()->widget()->inherits("TQTabWidget")))
{
TabWidgetBase *tab = dynamic_cast<TabWidgetBase*>(w->parentWidget());
tab->addTab(w, node.firstChild().toElement().text());
@@ -749,7 +749,7 @@ ContainerFactory::readSpecialProperty(const TQCString &, TQDomElement &node, TQW
return true;
}
- if((name == "id") && (w->parentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING)))
+ if((name == "id") && (w->parentWidget()->isA("TQWidgetStack")))
{
TQWidgetStack *stack = (TQWidgetStack*)w->parentWidget();
int id = KFormDesigner::FormIO::readPropertyValue(node.firstChild(), TQT_TQOBJECT(w), name).toInt();
@@ -768,7 +768,7 @@ ContainerFactory::autoSaveProperties(const TQCString &c)
TQValueList<TQCString> lst;
// if(c == "SubForm")
// lst << "formName";
- if(c == TQSPLITTER_OBJECT_NAME_STRING)
+ if(c == "TQSplitter")
lst << "orientation";
return lst;
}
@@ -784,7 +784,7 @@ ContainerFactory::isPropertyVisibleInternal(const TQCString &classname,
{
return property == "name" || property == "geometry";
}
- else if (classname == TQGROUPBOX_OBJECT_NAME_STRING || classname=="GroupBox") {
+ else if (classname == "TQGroupBox" || classname=="GroupBox") {
ok =
#ifdef KEXI_NO_UNFINISHED
/*! @todo Hidden for now in Kexi. "checkable" and "checked" props need adding
@@ -821,8 +821,8 @@ ContainerFactory::resizeEditor(TQWidget *editor, TQWidget *widget, const TQCStri
void ContainerFactory::addTabPage()
{
-// if (!m_widget->inherits(TQTABWIDGET_OBJECT_NAME_STRING))
- if (!widget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING))
+// if (!m_widget->inherits("TQTabWidget"))
+ if (!widget()->inherits("TQTabWidget"))
return;
KCommand *com = new InsertPageCommand(m_container, widget());
if(dynamic_cast<TabWidgetBase*>(widget())->count() == 0)
@@ -836,7 +836,7 @@ void ContainerFactory::addTabPage()
void ContainerFactory::removeTabPage()
{
- if (!widget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING))
+ if (!widget()->inherits("TQTabWidget"))
return;
TabWidgetBase *tab = dynamic_cast<TabWidgetBase*>(widget());
TQWidget *w = tab->currentPage();
@@ -850,7 +850,7 @@ void ContainerFactory::removeTabPage()
void ContainerFactory::renameTabPage()
{
- if (!widget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING))
+ if (!widget()->inherits("TQTabWidget"))
return;
TabWidgetBase *tab = dynamic_cast<TabWidgetBase*>(widget());
TQWidget *w = tab->currentPage();
@@ -878,7 +878,7 @@ void ContainerFactory::reorderTabs(int oldpos, int newpos)
void ContainerFactory::addStackPage()
{
- if (!widget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING))
+ if (!widget()->isA("TQWidgetStack"))
return;
KCommand *com = new InsertPageCommand(m_container, widget());
if(!((TQWidgetStack*)widget())->visibleWidget())
@@ -892,7 +892,7 @@ void ContainerFactory::addStackPage()
void ContainerFactory::removeStackPage()
{
- if (!widget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING))
+ if (!widget()->isA("TQWidgetStack"))
return;
TQWidgetStack *stack = (TQWidgetStack*)widget();
TQWidget *page = stack->visibleWidget();
diff --git a/kexi/formeditor/factories/stdwidgetfactory.cpp b/kexi/formeditor/factories/stdwidgetfactory.cpp
index adb4d1bf..a74097a0 100644
--- a/kexi/formeditor/factories/stdwidgetfactory.cpp
+++ b/kexi/formeditor/factories/stdwidgetfactory.cpp
@@ -125,7 +125,7 @@ StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStrin
KFormDesigner::WidgetInfo *wLabel = new KFormDesigner::WidgetInfo(this);
wLabel->setPixmap("label");
- wLabel->setClassName(TQLABEL_OBJECT_NAME_STRING);
+ wLabel->setClassName("TQLabel");
wLabel->setName(i18n("Text Label"));
wLabel->setNamePrefix(
i18n("Widget name. This string will be used to name widgets of this class. It must _not_ contain white spaces and non latin1 characters.", "label"));
@@ -137,7 +137,7 @@ StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStrin
wPixLabel->setClassName("KexiPictureLabel");
wPixLabel->setName(i18n("Picture Label"));
//! @todo TQt designer compatibility: maybe use this class when TQLabel has a pixmap set...?
- //wPixLabel->addAlternateClassName(TQLABEL_OBJECT_NAME_STRING);
+ //wPixLabel->addAlternateClassName("TQLabel");
wPixLabel->setSavingName("KexiPictureLabel");
wPixLabel->setNamePrefix(
i18n("Widget name. This string will be used to name widgets of this class. It must _not_ contain white spaces and non latin1 characters.", "picture"));
@@ -147,7 +147,7 @@ StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStrin
KFormDesigner::WidgetInfo *wLineEdit = new KFormDesigner::WidgetInfo(this);
wLineEdit->setPixmap("lineedit");
wLineEdit->setClassName("KLineEdit");
- wLineEdit->addAlternateClassName(TQLINEEDIT_OBJECT_NAME_STRING);
+ wLineEdit->addAlternateClassName("TQLineEdit");
wLineEdit->setIncludeFileName("klineedit.h");
wLineEdit->setName(i18n("Line Edit"));
wLineEdit->setNamePrefix(
@@ -167,7 +167,7 @@ StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStrin
KFormDesigner::WidgetInfo *wPushButton = new KFormDesigner::WidgetInfo(this);
wPushButton->setPixmap("button");
wPushButton->setClassName("KPushButton");
- wPushButton->addAlternateClassName(TQPUSHBUTTON_OBJECT_NAME_STRING);
+ wPushButton->addAlternateClassName("TQPushButton");
wPushButton->setIncludeFileName("kpushbutton.h");
wPushButton->setName(i18n("Push Button"));
wPushButton->setNamePrefix(
@@ -177,7 +177,7 @@ StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStrin
KFormDesigner::WidgetInfo *wRadioButton = new KFormDesigner::WidgetInfo(this);
wRadioButton->setPixmap("radio");
- wRadioButton->setClassName(TQRADIOBUTTON_OBJECT_NAME_STRING);
+ wRadioButton->setClassName("TQRadioButton");
wRadioButton->setName(i18n("Option Button"));
wRadioButton->setNamePrefix(
i18n("Widget name. This string will be used to name widgets of this class. It must _not_ contain white spaces and non latin1 characters.", "optionButton"));
@@ -186,7 +186,7 @@ StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStrin
KFormDesigner::WidgetInfo *wCheckBox = new KFormDesigner::WidgetInfo(this);
wCheckBox->setPixmap("check");
- wCheckBox->setClassName(TQCHECKBOX_OBJECT_NAME_STRING);
+ wCheckBox->setClassName("TQCheckBox");
wCheckBox->setName(i18n("Check Box"));
wCheckBox->setNamePrefix(
i18n("Widget name. This string will be used to name widgets of this class. It must _not_ contain white spaces and non latin1 characters.", "checkBox"));
@@ -196,7 +196,7 @@ StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStrin
KFormDesigner::WidgetInfo *wSpinBox = new KFormDesigner::WidgetInfo(this);
wSpinBox->setPixmap("spin");
wSpinBox->setClassName("KIntSpinBox");
- wSpinBox->addAlternateClassName(TQSPINBOX_OBJECT_NAME_STRING);
+ wSpinBox->addAlternateClassName("TQSpinBox");
wSpinBox->setIncludeFileName("knuminput.h");
wSpinBox->setName(i18n("Spin Box"));
wSpinBox->setNamePrefix(
@@ -207,7 +207,7 @@ StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStrin
KFormDesigner::WidgetInfo *wComboBox = new KFormDesigner::WidgetInfo(this);
wComboBox->setPixmap("combo");
wComboBox->setClassName("KComboBox");
- wComboBox->addAlternateClassName(TQCOMBOBOX_OBJECT_NAME_STRING);
+ wComboBox->addAlternateClassName("TQComboBox");
wComboBox->setIncludeFileName("kcombobox.h");
wComboBox->setName(i18n("Combo Box"));
wComboBox->setNamePrefix(
@@ -218,7 +218,7 @@ StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStrin
KFormDesigner::WidgetInfo *wListBox = new KFormDesigner::WidgetInfo(this);
wListBox->setPixmap("listbox");
wListBox->setClassName("TDEListBox");
- wListBox->addAlternateClassName(TQLISTBOX_OBJECT_NAME_STRING);
+ wListBox->addAlternateClassName("TQListBox");
wListBox->setIncludeFileName("tdelistbox.h");
wListBox->setName(i18n("List Box"));
wListBox->setNamePrefix(
@@ -229,7 +229,7 @@ StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStrin
KFormDesigner::WidgetInfo *wTextEdit = new KFormDesigner::WidgetInfo(this);
wTextEdit->setPixmap("textedit");
wTextEdit->setClassName("KTextEdit");
- wTextEdit->addAlternateClassName(TQTEXTEDIT_OBJECT_NAME_STRING);
+ wTextEdit->addAlternateClassName("TQTextEdit");
wTextEdit->setIncludeFileName("ktextedit.h");
wTextEdit->setName(i18n("Text Editor"));
wTextEdit->setNamePrefix(
@@ -240,7 +240,7 @@ StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStrin
KFormDesigner::WidgetInfo *wListView = new KFormDesigner::WidgetInfo(this);
wListView->setPixmap("listview");
wListView->setClassName("TDEListView");
- wListView->addAlternateClassName(TQLISTVIEW_OBJECT_NAME_STRING);
+ wListView->addAlternateClassName("TQListView");
wListView->setIncludeFileName("tdelistview.h");
wListView->setName(i18n("List View"));
wListView->setNamePrefix(
@@ -250,7 +250,7 @@ StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStrin
KFormDesigner::WidgetInfo *wSlider = new KFormDesigner::WidgetInfo(this);
wSlider->setPixmap("slider");
- wSlider->setClassName(TQSLIDER_OBJECT_NAME_STRING);
+ wSlider->setClassName("TQSlider");
wSlider->setName(i18n("Slider"));
wSlider->setNamePrefix(
i18n("Widget name. This string will be used to name widgets of this class. It must _not_ contain white spaces and non latin1 characters.", "slider"));
@@ -260,7 +260,7 @@ StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStrin
KFormDesigner::WidgetInfo *wProgressBar = new KFormDesigner::WidgetInfo(this);
wProgressBar->setPixmap("progress");
wProgressBar->setClassName("KProgress");
- wProgressBar->addAlternateClassName(TQPROGRESSBAR_OBJECT_NAME_STRING);
+ wProgressBar->addAlternateClassName("TQProgressBar");
wProgressBar->setIncludeFileName("kprogress.h");
wProgressBar->setName(i18n("Progress Bar"));
wProgressBar->setNamePrefix(
@@ -281,7 +281,7 @@ StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStrin
wDate->setPixmap("dateedit");
wDate->setClassName("KDateWidget");
#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,9)
- wDate->addAlternateClassName(TQDATEEDIT_OBJECT_NAME_STRING);
+ wDate->addAlternateClassName("TQDateEdit");
wDate->setIncludeFileName("kdatewidget.h");
#endif
wDate->setName(i18n("Date Widget"));
@@ -294,7 +294,7 @@ StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStrin
wTime->setPixmap("timeedit");
wTime->setClassName("KTimeWidget");
#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,9)
- wTime->addAlternateClassName(TQTIMEEDIT_OBJECT_NAME_STRING);
+ wTime->addAlternateClassName("TQTimeEdit");
wTime->setIncludeFileName("ktimewidget.h");
#endif
wTime->setName(i18n("Time Widget"));
@@ -307,7 +307,7 @@ StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStrin
wDateTime->setPixmap("datetimeedit");
wDateTime->setClassName("KDateTimeWidget");
#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,9)
- wDateTime->addAlternateClassName(TQDATETIMEEDIT_OBJECT_NAME_STRING);
+ wDateTime->addAlternateClassName("TQDateTimeEdit");
wDateTime->setIncludeFileName("kdatetimewidget.h");
#endif
wDateTime->setName(i18n("Date/Time Widget"));
@@ -385,7 +385,7 @@ StdWidgetFactory::createWidget(const TQCString &c, TQWidget *p, const char *n,
TQString text( container->form()->library()->textForWidgetName(n, c) );
const bool designMode = options & KFormDesigner::WidgetFactory::DesignViewMode;
- if(c == TQLABEL_OBJECT_NAME_STRING)
+ if(c == "TQLabel")
w = new TQLabel(text, p, n);
else if(c == "KexiPictureLabel")
w = new KexiPictureLabel(DesktopIcon("image-x-generic"), p, n);
@@ -399,10 +399,10 @@ StdWidgetFactory::createWidget(const TQCString &c, TQWidget *p, const char *n,
else if(c == "KPushButton")
w = new KPushButton(/*i18n("Button")*/text, p, n);
- else if(c == TQRADIOBUTTON_OBJECT_NAME_STRING)
+ else if(c == "TQRadioButton")
w = new TQRadioButton(/*i18n("Radio Button")*/text, p, n);
- else if(c == TQCHECKBOX_OBJECT_NAME_STRING)
+ else if(c == "TQCheckBox")
w = new TQCheckBox(/*i18n("Check Box")*/text, p, n);
else if(c == "KIntSpinBox")
@@ -424,7 +424,7 @@ StdWidgetFactory::createWidget(const TQCString &c, TQWidget *p, const char *n,
((TDEListView*)w)->addColumn(i18n("Column 1"));
((TDEListView*)w)->setRootIsDecorated(true);
}
- else if(c == TQSLIDER_OBJECT_NAME_STRING)
+ else if(c == "TQSlider")
w = new TQSlider(Qt::Horizontal, p, n);
else if(c == "KProgress")
@@ -470,7 +470,7 @@ bool
StdWidgetFactory::createMenuActions(const TQCString &classname, TQWidget *, TQPopupMenu *menu,
KFormDesigner::Container *)
{
- if((classname == TQLABEL_OBJECT_NAME_STRING) || (classname == "KTextEdit"))
+ if((classname == "TQLabel") || (classname == "KTextEdit"))
{
menu->insertItem(SmallIconSet("edit"), i18n("Edit Rich Text"), this, TQT_SLOT(editText()));
return true;
@@ -495,7 +495,7 @@ StdWidgetFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDes
createEditor(classname, lineedit->text(), lineedit, container, lineedit->geometry(), lineedit->alignment(), true);
return true;
}
- else if(classname == TQLABEL_OBJECT_NAME_STRING)
+ else if(classname == "TQLabel")
{
TQLabel *label = static_cast<TQLabel*>(w);
if(label->textFormat() == RichText)
@@ -520,7 +520,7 @@ StdWidgetFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDes
createEditor(classname, push->text(), push, container, editorRect, TQt::AlignCenter, false, false, TQt::PaletteButton);
return true;
}
- else if(classname == TQRADIOBUTTON_OBJECT_NAME_STRING)
+ else if(classname == "TQRadioButton")
{
TQRadioButton *radio = static_cast<TQRadioButton*>(w);
TQRect r = w->style().subRect(TQStyle::SR_RadioButtonContents, w);
@@ -528,7 +528,7 @@ StdWidgetFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDes
createEditor(classname, radio->text(), radio, container, editorRect, TQt::AlignAuto);
return true;
}
- else if(classname == TQCHECKBOX_OBJECT_NAME_STRING)
+ else if(classname == "TQCheckBox")
{
TQCheckBox *check = static_cast<TQCheckBox*>(w);
//TQRect r(check->geometry());
@@ -609,7 +609,7 @@ StdWidgetFactory::changeText(const TQString &text)
TQFontMetrics fm = w->fontMetrics();
TQSize s(fm.width( text ), fm.height());
int width;
- if(n == TQLABEL_OBJECT_NAME_STRING) // labels are resized to fit the text
+ if(n == "TQLabel") // labels are resized to fit the text
{
w->resize(w->sizeHint());
WidgetFactory::m_editor->resize(w->size());
@@ -618,9 +618,9 @@ StdWidgetFactory::changeText(const TQString &text)
// and other widgets are just enlarged if needed
else if(n == "KPushButton")
width = w->style().sizeFromContents( TQStyle::CT_PushButton, w, s).width();
- else if(n == TQCHECKBOX_OBJECT_NAME_STRING)
+ else if(n == "TQCheckBox")
width = w->style().sizeFromContents( TQStyle::CT_CheckBox, w, s).width();
- else if(n == TQRADIOBUTTON_OBJECT_NAME_STRING)
+ else if(n == "TQRadioButton")
width = w->style().sizeFromContents( TQStyle::CT_RadioButton, w, s).width();
else
return;
@@ -643,13 +643,13 @@ StdWidgetFactory::resizeEditor(TQWidget *editor, TQWidget *widget, const TQCStri
TQPoint p = widget->pos();
TQRect r;
- if(classname == TQRADIOBUTTON_OBJECT_NAME_STRING)
+ if(classname == "TQRadioButton")
{
r = widget->style().subRect(TQStyle::SR_RadioButtonContents, widget);
p += r.topLeft();
s.setWidth(r.width());
}
- else if(classname == TQCHECKBOX_OBJECT_NAME_STRING)
+ else if(classname == "TQCheckBox")
{
r = widget->style().subRect(TQStyle::SR_CheckBoxContents, widget);
p += r.topLeft();
@@ -863,7 +863,7 @@ StdWidgetFactory::isPropertyVisibleInternal(const TQCString &classname,
if((property == "text") || (property == "indent") || (property == "textFormat") || (property == "font") || (property == "alignment"))
return false;
}
- else if(classname == TQLABEL_OBJECT_NAME_STRING)
+ else if(classname == "TQLabel")
{
if(property == "pixmap")
return false;
@@ -890,11 +890,11 @@ StdWidgetFactory::isPropertyVisibleInternal(const TQCString &classname,
if((property == "frameShape") || (property == "font") || (property == "margin"))
return false;
}
- else if(classname==TQCHECKBOX_OBJECT_NAME_STRING)
+ else if(classname=="TQCheckBox")
{
ok = m_showAdvancedProperties || (property != "autoRepeat");
}
- else if(classname==TQRADIOBUTTON_OBJECT_NAME_STRING)
+ else if(classname=="TQRadioButton")
{
ok = m_showAdvancedProperties || (property != "autoRepeat");
}
@@ -911,7 +911,7 @@ StdWidgetFactory::autoSaveProperties(const TQCString &classname)
{
TQValueList<TQCString> l;
- if(classname == TQLABEL_OBJECT_NAME_STRING)
+ if(classname == "TQLabel")
l << "text";
if(classname == "KPushButton")
l << "text";
@@ -946,7 +946,7 @@ StdWidgetFactory::editText()
TQString text;
if(classname == "KTextEdit")
text = ((KTextEdit*)widget())->text();
- else if(classname == TQLABEL_OBJECT_NAME_STRING)
+ else if(classname == "TQLabel")
text = ((TQLabel*)widget())->text();
if(editRichText(widget(), text))
@@ -955,14 +955,14 @@ StdWidgetFactory::editText()
changeProperty("text", text, m_container->form());
}
- if(classname == TQLABEL_OBJECT_NAME_STRING)
+ if(classname == "TQLabel")
widget()->resize(widget()->sizeHint());
}
void
StdWidgetFactory::editListContents()
{
- if(widget()->inherits(TQLISTVIEW_OBJECT_NAME_STRING))
+ if(widget()->inherits("TQListView"))
editListView((TQListView*)widget());
}
diff --git a/kexi/formeditor/form.cpp b/kexi/formeditor/form.cpp
index b52c2087..66321cf1 100644
--- a/kexi/formeditor/form.cpp
+++ b/kexi/formeditor/form.cpp
@@ -268,10 +268,10 @@ Form::setSelectedWidget(TQWidget *w, bool add, bool dontRaise, bool moreWillBeSe
emitActionSignals(false);
// WidgetStack and TabWidget pages widgets shouldn't have resize handles, but their parent
- if(!FormManager::self()->isTopLevel(w) && w->parentWidget() && w->parentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING))
+ if(!FormManager::self()->isTopLevel(w) && w->parentWidget() && w->parentWidget()->isA("TQWidgetStack"))
{
w = w->parentWidget();
- if(w->parentWidget() && w->parentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING))
+ if(w->parentWidget() && w->parentWidget()->inherits("TQTabWidget"))
w = w->parentWidget();
}
diff --git a/kexi/formeditor/form.h b/kexi/formeditor/form.h
index 7f79cf79..e67f9cb4 100644
--- a/kexi/formeditor/form.h
+++ b/kexi/formeditor/form.h
@@ -154,7 +154,7 @@ class KFORMEDITOR_EXPORT Form : public TQObject
form->createToplevel(toplevel); \endcode
*/
void createToplevel(TQWidget *container, FormWidget *formWidget =0,
- const TQCString &classname=TQWIDGET_OBJECT_NAME_STRING);
+ const TQCString &classname="TQWidget");
/*! \return the toplevel Container or 0 if this is a preview Form or createToplevel()
has not been called yet. */
diff --git a/kexi/formeditor/formIO.cpp b/kexi/formeditor/formIO.cpp
index 503814d5..298c07f8 100644
--- a/kexi/formeditor/formIO.cpp
+++ b/kexi/formeditor/formIO.cpp
@@ -177,7 +177,7 @@ FormIO::saveFormToDom(Form *form, TQDomDocument &domDoc)
// We create the top class element
TQDomElement baseClass = domDoc.createElement("class");
uiElement.appendChild(baseClass);
- TQDomText baseClassV = domDoc.createTextNode(TQWIDGET_OBJECT_NAME_STRING);
+ TQDomText baseClassV = domDoc.createTextNode("TQWidget");
baseClass.appendChild(baseClassV);
// Save the toplevel widgets, and so the whole Form
@@ -952,11 +952,11 @@ FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &parent, TQDomDocument &do
}
if(!item->parent()) // Toplevel widget
- tclass.setAttribute("class", TQWIDGET_OBJECT_NAME_STRING);
- // For compatibility, HBox, VBox and Grid are saved as TQLAYOUTWIDGET_OBJECT_NAME_STRING
+ tclass.setAttribute("class", "TQWidget");
+ // For compatibility, HBox, VBox and Grid are saved as "TQLayoutWidget"
else if(item->widget()->isA("HBox") || item->widget()->isA("VBox") || item->widget()->isA("Grid")
|| item->widget()->isA("HFlow") || item->widget()->isA("VFlow"))
- tclass.setAttribute("class", TQLAYOUTWIDGET_OBJECT_NAME_STRING);
+ tclass.setAttribute("class", "TQLayoutWidget");
else if(item->widget()->isA("CustomWidget"))
tclass.setAttribute("class", item->className());
else // Normal widgets
@@ -983,7 +983,7 @@ FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &parent, TQDomDocument &do
savePropertyValue(tclass, domDoc, "geometry", item->widget()->property("geometry"), item->widget());
// Save the buddy widget for a label
- if(item->widget()->inherits(TQLABEL_OBJECT_NAME_STRING) && ((TQLabel*)item->widget())->buddy())
+ if(item->widget()->inherits("TQLabel") && ((TQLabel*)item->widget())->buddy())
savePropertyElement(tclass, domDoc, "property", "buddy", ((TQLabel*)item->widget())->buddy()->name());
// We save every property in the modifProp list of the ObjectTreeItem
@@ -1141,7 +1141,7 @@ FormIO::loadWidget(Container *container, const TQDomElement &el, TQWidget *paren
// We translate some name (for compatibility)
if(el.tagName() == "spacer")
classname = "Spring";
- else if(el.attribute("class") == TQLAYOUTWIDGET_OBJECT_NAME_STRING)
+ else if(el.attribute("class") == "TQLayoutWidget")
{
for(TQDomNode n = el.firstChild(); !n.isNull(); n = n.nextSibling())
{
diff --git a/kexi/formeditor/formmanager.cpp b/kexi/formeditor/formmanager.cpp
index 25f13b97..d502d5e8 100644
--- a/kexi/formeditor/formmanager.cpp
+++ b/kexi/formeditor/formmanager.cpp
@@ -291,7 +291,7 @@ FormManager::insertWidget(const TQCString &classname)
// form->d->cursors = new TQMap<TQString, TQCursor>();
if (form->toplevelContainer())
form->widget()->setCursor(TQCursor(CrossCursor));
- TQObjectList *l = form->widget()->queryList( TQWIDGET_OBJECT_NAME_STRING );
+ TQObjectList *l = form->widget()->queryList( "TQWidget" );
for(TQObject *o = l->first(); o; o = l->next())
{
if( ((TQWidget*)o)->ownCursor() )
@@ -322,7 +322,7 @@ FormManager::stopInsert()
for(form = m_forms.first(); form; form = m_forms.next())
{
form->widget()->unsetCursor();
- TQObjectList *l = form->widget()->queryList( TQWIDGET_OBJECT_NAME_STRING );
+ TQObjectList *l = form->widget()->queryList( "TQWidget" );
for(TQObject *o = l->first(); o; o = l->next())
{
TQT_TQWIDGET(o)->unsetCursor();
@@ -373,7 +373,7 @@ FormManager::startCreatingConnection()
form->widget()->setCursor(TQCursor(PointingHandCursor));
form->widget()->setMouseTracking(true);
}
- TQObjectList *l = form->widget()->queryList( TQWIDGET_OBJECT_NAME_STRING );
+ TQObjectList *l = form->widget()->queryList( "TQWidget" );
for(TQObject *o = l->first(); o; o = l->next())
{
TQWidget *w = TQT_TQWIDGET(o);
@@ -432,7 +432,7 @@ FormManager::stopCreatingConnection()
{
form->widget()->unsetCursor();
form->widget()->setMouseTracking(false);
- TQObjectList *l = form->widget()->queryList( TQWIDGET_OBJECT_NAME_STRING );
+ TQObjectList *l = form->widget()->queryList( "TQWidget" );
for(TQObject *o = l->first(); o; o = l->next())
{
TQWidget *w = (TQWidget*)o;
@@ -898,7 +898,7 @@ FormManager::createContextMenu(TQWidget *w, Container *container, bool popupAtCu
separatorNeeded = true;
// We create the buddy menu
- if(!multiple && w->inherits(TQLABEL_OBJECT_NAME_STRING) && ((TQLabel*)w)->text().contains("&") && (((TQLabel*)w)->textFormat() != RichText))
+ if(!multiple && w->inherits("TQLabel") && ((TQLabel*)w)->text().contains("&") && (((TQLabel*)w)->textFormat() != RichText))
{
if (separatorNeeded)
m_popup->insertSeparator();
@@ -1210,7 +1210,7 @@ FormManager::slotStyle()
TQString style = m_style->currentText();
activeForm()->widget()->setStyle( style );
- TQObjectList *l = activeForm()->widget()->queryList( TQWIDGET_OBJECT_NAME_STRING );
+ TQObjectList *l = activeForm()->widget()->queryList( "TQWidget" );
for(TQObject *o = l->first(); o; o = l->next())
(TQT_TQWIDGET(o))->setStyle( style );
delete l;
diff --git a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp
index 2dcf57b8..f4f7bdf9 100644
--- a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp
+++ b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp
@@ -538,7 +538,7 @@ KFormDesignerKDevPart::~KFormDesignerKDevPart()
//repaint all children widgets
static void repaintAll(TQWidget *w)
{
- TQObjectList *list = w->queryList(TQWIDGET_OBJECT_NAME_STRING);
+ TQObjectList *list = w->queryList("TQWidget");
TQObjectListIt it(*list);
for (TQObject *obj; (obj=it.current()); ++it ) {
static_cast<TQWidget*>(obj)->repaint();
diff --git a/kexi/formeditor/test/kfd_part.cpp b/kexi/formeditor/test/kfd_part.cpp
index 913ec051..735b9a9e 100644
--- a/kexi/formeditor/test/kfd_part.cpp
+++ b/kexi/formeditor/test/kfd_part.cpp
@@ -562,7 +562,7 @@ KFormDesignerPart::setRedoEnabled(bool enabled, const TQString &text)
static void repaintAll(TQWidget *w)
{
w->repaint();
- TQObjectList *list = w->queryList(TQWIDGET_OBJECT_NAME_STRING);
+ TQObjectList *list = w->queryList("TQWidget");
TQObjectListIt it(*list);
for (TQObject *obj; (obj=it.current()); ++it ) {
static_cast<TQWidget*>(obj)->repaint();
diff --git a/kexi/formeditor/utils.cpp b/kexi/formeditor/utils.cpp
index 53a9a15b..b04222f3 100644
--- a/kexi/formeditor/utils.cpp
+++ b/kexi/formeditor/utils.cpp
@@ -89,14 +89,14 @@ KFormDesigner::setRecursiveCursor(TQWidget *w, Form *form)
{
ObjectTreeItem *tree = form->objectTree()->lookup(w->name());
if(tree && ((tree->modifiedProperties()->contains("cursor")) || !tree->children()->isEmpty())
- && !w->inherits(TQLINEEDIT_OBJECT_NAME_STRING) && !w->inherits(TQTEXTEDIT_OBJECT_NAME_STRING)
+ && !w->inherits("TQLineEdit") && !w->inherits("TQTextEdit")
) //fix weird behaviour
return; // if the user has set a cursor for this widget or this is a container, don't change it
if(w->ownCursor())
w->setCursor(TQt::ArrowCursor);
- TQObjectList *l = w->queryList( TQWIDGET_OBJECT_NAME_STRING );
+ TQObjectList *l = w->queryList( "TQWidget" );
for(TQObject *o = l->first(); o; o = l->next())
((TQWidget*)o)->setCursor(TQt::ArrowCursor);
delete l;
diff --git a/kexi/formeditor/utils.h b/kexi/formeditor/utils.h
index 1e60f0f5..b28b0b4d 100644
--- a/kexi/formeditor/utils.h
+++ b/kexi/formeditor/utils.h
@@ -106,7 +106,7 @@ KFORMEDITOR_EXPORT void removeRecursiveEventFilter(TQObject *object, TQObject *c
KFORMEDITOR_EXPORT void setRecursiveCursor(TQWidget *w, Form *form);
/*! \return the size of \a w children. This can be used eg to get widget's sizeHint. */
-KFORMEDITOR_EXPORT TQSize getSizeFromChildren(TQWidget *widget, const char *inheritClass=TQWIDGET_OBJECT_NAME_STRING);
+KFORMEDITOR_EXPORT TQSize getSizeFromChildren(TQWidget *widget, const char *inheritClass="TQWidget");
}
diff --git a/kexi/formeditor/widgetfactory.cpp b/kexi/formeditor/widgetfactory.cpp
index b90193bc..14fd2665 100644
--- a/kexi/formeditor/widgetfactory.cpp
+++ b/kexi/formeditor/widgetfactory.cpp
@@ -431,7 +431,7 @@ WidgetFactory::resetEditor()
tree->eventEater()->setContainer(m_container);
if(m_widget) {// && !ed)
setRecursiveCursor(m_widget, m_container->form());
- if (m_widget->inherits(TQLINEEDIT_OBJECT_NAME_STRING) || m_widget->inherits(TQTEXTEDIT_OBJECT_NAME_STRING)) { //fix weird behaviour
+ if (m_widget->inherits("TQLineEdit") || m_widget->inherits("TQTextEdit")) { //fix weird behaviour
m_widget->unsetCursor();
m_widget->setCursor(TQt::ArrowCursor);
}
diff --git a/kexi/formeditor/widgetpropertyset.cpp b/kexi/formeditor/widgetpropertyset.cpp
index 20182689..99e6f511 100644
--- a/kexi/formeditor/widgetpropertyset.cpp
+++ b/kexi/formeditor/widgetpropertyset.cpp
@@ -833,7 +833,7 @@ WidgetPropertySet::createAlignProperty(const TQMetaProperty *meta, TQWidget *wid
if(possibleValues.find("WordBreak")!=possibleValues.constEnd()
// && isPropertyVisible("wordbreak", false, subwidget->className())
-// && !subWidget->inherits(TQLINEEDIT_OBJECT_NAME_STRING) /* TQLineEdit doesn't support 'word break' is this generic enough?*/
+// && !subWidget->inherits("TQLineEdit") /* TQLineEdit doesn't support 'word break' is this generic enough?*/
) {
// Create the wordbreak property
KoProperty::Property *p = new KoProperty::Property("wordbreak",
diff --git a/kexi/kexidb/field.h b/kexi/kexidb/field.h
index a99e845e..da719cc7 100644
--- a/kexi/kexidb/field.h
+++ b/kexi/kexidb/field.h
@@ -314,7 +314,7 @@ class KEXI_DB_EXPORT Field
/*! \return (optional) subtype for this field.
Subtype is a string providing additional hint for field's type.
E.g. for BLOB type, it can be a MIME type or certain TQVariant type name,
- for example: TQPIXMAP_OBJECT_NAME_STRING, "TQColor" or "TQFont" */
+ for example: "TQPixmap", "TQColor" or "TQFont" */
inline TQString subType() const { return m_subType; }
/*! Sets (optional) subtype for this field.
diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp
index bede2259..1c313ba2 100644
--- a/kexi/main/keximainwindowimpl.cpp
+++ b/kexi/main/keximainwindowimpl.cpp
@@ -290,7 +290,7 @@ KexiMainWindowImpl::KexiMainWindowImpl()
}
{//store menu popups list
- TQObjectList *l = queryList( TQPOPUPMENU_OBJECT_NAME_STRING );
+ TQObjectList *l = queryList( "TQPopupMenu" );
for (TQObjectListIt it( *l ); it.current(); ++it ) {
//kdDebug() << "name=" <<it.current()->name() << " cname="<<it.current()->className()<<endl;
//KexiMainWindowImpl::eventFilter() will filter our popups:
@@ -3440,7 +3440,7 @@ bool KexiMainWindowImpl::eventFilter( TQObject *obj, TQEvent * e )
}*/
TQWidget *focus_w = 0;
- if (obj->inherits(TQPOPUPMENU_OBJECT_NAME_STRING)) {
+ if (obj->inherits("TQPopupMenu")) {
/* Fixes for popup menus behaviour:
For hiding/showing: focus previously (d->focus_before_popup)
focused window, if known, otherwise focus currently focused one.
diff --git a/kexi/main/startup/KexiStartupFileDialog.cpp b/kexi/main/startup/KexiStartupFileDialog.cpp
index defa2e06..8f445737 100644
--- a/kexi/main/startup/KexiStartupFileDialog.cpp
+++ b/kexi/main/startup/KexiStartupFileDialog.cpp
@@ -55,7 +55,7 @@ KexiStartupFileDialog::KexiStartupFileDialog(
//dirty hack to customize filedialog view:
{
- TQObjectList *l = queryList( TQPUSHBUTTON_OBJECT_NAME_STRING );
+ TQObjectList *l = queryList( "TQPushButton" );
TQObjectListIt it( *l );
TQObject *obj;
while ( (obj = it.current()) != 0 ) {
@@ -65,7 +65,7 @@ KexiStartupFileDialog::KexiStartupFileDialog(
delete l;
}
{
- TQObjectList *l = queryList(TQWIDGET_OBJECT_NAME_STRING);
+ TQObjectList *l = queryList("TQWidget");
TQObjectListIt it( *l );
TQObject *obj;
while ( (obj = it.current()) != 0 ) {
diff --git a/kexi/main/startup/KexiStartupFileDialog_win.cpp b/kexi/main/startup/KexiStartupFileDialog_win.cpp
index 1432ac3c..aac7b271 100644
--- a/kexi/main/startup/KexiStartupFileDialog_win.cpp
+++ b/kexi/main/startup/KexiStartupFileDialog_win.cpp
@@ -61,10 +61,10 @@ KexiStartupFileDialogBase::KexiStartupFileDialogBase(
init(_dirName, filter, parent);
//find "OK" button
- TQObjectList *l = queryList( TQPUSHBUTTON_OBJECT_NAME_STRING, "OK", false );
+ TQObjectList *l = queryList( "TQPushButton", "OK", false );
m_okBtn = dynamic_cast<TQPushButton*>(l->first());
delete l;
- l = queryList( TQLINEEDIT_OBJECT_NAME_STRING, "name/filter editor", false );
+ l = queryList( "TQLineEdit", "name/filter editor", false );
m_lineEdit = dynamic_cast<TQLineEdit*>(l->first());
delete l;
diff --git a/kexi/plugins/forms/kexidataprovider.cpp b/kexi/plugins/forms/kexidataprovider.cpp
index 637c9434..c8594e22 100644
--- a/kexi/plugins/forms/kexidataprovider.cpp
+++ b/kexi/plugins/forms/kexidataprovider.cpp
@@ -56,7 +56,7 @@ void KexiFormDataProvider::setMainDataSourceWidget(TQWidget* mainWidget)
return;
//find widgets whose will work as data items
- TQObjectList *l = m_mainWidget->queryList( TQWIDGET_OBJECT_NAME_STRING );
+ TQObjectList *l = m_mainWidget->queryList( "TQWidget" );
TQObjectListIt it( *l );
TQObject *obj;
TQDict<char> tmpSources;
diff --git a/kexi/plugins/forms/kexidbfactory.cpp b/kexi/plugins/forms/kexidbfactory.cpp
index 1154e110..19241a36 100644
--- a/kexi/plugins/forms/kexidbfactory.cpp
+++ b/kexi/plugins/forms/kexidbfactory.cpp
@@ -101,7 +101,7 @@ KexiDBFactory::KexiDBFactory(TQObject *parent, const char *name, const TQStringL
wi = new KexiDataAwareWidgetInfo(this, "stdwidgets", "KLineEdit");
wi->setPixmap("lineedit");
wi->setClassName("KexiDBLineEdit");
- wi->addAlternateClassName(TQLINEEDIT_OBJECT_NAME_STRING, true/*override*/);
+ wi->addAlternateClassName("TQLineEdit", true/*override*/);
wi->addAlternateClassName("KLineEdit", true/*override*/);
wi->setIncludeFileName("klineedit.h");
wi->setName(i18n("Text Box"));
@@ -115,7 +115,7 @@ KexiDBFactory::KexiDBFactory(TQObject *parent, const char *name, const TQStringL
wi = new KexiDataAwareWidgetInfo(this, "stdwidgets", "KTextEdit");
wi->setPixmap("textedit");
wi->setClassName("KexiDBTextEdit");
- wi->addAlternateClassName(TQTEXTEDIT_OBJECT_NAME_STRING, true/*override*/);
+ wi->addAlternateClassName("TQTextEdit", true/*override*/);
wi->addAlternateClassName("KTextEdit", true/*override*/);
wi->setIncludeFileName("ktextedit.h");
wi->setName(i18n("Text Editor"));
@@ -126,10 +126,10 @@ KexiDBFactory::KexiDBFactory(TQObject *parent, const char *name, const TQStringL
addClass(wi);
wi = new KFormDesigner::WidgetInfo(
- this, "containers", TQFRAME_OBJECT_NAME_STRING /*we're inheriting to get i18n'd strings already translated there*/);
+ this, "containers", "TQFrame" /*we're inheriting to get i18n'd strings already translated there*/);
wi->setPixmap("frame");
wi->setClassName("KexiFrame");
- wi->addAlternateClassName(TQFRAME_OBJECT_NAME_STRING, true/*override*/);
+ wi->addAlternateClassName("TQFrame", true/*override*/);
wi->setName(i18n("Frame"));
wi->setNamePrefix(
i18n("Widget name. This string will be used to name widgets of this class. "
@@ -138,10 +138,10 @@ KexiDBFactory::KexiDBFactory(TQObject *parent, const char *name, const TQStringL
addClass(wi);
wi = new KexiDataAwareWidgetInfo(
- this, "stdwidgets", TQLABEL_OBJECT_NAME_STRING /*we're inheriting to get i18n'd strings already translated there*/);
+ this, "stdwidgets", "TQLabel" /*we're inheriting to get i18n'd strings already translated there*/);
wi->setPixmap("label");
wi->setClassName("KexiDBLabel");
- wi->addAlternateClassName(TQLABEL_OBJECT_NAME_STRING, true/*override*/);
+ wi->addAlternateClassName("TQLabel", true/*override*/);
wi->addAlternateClassName("KexiLabel", true/*override*/); //older
wi->setName(i18n("Text Label", "Label"));
wi->setNamePrefix(
@@ -184,10 +184,10 @@ KexiDBFactory::KexiDBFactory(TQObject *parent, const char *name, const TQStringL
addClass(wi);
#endif
- wi = new KexiDataAwareWidgetInfo(this, "stdwidgets", TQCHECKBOX_OBJECT_NAME_STRING);
+ wi = new KexiDataAwareWidgetInfo(this, "stdwidgets", "TQCheckBox");
wi->setPixmap("check");
wi->setClassName("KexiDBCheckBox");
- wi->addAlternateClassName(TQCHECKBOX_OBJECT_NAME_STRING, true/*override*/);
+ wi->addAlternateClassName("TQCheckBox", true/*override*/);
wi->setName(i18n("Check Box"));
wi->setNamePrefix(
i18n("Widget name. This string will be used to name widgets of this class. "
@@ -213,11 +213,11 @@ KexiDBFactory::KexiDBFactory(TQObject *parent, const char *name, const TQStringL
#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,9)
KexiDataAwareWidgetInfo *wDate = new KexiDataAwareWidgetInfo(this, "stdwidgets", "KDateWidget");
#else
- KexiDataAwareWidgetInfo *wDate = new KexiDataAwareWidgetInfo(this, "stdwidgets", TQDATEEDIT_OBJECT_NAME_STRING);
+ KexiDataAwareWidgetInfo *wDate = new KexiDataAwareWidgetInfo(this, "stdwidgets", "TQDateEdit");
#endif
wDate->setPixmap("dateedit");
wDate->setClassName("KexiDBDateEdit");
- wDate->addAlternateClassName(TQDATEEDIT_OBJECT_NAME_STRING, true);//override
+ wDate->addAlternateClassName("TQDateEdit", true);//override
wDate->addAlternateClassName("KDateWidget", true);//override
wDate->setName(i18n("Date Widget"));
wDate->setNamePrefix(
@@ -228,11 +228,11 @@ KexiDBFactory::KexiDBFactory(TQObject *parent, const char *name, const TQStringL
#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,9)
KexiDataAwareWidgetInfo *wTime = new KexiDataAwareWidgetInfo(this, "stdwidgets", "KTimeWidget");
#else
- KexiDataAwareWidgetInfo *wTime = new KexiDataAwareWidgetInfo(this, "stdwidgets", TQTIMEEDIT_OBJECT_NAME_STRING);
+ KexiDataAwareWidgetInfo *wTime = new KexiDataAwareWidgetInfo(this, "stdwidgets", "TQTimeEdit");
#endif
wTime->setPixmap("timeedit");
wTime->setClassName("KexiDBTimeEdit");
- wTime->addAlternateClassName(TQTIMEEDIT_OBJECT_NAME_STRING, true);//override
+ wTime->addAlternateClassName("TQTimeEdit", true);//override
wTime->addAlternateClassName("KTimeWidget", true);//override
wTime->setName(i18n("Time Widget"));
wTime->setNamePrefix(
@@ -247,7 +247,7 @@ KexiDBFactory::KexiDBFactory(TQObject *parent, const char *name, const TQStringL
#endif
wDateTime->setPixmap("datetimeedit");
wDateTime->setClassName("KexiDBDateTimeEdit");
- wDateTime->addAlternateClassName(TQDATETIMEEDIT_OBJECT_NAME_STRING, true);//override
+ wDateTime->addAlternateClassName("TQDateTimeEdit", true);//override
wDateTime->addAlternateClassName("KDateTimeWidget", true);//override
wDateTime->setName(i18n("Date/Time Widget"));
wDateTime->setNamePrefix(
@@ -259,7 +259,7 @@ KexiDBFactory::KexiDBFactory(TQObject *parent, const char *name, const TQStringL
/* KexiDataAwareWidgetInfo *wIntSpinBox = new KexiDataAwareWidgetInfo(this, "stdwidgets", "KIntSpinBox");
wIntSpinBox->setPixmap("spin");
wIntSpinBox->setClassName("KexiDBIntSpinBox");
- wIntSpinBox->addAlternateClassName(TQSPINBOX_OBJECT_NAME_STRING, true);
+ wIntSpinBox->addAlternateClassName("TQSpinBox", true);
wIntSpinBox->addAlternateClassName("KIntSpinBox", true);
wIntSpinBox->setName(i18n("Integer Number Spin Box"));
wIntSpinBox->setNamePrefix(
@@ -374,7 +374,7 @@ KexiDBFactory::createWidget(const TQCString &c, TQWidget *p, const char *n,
if (designMode)
w->setCursor(TQCursor(TQt::ArrowCursor));
}
- else if(c == TQFRAME_OBJECT_NAME_STRING || c == "KexiFrame")
+ else if(c == "TQFrame" || c == "KexiFrame")
{
w = new KexiFrame(p, n);
new KFormDesigner::Container(container, w, container);
@@ -415,7 +415,7 @@ bool
KexiDBFactory::createMenuActions(const TQCString &classname, TQWidget *w, TQPopupMenu *menu,
KFormDesigner::Container *)
{
- if(classname == TQPUSHBUTTON_OBJECT_NAME_STRING || classname == "KPushButton" || classname == "KexiPushButton")
+ if(classname == "TQPushButton" || classname == "KPushButton" || classname == "KexiPushButton")
{
/*! @todo also call createMenuActions() for inherited factory! */
m_assignAction->plug( menu );
diff --git a/kexi/plugins/forms/kexiformpart.cpp b/kexi/plugins/forms/kexiformpart.cpp
index 0b5f83ef..cce155d4 100644
--- a/kexi/plugins/forms/kexiformpart.cpp
+++ b/kexi/plugins/forms/kexiformpart.cpp
@@ -262,10 +262,10 @@ KexiFormPart::generateForm(KexiDB::FieldList *list, TQDomDocument &domDoc)
TQDomElement baseClass = domDoc.createElement("class");
uiElement.appendChild(baseClass);
- TQDomText baseClassV = domDoc.createTextNode(TQWIDGET_OBJECT_NAME_STRING);
+ TQDomText baseClassV = domDoc.createTextNode("TQWidget");
baseClass.appendChild(baseClassV);
TQDomElement baseWidget = domDoc.createElement("widget");
- baseWidget.setAttribute("class", TQWIDGET_OBJECT_NAME_STRING);
+ baseWidget.setAttribute("class", "TQWidget");
int y=0;
@@ -273,7 +273,7 @@ KexiFormPart::generateForm(KexiDB::FieldList *list, TQDomDocument &domDoc)
{
TQDomElement lclass = domDoc.createElement("widget");
baseWidget.appendChild(lclass);
- lclass.setAttribute("class", TQLABEL_OBJECT_NAME_STRING);
+ lclass.setAttribute("class", "TQLabel");
TQDomElement lNameProperty = domDoc.createElement("property");
lNameProperty.setAttribute("name", "name");
TQDomElement lType = domDoc.createElement("cstring");
diff --git a/kexi/plugins/forms/widgets/kexidbcombobox.cpp b/kexi/plugins/forms/widgets/kexidbcombobox.cpp
index cf6e5cc3..c7a378df 100644
--- a/kexi/plugins/forms/widgets/kexidbcombobox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbcombobox.cpp
@@ -197,7 +197,7 @@ void KexiDBComboBox::createEditor()
d->subWidgetsWithDisabledEvents = new TQPtrDict<char>();
d->subWidgetsWithDisabledEvents->insert(m_subwidget, (char*)1);
m_subwidget->installEventFilter(this);
- TQObjectList *l = m_subwidget->queryList( TQWIDGET_OBJECT_NAME_STRING );
+ TQObjectList *l = m_subwidget->queryList( "TQWidget" );
for ( TQObjectListIt it( *l ); it.current(); ++it ) {
d->subWidgetsWithDisabledEvents->insert(it.current(), (char*)1);
it.current()->installEventFilter(this);
diff --git a/kexi/plugins/forms/widgets/kexidbform.cpp b/kexi/plugins/forms/widgets/kexidbform.cpp
index 17242953..980e384d 100644
--- a/kexi/plugins/forms/widgets/kexidbform.cpp
+++ b/kexi/plugins/forms/widgets/kexidbform.cpp
@@ -128,7 +128,7 @@ KexiDataAwareObjectInterface* KexiDBForm::dataAwareObject() const { return d->da
//repaint all children widgets
static void repaintAll(TQWidget *w)
{
- TQObjectList *list = w->queryList(TQWIDGET_OBJECT_NAME_STRING);
+ TQObjectList *list = w->queryList("TQWidget");
TQObjectListIt it(*list);
for (TQObject *obj; (obj=it.current()); ++it ) {
TQT_TQWIDGET(obj)->repaint();
@@ -314,7 +314,7 @@ void KexiDBForm::updateTabStopsOrder(KFormDesigner::Form* form)
//this widget has tab focus:
it.current()->widget()->installEventFilter(this);
//also filter events for data-aware children of this widget (i.e. KexiDBAutoField's editors)
- TQObjectList *children = it.current()->widget()->queryList(TQWIDGET_OBJECT_NAME_STRING);
+ TQObjectList *children = it.current()->widget()->queryList("TQWidget");
for (TQObjectListIt childrenIt(*children); childrenIt.current(); ++childrenIt) {
// if (dynamic_cast<KexiFormDataItemInterface*>(childrenIt.current())) {
kexipluginsdbg << "KexiDBForm::updateTabStopsOrder(): also adding '"
@@ -404,7 +404,7 @@ bool KexiDBForm::eventFilter( TQObject * watched, TQEvent * e )
if (!tab && !backtab) {
//for buttons, left/up and right/down keys act like tab/backtab (see qbutton.cpp)
- if (realWidget->inherits(TQBUTTON_OBJECT_NAME_STRING)) {
+ if (realWidget->inherits("TQButton")) {
if (ke->state() == Qt::NoButton && (key == TQt::Key_Right || key == TQt::Key_Down))
tab = true;
else if (ke->state() == Qt::NoButton && (key == TQt::Key_Left || key == TQt::Key_Up))
diff --git a/kexi/plugins/macros/lib/metamethod.cpp b/kexi/plugins/macros/lib/metamethod.cpp
index 6642c706..364b5347 100644
--- a/kexi/plugins/macros/lib/metamethod.cpp
+++ b/kexi/plugins/macros/lib/metamethod.cpp
@@ -262,7 +262,7 @@ TDESharedPtr<Variable> MetaMethod::toVariable(TQUObject* uo)
return new Variable();
}
- if(desc == TQSTRING_OBJECT_NAME_STRING) {
+ if(desc == "TQString") {
const TQString s = static_TQUType_TQString.get(uo);
return new Variable(s);
}
diff --git a/kexi/plugins/reports/kexireportform.cpp b/kexi/plugins/reports/kexireportform.cpp
index cacf40b7..27e21025 100644
--- a/kexi/plugins/reports/kexireportform.cpp
+++ b/kexi/plugins/reports/kexireportform.cpp
@@ -43,7 +43,7 @@ KexiReportForm::~KexiReportForm()
//repaint all children widgets
static void repaintAll(TQWidget *w)
{
- TQObjectList *list = w->queryList(TQWIDGET_OBJECT_NAME_STRING);
+ TQObjectList *list = w->queryList("TQWidget");
TQObjectListIt it(*list);
for (TQObject *obj; (obj=it.current()); ++it ) {
static_cast<TQWidget*>(obj)->repaint();
diff --git a/kexi/plugins/scripting/kexidb/kexidbfield.h b/kexi/plugins/scripting/kexidb/kexidbfield.h
index 4cc85f38..a5027192 100644
--- a/kexi/plugins/scripting/kexidb/kexidbfield.h
+++ b/kexi/plugins/scripting/kexidb/kexidbfield.h
@@ -51,7 +51,7 @@ namespace Kross { namespace KexiDB {
/** Returns the optional subtype for this field. Subtype is a string providing
additional hint for field's type. E.g. for BLOB type, it can be a MIME type or
- certain TQVariant type name, for example: TQPIXMAP_OBJECT_NAME_STRING, "TQColor" or "TQFont". */
+ certain TQVariant type name, for example: "TQPixmap", "TQColor" or "TQFont". */
const TQString subType();
/** Sets the optional subtype for this field. */
void setSubType(const TQString& subtype);
diff --git a/kexi/widget/kexiscrollview.cpp b/kexi/widget/kexiscrollview.cpp
index 59fddb06..6b9a819f 100644
--- a/kexi/widget/kexiscrollview.cpp
+++ b/kexi/widget/kexiscrollview.cpp
@@ -253,7 +253,7 @@ KexiScrollView::contentsMouseMoveEvent(TQMouseEvent *ev)
tmpy = contentsY();
// we look for the max widget right() (or bottom()), which would be the limit for form resizing (not to hide widgets)
- TQObjectList *list = m_widget->queryList(TQWIDGET_OBJECT_NAME_STRING, 0, true, false /* not recursive*/);
+ TQObjectList *list = m_widget->queryList("TQWidget", 0, true, false /* not recursive*/);
for(TQObject *o = list->first(); o; o = list->next())
{
TQWidget *w = (TQWidget*)o;
diff --git a/kexi/widget/kexisectionheader.cpp b/kexi/widget/kexisectionheader.cpp
index cbd48e84..f36dfe47 100644
--- a/kexi/widget/kexisectionheader.cpp
+++ b/kexi/widget/kexisectionheader.cpp
@@ -101,7 +101,7 @@ void KexiSectionHeader::addButton(const TQString& icon, const TQString& toolTip,
bool KexiSectionHeader::eventFilter( TQObject *o, TQEvent *e )
{
- if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->lbl) && e->type()==TQEvent::MouseButtonRelease) {//|| e->type()==TQEvent::FocusOut) {// && o->inherits(TQWIDGET_OBJECT_NAME_STRING)) {
+ if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->lbl) && e->type()==TQEvent::MouseButtonRelease) {//|| e->type()==TQEvent::FocusOut) {// && o->inherits("TQWidget")) {
if (d->lyr->view)
d->lyr->view->setFocus();
// if (KexiUtils::hasParent( this, static_cast<TQWidget*>(o))) {
diff --git a/kexi/widget/tableview/kexitableview.cpp b/kexi/widget/tableview/kexitableview.cpp
index f054f084..c1405c1d 100644
--- a/kexi/widget/tableview/kexitableview.cpp
+++ b/kexi/widget/tableview/kexitableview.cpp
@@ -2476,7 +2476,7 @@ bool KexiTableView::eventFilter( TQObject *o, TQEvent *e )
}
d->recentCellWithToolTip = TQPoint(-1,-1);
}
-/* else if (e->type()==TQEvent::FocusOut && o->inherits(TQWIDGET_OBJECT_NAME_STRING)) {
+/* else if (e->type()==TQEvent::FocusOut && o->inherits("TQWidget")) {
//hp==true if currently focused widget is a child of this table view
const bool hp = KexiUtils::hasParent( static_cast<TQWidget*>(o), focusWidget());
if (!hp && KexiUtils::hasParent( this, static_cast<TQWidget*>(o))) {
diff --git a/kexi/widget/utils/kexigradientwidget.cpp b/kexi/widget/utils/kexigradientwidget.cpp
index d93b13ff..92f53c60 100644
--- a/kexi/widget/utils/kexigradientwidget.cpp
+++ b/kexi/widget/utils/kexigradientwidget.cpp
@@ -55,11 +55,11 @@ bool KexiGradientWidget::isValidChildWidget( TQObject* child ) {
if ( wgt == 0L )
return false;
- if ( wgt->inherits( TQSCROLLVIEW_OBJECT_NAME_STRING ) )
+ if ( wgt->inherits( "TQScrollView" ) )
return false;
- if ( wgt->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) )
+ if ( wgt->inherits( "TQComboBox" ) )
return false;
- if ( wgt->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) )
+ if ( wgt->inherits( "TQLineEdit" ) )
return false;
if ( wgt->inherits( "KexiDBForm" ) )
return false;
@@ -68,7 +68,7 @@ bool KexiGradientWidget::isValidChildWidget( TQObject* child ) {
}
void KexiGradientWidget::buildChildrenList( WidgetList& list, TQWidget* p ) {
- TQObjectList* objects = p->queryList( TQWIDGET_OBJECT_NAME_STRING, 0, false, false );
+ TQObjectList* objects = p->queryList( "TQWidget", 0, false, false );
for ( TQObjectList::Iterator it = objects->begin(); it != objects->end(); ++it ) {
if ( isValidChildWidget( ( *it ) ) == false )
diff --git a/kexi/widget/utils/kexirecordnavigator.cpp b/kexi/widget/utils/kexirecordnavigator.cpp
index 18d1b09c..6579fc42 100644
--- a/kexi/widget/utils/kexirecordnavigator.cpp
+++ b/kexi/widget/utils/kexirecordnavigator.cpp
@@ -71,7 +71,7 @@ KexiRecordNavigator::KexiRecordNavigator(TQWidget *parent, int leftMargin, const
, m_isInsertingEnabled(true)
, d( new KexiRecordNavigatorPrivate() )
{
- if (parent->inherits(TQSCROLLVIEW_OBJECT_NAME_STRING))
+ if (parent->inherits("TQScrollView"))
setParentView( dynamic_cast<TQScrollView*>(parent) );
setFrameStyle(TQFrame::NoFrame);
d->lyr = new TQHBoxLayout(this,0,0,"nav_lyr");
diff --git a/kivio/kiviopart/kivioarrowheadaction.cpp b/kivio/kiviopart/kivioarrowheadaction.cpp
index 31c2c5b3..8d7beefa 100644
--- a/kivio/kiviopart/kivioarrowheadaction.cpp
+++ b/kivio/kiviopart/kivioarrowheadaction.cpp
@@ -85,7 +85,7 @@ int KivioArrowHeadAction::plug( TQWidget* widget, int index)
if (kapp && !kapp->authorizeTDEAction(name()))
return -1;
kdDebug(129) << "TDEAction::plug( " << widget << ", " << index << " )" << endl; // remove -- ellis
- if ( widget->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) )
+ if ( widget->inherits("TQPopupMenu") )
{
TQPopupMenu* menu = static_cast<TQPopupMenu*>( widget );
int id;
@@ -139,7 +139,7 @@ int KivioArrowHeadAction::plug( TQWidget* widget, int index)
return containerCount() - 1;
}
- else if ( widget->inherits( TQMENUBAR_OBJECT_NAME_STRING ) )
+ else if ( widget->inherits( "TQMenuBar" ) )
{
TQMenuBar *bar = static_cast<TQMenuBar *>( widget );
diff --git a/kivio/kiviopart/kiviostencilsetaction.cpp b/kivio/kiviopart/kiviostencilsetaction.cpp
index d8d08d89..5d004082 100644
--- a/kivio/kiviopart/kiviostencilsetaction.cpp
+++ b/kivio/kiviopart/kiviostencilsetaction.cpp
@@ -98,7 +98,7 @@ int KivioStencilSetAction::plug( TQWidget* widget, int index)
if (kapp && !kapp->authorizeTDEAction(name()))
return -1;
kdDebug(129) << "TDEAction::plug( " << widget << ", " << index << " )" << endl; // remove -- ellis
- if ( widget->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) )
+ if ( widget->inherits("TQPopupMenu") )
{
TQPopupMenu* menu = static_cast<TQPopupMenu*>( widget );
int id;
@@ -152,7 +152,7 @@ int KivioStencilSetAction::plug( TQWidget* widget, int index)
return containerCount() - 1;
}
- else if ( widget->inherits( TQMENUBAR_OBJECT_NAME_STRING ) )
+ else if ( widget->inherits( "TQMenuBar" ) )
{
TQMenuBar *bar = static_cast<TQMenuBar *>( widget );
diff --git a/kivio/plugins/kivioconnectortool/plugin.h b/kivio/plugins/kivioconnectortool/plugin.h
index 7afc83ce..cc09afcf 100644
--- a/kivio/plugins/kivioconnectortool/plugin.h
+++ b/kivio/plugins/kivioconnectortool/plugin.h
@@ -34,7 +34,7 @@ public:
~ConnectorToolFactory();
virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0,
- const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
+ const char* classname = "TQObject", const TQStringList &args = TQStringList() );
static TDEInstance* global();
diff --git a/kivio/plugins/kivioselecttool/plugin.h b/kivio/plugins/kivioselecttool/plugin.h
index ee901dd3..c4e612c1 100644
--- a/kivio/plugins/kivioselecttool/plugin.h
+++ b/kivio/plugins/kivioselecttool/plugin.h
@@ -34,7 +34,7 @@ public:
~SelectToolFactory();
virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0,
- const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
+ const char* classname = "TQObject", const TQStringList &args = TQStringList() );
static TDEInstance* global();
diff --git a/kivio/plugins/kiviosmlconnector/plugin.h b/kivio/plugins/kiviosmlconnector/plugin.h
index 54c81ebc..5ac52f5e 100644
--- a/kivio/plugins/kiviosmlconnector/plugin.h
+++ b/kivio/plugins/kiviosmlconnector/plugin.h
@@ -34,7 +34,7 @@ public:
~SMLConnectorFactory();
virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0,
- const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
+ const char* classname = "TQObject", const TQStringList &args = TQStringList() );
static TDEInstance* global();
diff --git a/kivio/plugins/kiviotargettool/kiviotargettoolfactory.h b/kivio/plugins/kiviotargettool/kiviotargettoolfactory.h
index 091cba2d..e6ead8aa 100644
--- a/kivio/plugins/kiviotargettool/kiviotargettoolfactory.h
+++ b/kivio/plugins/kiviotargettool/kiviotargettoolfactory.h
@@ -35,7 +35,7 @@ class KivioTargetToolFactory : public KLibFactory
~KivioTargetToolFactory();
virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0,
- const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
+ const char* classname = "TQObject", const TQStringList &args = TQStringList() );
static TDEInstance* global();
diff --git a/kivio/plugins/kiviotexttool/plugin.h b/kivio/plugins/kiviotexttool/plugin.h
index 4eaa9cc6..681f40d7 100644
--- a/kivio/plugins/kiviotexttool/plugin.h
+++ b/kivio/plugins/kiviotexttool/plugin.h
@@ -34,7 +34,7 @@ public:
~TextToolFactory();
virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0,
- const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
+ const char* classname = "TQObject", const TQStringList &args = TQStringList() );
static TDEInstance* global();
diff --git a/kivio/plugins/kiviozoomtool/plugin.h b/kivio/plugins/kiviozoomtool/plugin.h
index 4b2d8038..8db8e531 100644
--- a/kivio/plugins/kiviozoomtool/plugin.h
+++ b/kivio/plugins/kiviozoomtool/plugin.h
@@ -34,7 +34,7 @@ public:
~ZoomToolFactory();
virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0,
- const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
+ const char* classname = "TQObject", const TQStringList &args = TQStringList() );
static TDEInstance* global();
private:
diff --git a/kspread/kspread_view.cpp b/kspread/kspread_view.cpp
index 519e4425..f054cbba 100644
--- a/kspread/kspread_view.cpp
+++ b/kspread/kspread_view.cpp
@@ -6007,7 +6007,7 @@ void View::openPopupMenu( const TQPoint & _point )
{
d->popupMenuFirstToolId = 10;
int i = 0;
- TQValueList<KDataToolInfo> tools = KDataToolInfo::query( TQSTRING_OBJECT_NAME_STRING, "text/plain", doc()->instance() );
+ TQValueList<KDataToolInfo> tools = KDataToolInfo::query( "TQString", "text/plain", doc()->instance() );
if ( tools.count() > 0 )
{
d->popupMenu->insertSeparator();
@@ -6058,7 +6058,7 @@ void View::slotActivateTool( int _id )
TQString text = activeSheet()->getWordSpelling( selectionInfo() );
- if ( tool->run( entry->command, &text, TQSTRING_OBJECT_NAME_STRING, "text/plain") )
+ if ( tool->run( entry->command, &text, "TQString", "text/plain") )
{
doc()->emitBeginOperation(false);
diff --git a/kspread/plugins/calculator/main.h b/kspread/plugins/calculator/main.h
index dd4d456f..8aade302 100644
--- a/kspread/plugins/calculator/main.h
+++ b/kspread/plugins/calculator/main.h
@@ -46,7 +46,7 @@ public:
~CalcFactory();
virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0,
- const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
+ const char* classname = "TQObject", const TQStringList &args = TQStringList() );
static TDEInstance* global();
diff --git a/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py b/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py
index e23b9c56..22959809 100755
--- a/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py
+++ b/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py
@@ -658,7 +658,7 @@ class Samples:
'd = dcopext.DCOPApp(apps[0], dcopclient)',
'result,typename,data = d.appclient.call(apps[0],"klipper","getClipboardContents()","")',
'ds = tqt.TQDataStream(data, tqt.IO_ReadOnly)',
- 'print("Clipboard content:\\n%s" % tdecore.dcop_next(ds, TQSTRING_OBJECT_NAME_STRING))',
+ 'print("Clipboard content:\\n%s" % tdecore.dcop_next(ds, "TQString"))',
)
class AmarokCollectionInfos:
@@ -708,7 +708,7 @@ class Samples:
'if not state: raise Exception("Failed to call the kopete contacts-function")',
'',
'ds = tqt.TQDataStream(rdata.data(), tqt.IO_ReadOnly)',
- 'sl = tdecore.dcop_next (ds, TQSTRINGLIST_OBJECT_NAME_STRING)',
+ 'sl = tdecore.dcop_next (ds, "TQStringList")',
'print("contacts=%s" % [ str(s) for s in sl ])',
)
@@ -759,7 +759,7 @@ class Samples:
'',
'# Get the selected text.',
'(state,rtype,rdata) = d.appclient.call(appname, frameset.obj(), "selectedText()", "")',
- 'print("Selected Text: %s" % dataToList( rdata,[TQSTRING_OBJECT_NAME_STRING] )[0])',
+ 'print("Selected Text: %s" % dataToList( rdata,["TQString"] )[0])',
)
####################################################################################
diff --git a/lib/kformula/symbolaction.cpp b/lib/kformula/symbolaction.cpp
index 8fe3d8f8..08c5ac7b 100644
--- a/lib/kformula/symbolaction.cpp
+++ b/lib/kformula/symbolaction.cpp
@@ -159,7 +159,7 @@ void SymbolAction::updateItems( int id )
TQWidget *w = container( id );
if ( w->inherits( "TDEToolBar" ) ) {
TQWidget *r = static_cast<TDEToolBar*>( w )->getWidget( itemId( id ) );
- if ( r->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) {
+ if ( r->inherits( "TQComboBox" ) ) {
TQComboBox *cb = static_cast<TQComboBox*>( r );
cb->clear();
diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp
index b8dbea81..e465ce77 100644
--- a/lib/kofficecore/KoDocument.cpp
+++ b/lib/kofficecore/KoDocument.cpp
@@ -182,7 +182,7 @@ public:
virtual void resizeEvent( TQResizeEvent * )
{
- TQObject *wid = child( 0, TQWIDGET_OBJECT_NAME_STRING );
+ TQObject *wid = child( 0, "TQWidget" );
if ( wid )
TQT_TQWIDGET(wid)->setGeometry( 0, 0, width(), height() );
}
diff --git a/lib/kofficecore/KoSpeaker.cpp b/lib/kofficecore/KoSpeaker.cpp
index 6bd950da..d85a6995 100644
--- a/lib/kofficecore/KoSpeaker.cpp
+++ b/lib/kofficecore/KoSpeaker.cpp
@@ -230,7 +230,7 @@ bool KoSpeaker::maybeSayWidget(TQWidget* w, const TQPoint& pos /*=TQPoint()*/)
// Handle widgets that have multiple parts.
- if ( w->inherits(TQMENUBAR_OBJECT_NAME_STRING) ) {
+ if ( w->inherits("TQMenuBar") ) {
TQMenuBar* menuBar = dynamic_cast<TQMenuBar *>(w);
if (pos == TQPoint()) {
for (uint i = 0; i < menuBar->count(); ++i)
@@ -245,7 +245,7 @@ bool KoSpeaker::maybeSayWidget(TQWidget* w, const TQPoint& pos /*=TQPoint()*/)
text = menuBar->text(id);
}
else
- if (w->inherits(TQPOPUPMENU_OBJECT_NAME_STRING)) {
+ if (w->inherits("TQPopupMenu")) {
TQPopupMenu* popupMenu = dynamic_cast<TQPopupMenu *>(w);
if (pos == TQPoint()) {
for (uint i = 0; i < popupMenu->count(); ++i)
@@ -259,7 +259,7 @@ bool KoSpeaker::maybeSayWidget(TQWidget* w, const TQPoint& pos /*=TQPoint()*/)
text = popupMenu->text(id);
}
else
- if (w->inherits(TQTABBAR_OBJECT_NAME_STRING)) {
+ if (w->inherits("TQTabBar")) {
TQTabBar* tabBar = dynamic_cast<TQTabBar *>(w);
TQTab* tab = 0;
if (pos == TQPoint())
@@ -272,7 +272,7 @@ bool KoSpeaker::maybeSayWidget(TQWidget* w, const TQPoint& pos /*=TQPoint()*/)
}
}
else
- if (w->inherits(TQLISTVIEW_OBJECT_NAME_STRING)) {
+ if (w->inherits("TQListView")) {
TQListView* lv = dynamic_cast<TQListView *>(w);
TQListViewItem* item = 0;
if (pos == TQPoint())
@@ -287,7 +287,7 @@ bool KoSpeaker::maybeSayWidget(TQWidget* w, const TQPoint& pos /*=TQPoint()*/)
}
}
else
- if (w->inherits(TQLISTBOX_OBJECT_NAME_STRING)) {
+ if (w->inherits("TQListBox")) {
TQListBox* lb = dynamic_cast<TQListBox *>(w);
// qt docs say coordinates are in "on-screen" coordinates. What does that mean?
TQListBoxItem* item = 0;
@@ -301,7 +301,7 @@ bool KoSpeaker::maybeSayWidget(TQWidget* w, const TQPoint& pos /*=TQPoint()*/)
}
}
else
- if (w->inherits(TQICONVIEW_OBJECT_NAME_STRING)) {
+ if (w->inherits("TQIconView")) {
TQIconView* iv = dynamic_cast<TQIconView *>(w);
TQIconViewItem* item = 0;
if (pos == TQPoint())
@@ -314,7 +314,7 @@ bool KoSpeaker::maybeSayWidget(TQWidget* w, const TQPoint& pos /*=TQPoint()*/)
}
}
else
- if (w->inherits(TQTABLE_OBJECT_NAME_STRING)) {
+ if (w->inherits("TQTable")) {
TQTable* tbl = dynamic_cast<TQTable *>(w);
int row = -1;
int col = -1;
@@ -332,7 +332,7 @@ bool KoSpeaker::maybeSayWidget(TQWidget* w, const TQPoint& pos /*=TQPoint()*/)
}
}
else
- if (w->inherits(TQGRIDVIEW_OBJECT_NAME_STRING)) {
+ if (w->inherits("TQGridView")) {
TQGridView* gv = dynamic_cast<TQGridView *>(w);
// TODO: TQGridView does not have a "current" row or column. Don't think they can even get focus?
int row = -1;
@@ -366,22 +366,22 @@ bool KoSpeaker::maybeSayWidget(TQWidget* w, const TQPoint& pos /*=TQPoint()*/)
if (d->m_cancelSpeakWidget) return true;
// Handle simple, single-part widgets.
- if ( w->inherits(TQBUTTON_OBJECT_NAME_STRING) )
+ if ( w->inherits("TQButton") )
text = dynamic_cast<TQButton *>(w)->text();
else
- if (w->inherits(TQCOMBOBOX_OBJECT_NAME_STRING))
+ if (w->inherits("TQComboBox"))
text = dynamic_cast<TQComboBox *>(w)->currentText();
else
- if (w->inherits(TQLINEEDIT_OBJECT_NAME_STRING))
+ if (w->inherits("TQLineEdit"))
text = dynamic_cast<TQLineEdit *>(w)->text();
else
- if (w->inherits(TQTEXTEDIT_OBJECT_NAME_STRING))
+ if (w->inherits("TQTextEdit"))
text = dynamic_cast<TQTextEdit *>(w)->text();
else
- if (w->inherits(TQLABEL_OBJECT_NAME_STRING))
+ if (w->inherits("TQLabel"))
text = dynamic_cast<TQLabel *>(w)->text();
else
- if (w->inherits(TQGROUPBOX_OBJECT_NAME_STRING)) {
+ if (w->inherits("TQGroupBox")) {
// TODO: Should calculate this number from font size?
if (w->mapFromGlobal(pos).y() < 30)
text = dynamic_cast<TQGroupBox *>(w)->title();
diff --git a/lib/kofficeui/KoSelectAction.cpp b/lib/kofficeui/KoSelectAction.cpp
index 95238764..0558c512 100644
--- a/lib/kofficeui/KoSelectAction.cpp
+++ b/lib/kofficeui/KoSelectAction.cpp
@@ -90,7 +90,7 @@ int KoSelectAction::plug(TQWidget* widget, int index)
if (kapp && !kapp->authorizeTDEAction(name()))
return -1;
kdDebug(129) << "TDEAction::plug( " << widget << ", " << index << " )" << endl; // remove -- ellis
- if ( widget->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) )
+ if ( widget->inherits("TQPopupMenu") )
{
TQPopupMenu* menu = static_cast<TQPopupMenu*>( widget );
int id;
@@ -144,7 +144,7 @@ int KoSelectAction::plug(TQWidget* widget, int index)
return containerCount() - 1;
}
- else if ( widget->inherits( TQMENUBAR_OBJECT_NAME_STRING ) )
+ else if ( widget->inherits( "TQMenuBar" ) )
{
TQMenuBar *bar = static_cast<TQMenuBar *>( widget );
diff --git a/lib/kofficeui/KoTemplateChooseDia.cpp b/lib/kofficeui/KoTemplateChooseDia.cpp
index 044df16a..c42ff001 100644
--- a/lib/kofficeui/KoTemplateChooseDia.cpp
+++ b/lib/kofficeui/KoTemplateChooseDia.cpp
@@ -357,7 +357,7 @@ void KoTemplateChooseDia::setupFileDialog(TQWidget * widgetbase, TQGridLayout *
d->m_filedialog->reparent( widgetbase , point );
//d->m_filedialog->setOperationMode( KFileDialog::Opening);
- TQObjectList *l = d->m_filedialog->queryList( TQPUSHBUTTON_OBJECT_NAME_STRING );
+ TQObjectList *l = d->m_filedialog->queryList( "TQPushButton" );
TQObjectListIt childit( *l );
TQObject *obj;
while ( (obj = childit.current()) != 0 ) {
diff --git a/lib/kofficeui/KoTooluButton.cpp b/lib/kofficeui/KoTooluButton.cpp
index 1cd5e1c6..0d24cd16 100644
--- a/lib/kofficeui/KoTooluButton.cpp
+++ b/lib/kofficeui/KoTooluButton.cpp
@@ -309,7 +309,7 @@ void KoColorPanel::mousePressEvent( TQMouseEvent* e )
void KoColorPanel::mouseReleaseEvent( TQMouseEvent* )
{
- if ( isVisible() && parentWidget() && parentWidget()->inherits( TQPOPUPMENU_OBJECT_NAME_STRING ) )
+ if ( isVisible() && parentWidget() && parentWidget()->inherits( "TQPopupMenu" ) )
parentWidget()->close();
emit colorSelected( mapToColor( m_pressedPos ) );
}
@@ -425,7 +425,7 @@ void KoColorPanel::keyPressEvent( TQKeyEvent* e )
e->ignore();
}
else if ( e->key() == TQt::Key_Return ) {
- if ( isVisible() && parentWidget() && parentWidget()->inherits( TQPOPUPMENU_OBJECT_NAME_STRING ) )
+ if ( isVisible() && parentWidget() && parentWidget()->inherits( "TQPopupMenu" ) )
parentWidget()->close();
emit colorSelected( mapToColor( m_focusPosition ) );
}
diff --git a/lib/kofficeui/kcoloractions.cpp b/lib/kofficeui/kcoloractions.cpp
index aec1aab2..d34c2392 100644
--- a/lib/kofficeui/kcoloractions.cpp
+++ b/lib/kofficeui/kcoloractions.cpp
@@ -237,7 +237,7 @@ int TDESelectColorAction::plug( TQWidget* w, int index )
if (kapp && !kapp->authorizeTDEAction(name()))
return -1;
- if ( w->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) )
+ if ( w->inherits("TQPopupMenu") )
{
TQPopupMenu* menu = static_cast<TQPopupMenu*>( w );
int id;
diff --git a/lib/kofficeui/tkcoloractions.cpp b/lib/kofficeui/tkcoloractions.cpp
index d2476d62..cf55a84a 100644
--- a/lib/kofficeui/tkcoloractions.cpp
+++ b/lib/kofficeui/tkcoloractions.cpp
@@ -165,7 +165,7 @@ void TTDESelectColorAction::updatePixmap()
updatePixmap(static_cast<TTDEToolBarButton*>(r));
}
}
- else if(w->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) ) {
+ else if(w->inherits("TQPopupMenu") ) {
TQPixmap pix =iconSet(TDEIcon::Small).pixmap(TQIconSet::Automatic,TQIconSet::Active);
if ( pix.isNull() )
return;
diff --git a/lib/koproperty/editors/spinbox.cpp b/lib/koproperty/editors/spinbox.cpp
index 4743f570..4d9266a8 100644
--- a/lib/koproperty/editors/spinbox.cpp
+++ b/lib/koproperty/editors/spinbox.cpp
@@ -39,7 +39,7 @@ IntSpinBox::IntSpinBox(int lower, int upper, int step, int value, int base, IntE
editor()->setAlignment(TQt::AlignLeft);
installEventFilter(editor());
installEventFilter(this);
- TQObjectList *spinwidgets = queryList( TQSPINWIDGET_OBJECT_NAME_STRING, 0, false, true );
+ TQObjectList *spinwidgets = queryList( "TQSpinWidget", 0, false, true );
TQSpinWidget* spin = static_cast<TQSpinWidget*>(TQT_TQWIDGET(spinwidgets->first()));
if (spin)
spin->installEventFilter(this);
@@ -154,7 +154,7 @@ IntEdit::slotValueChanged(int)
void
IntEdit::updateSpinWidgets()
{
- TQObjectList *spinwidgets = queryList( TQSPINWIDGET_OBJECT_NAME_STRING, 0, false, true );
+ TQObjectList *spinwidgets = queryList( "TQSpinWidget", 0, false, true );
TQSpinWidget* spin = static_cast<TQSpinWidget*>(TQT_TQWIDGET(spinwidgets->first()));
if (spin) {
spin->setUpEnabled(!isReadOnly());
@@ -182,7 +182,7 @@ DoubleSpinBox::DoubleSpinBox (double lower, double upper, double step, double va
editor()->setAlignment(TQt::AlignLeft);
installEventFilter(editor());
installEventFilter(this);
- TQObjectList *spinwidgets = queryList( TQSPINWIDGET_OBJECT_NAME_STRING, 0, false, true );
+ TQObjectList *spinwidgets = queryList( "TQSpinWidget", 0, false, true );
TQSpinWidget* spin = static_cast<TQSpinWidget*>(TQT_TQWIDGET(spinwidgets->first()));
if (spin)
spin->installEventFilter(this);
@@ -307,7 +307,7 @@ DoubleEdit::slotValueChanged(double)
void
DoubleEdit::updateSpinWidgets()
{
- TQObjectList *spinwidgets = queryList( TQSPINWIDGET_OBJECT_NAME_STRING, 0, false, true );
+ TQObjectList *spinwidgets = queryList( "TQSpinWidget", 0, false, true );
TQSpinWidget* spin = static_cast<TQSpinWidget*>(TQT_TQWIDGET(spinwidgets->first()));
if (spin) {
spin->setUpEnabled(!isReadOnly());
diff --git a/lib/kotext/KoTextView.cpp b/lib/kotext/KoTextView.cpp
index f6cdf4c4..b7608827 100644
--- a/lib/kotext/KoTextView.cpp
+++ b/lib/kotext/KoTextView.cpp
@@ -1122,13 +1122,13 @@ TQPtrList<TDEAction> KoTextView::dataToolActionList(TDEInstance * instance, cons
// Any tool that works on plain text is relevant
TQValueList<KDataToolInfo> tools;
- tools +=KDataToolInfo::query( TQSTRING_OBJECT_NAME_STRING, "text/plain", instance );
+ tools +=KDataToolInfo::query( "TQString", "text/plain", instance );
// Add tools that work on a single word if that is the case
if ( m_singleWord )
{
_singleWord = true;
- tools += KDataToolInfo::query( TQSTRING_OBJECT_NAME_STRING, "application/x-singleword", instance );
+ tools += KDataToolInfo::query( "TQString", "application/x-singleword", instance );
}
// Maybe one day we'll have tools that use libkotext (or qt3's qrt), to act on formatted text
tools += KDataToolInfo::query( "KoTextString", "application/x-qrichtext", instance );
@@ -1169,7 +1169,7 @@ void KoTextView::slotToolActivated( const KDataToolInfo & info, const TQString &
if ( !info.mimeTypes().contains( mimetype ) )
{
mimetype = "text/plain";
- datatype = TQSTRING_OBJECT_NAME_STRING;
+ datatype = "TQString";
}
// If unsupported (and if we have a single word indeed), try application/x-singleword
if ( !info.mimeTypes().contains( mimetype ) && m_singleWord )
diff --git a/lib/kross/api/qtobject.cpp b/lib/kross/api/qtobject.cpp
index 631c9943..8f0819aa 100644
--- a/lib/kross/api/qtobject.cpp
+++ b/lib/kross/api/qtobject.cpp
@@ -112,7 +112,7 @@ TQUObject* QtObject::toTQUObject(const TQString& signature, List::Ptr arguments)
// Fill parameters.
uint argcount = arguments ? arguments->count() : 0;
for(uint i = 0; i < paramcount; i++) {
- if(paramlist[i].find(TQSTRING_OBJECT_NAME_STRING) >= 0) {
+ if(paramlist[i].find("TQString") >= 0) {
const TQString s = (argcount > i) ? Variant::toString(arguments->item(i)) : TQString();
//krossdebug(TQString("EventSlot::toTQUObject s=%1").arg(s));
static_TQUType_TQString.set( &(uo[i + 1]), s );
diff --git a/tools/kthesaurus/main.cpp b/tools/kthesaurus/main.cpp
index 9db6e571..047d2303 100644
--- a/tools/kthesaurus/main.cpp
+++ b/tools/kthesaurus/main.cpp
@@ -74,7 +74,7 @@ extern "C" KOFFICETOOLS_EXPORT int kdemain(int argc, char **argv)
TQString command = "thesaurus_standalone"; // 'standalone' will give us different buttons
TQString mimetype = "text/plain";
- TQString datatype = TQSTRING_OBJECT_NAME_STRING;
+ TQString datatype = "TQString";
//kdDebug() << "KThesaurus command=" << command
// << " dataType=" << info->dataType() << endl;
diff --git a/tools/spell/main.cpp b/tools/spell/main.cpp
index 564f6662..4dc980d8 100644
--- a/tools/spell/main.cpp
+++ b/tools/spell/main.cpp
@@ -60,7 +60,7 @@ bool SpellChecker::run( const TQString& command, void* data, const TQString& dat
}
// Check wether we can accept the data
- if ( datatype != TQSTRING_OBJECT_NAME_STRING )
+ if ( datatype != "TQString" )
{
kdDebug(31000) << "SpellChecker only accepts datatype TQString" << endl;
return FALSE;
diff --git a/tools/thesaurus/main.cpp b/tools/thesaurus/main.cpp
index 06da2682..47554d3e 100644
--- a/tools/thesaurus/main.cpp
+++ b/tools/thesaurus/main.cpp
@@ -236,7 +236,7 @@ bool Thesaurus::run(const TQString& command, void* data, const TQString& datatyp
{
// Check whether we can accept the data
- if ( datatype != TQSTRING_OBJECT_NAME_STRING ) {
+ if ( datatype != "TQString" ) {
kdDebug(31000) << "Thesaurus only accepts datatype TQString" << endl;
return FALSE;
}