TDE
/
tdeutils
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdeutils
0
0
Fork 0
Code Issues Releases Wiki Activity

Replace _OBJECT_NAME_STRING defines with actual strings. This relates to the merging of tqtinterface with tqt3.

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/49/head
Michele Calgaro 10 months ago
parent d11c6b6bde
commit 53c180e71c
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
8 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File

22
kregexpeditor/KWidgetStreamer/kwidgetstreamer.cpp
Unescape View File

@ -45,7 +45,7 @@ void KWidgetStreamer::fromStream( TQDataStream& stream, TQObject* to )
void KWidgetStreamer::propertyToStream( const TQObject* from, TQDataStream& stream )
{
// Only handle widgets. Alternatives to widgets are layouts, validators, timers, etc.
if ( ! from->inherits(TQWIDGET_OBJECT_NAME_STRING) )
if ( ! from->inherits("TQWidget") )
return;
// Serializing all the children (if any).
@ -80,7 +80,7 @@ void KWidgetStreamer::propertyToStream( const TQObject* from, TQDataStream& stre
void KWidgetStreamer::propertyFromStream( TQDataStream& stream, TQObject* to )
{
// Only handle widgets. Alternatives to widgets are layouts, validators, timers, etc.
if ( ! to->inherits(TQWIDGET_OBJECT_NAME_STRING) )
if ( ! to->inherits("TQWidget") )
return;
// Stream in all the children (if any)
@ -119,7 +119,7 @@ KWidgetStreamer::KWidgetStreamer ()
l.clear();
l << TQString::fromLatin1("enabled")
<< TQString::fromLatin1("checked") << TQString::fromLatin1("tristate");
_map.insert(TQString::fromLatin1(TQCHECKBOX_OBJECT_NAME_STRING), l);
_map.insert(TQString::fromLatin1("TQCheckBox"), l);
// TQComboBox
l.clear();
@ -127,51 +127,51 @@ KWidgetStreamer::KWidgetStreamer ()
<< TQString::fromLatin1("editable") << TQString::fromLatin1("currentItem")
<< TQString::fromLatin1("maxCount") << TQString::fromLatin1("insertionPolicy")
<< TQString::fromLatin1("autoCompletion");
_map.insert(TQString::fromLatin1(TQCOMBOBOX_OBJECT_NAME_STRING), l);
_map.insert(TQString::fromLatin1("TQComboBox"), l);
// TQDial
l.clear();
l << TQString::fromLatin1("enabled")
<< TQString::fromLatin1("tracking") << TQString::fromLatin1("wrapping")
<< TQString::fromLatin1("value");
_map.insert(TQString::fromLatin1(TQDIAL_OBJECT_NAME_STRING), l);
_map.insert(TQString::fromLatin1("TQDial"), l);
// TQLCDNumber
l.clear();
l << TQString::fromLatin1("enabled")
<< TQString::fromLatin1("numDigits") << TQString::fromLatin1("mode")
<< TQString::fromLatin1("segmentStyle") << TQString::fromLatin1("value");
_map.insert(TQString::fromLatin1(TQLCDNUMBER_OBJECT_NAME_STRING), l);
_map.insert(TQString::fromLatin1("TQLCDNumber"), l);
// TQLineEdit
l.clear();
l << TQString::fromLatin1("enabled")
<< TQString::fromLatin1("text") << TQString::fromLatin1("maxLength")
<< TQString::fromLatin1("echoMode") << TQString::fromLatin1("alignment");
_map.insert(TQString::fromLatin1(TQLINEEDIT_OBJECT_NAME_STRING), l);
_map.insert(TQString::fromLatin1("TQLineEdit"), l);
// TQMultiLineEdit
l.clear();
l << TQString::fromLatin1("enabled")
<< TQString::fromLatin1("text")
<< TQString::fromLatin1("alignment");
_map.insert(TQString::fromLatin1(TQTEXTEDIT_OBJECT_NAME_STRING), l);
_map.insert(TQString::fromLatin1("TQTextEdit"), l);
// TQRadioButton
l.clear();
l << TQString::fromLatin1("enabled")
<< TQString::fromLatin1("checked");
_map.insert(TQString::fromLatin1(TQRADIOBUTTON_OBJECT_NAME_STRING), l);
_map.insert(TQString::fromLatin1("TQRadioButton"), l);
// TQSlider
l.clear();
l << TQString::fromLatin1("enabled")
<< TQString::fromLatin1("value");
_map.insert(TQString::fromLatin1(TQSLIDER_OBJECT_NAME_STRING), l);
_map.insert(TQString::fromLatin1("TQSlider"), l);
// TQSpinBox
l.clear();
l << TQString::fromLatin1("enabled")
<< TQString::fromLatin1("value");
_map.insert(TQString::fromLatin1(TQSPINBOX_OBJECT_NAME_STRING), l);
_map.insert(TQString::fromLatin1("TQSpinBox"), l);
}

2
kregexpeditor/KWidgetStreamer/kwidgetstreamer.h
Unescape View File

@ -37,7 +37,7 @@
<pre>
KWidgetStreamer streamer;
KWidgetStreamer::PropertyMap& map = streamer.propertyMap();
KWidgetStreamer::PropertyList& list = *map.find(TQLCDNUMBER_OBJECT_NAME_STRING);
KWidgetStreamer::PropertyList& list = *map.find("TQLCDNumber");
list.remove("numDigits");
</pre>
**/

2
superkaramba/src/config_python.cpp
Unescape View File

@ -172,7 +172,7 @@ PyObject* py_read_config_entry(PyObject *, PyObject *args)
return Py_BuildValue((char*)"l", i);
}
if (type == TQSTRING_OBJECT_NAME_STRING)
if (type == "TQString")
{
return Py_BuildValue((char*)"s", entry.toString().ascii());
}

2
superkaramba/src/input_python.cpp
Unescape View File

@ -348,7 +348,7 @@ PyObject* py_getInputFocus(PyObject *, PyObject *args)
//
TQWidget *obj = ((karamba*)widget)->focusWidget();
if(obj->isA(TQLINEEDIT_OBJECT_NAME_STRING)) // SKLineEdit is no TQ_Object, but TQLineEdit can only be here as a SKLineEdit
if(obj->isA("TQLineEdit")) // SKLineEdit is no TQ_Object, but TQLineEdit can only be here as a SKLineEdit
return Py_BuildValue((char*)"l", ((SKLineEdit*)obj)->getInput());
return Py_BuildValue((char*)"l", 0);

2
superkaramba/src/noatunsensor.cpp
Unescape View File

@ -144,7 +144,7 @@ TQString NoatunSensor::getTitle()
else
{
TQDataStream reply(replyData, IO_ReadOnly);
if (replyType == TQSTRING_OBJECT_NAME_STRING)
if (replyType == "TQString")
{
reply >> result;
result.replace( TQRegExp("_")," " );

4
tdelirc/kcmlirc/addaction.cpp
Unescape View File

@ -274,7 +274,7 @@ void AddAction::updateParameter()
{ theValue->raiseWidget(1);
theValueCheckBox->setChecked(theArguments[index].toBool());
}
else if(type.find(TQSTRINGLIST_OBJECT_NAME_STRING) != -1)
else if(type.find("TQStringList") != -1)
{ theValue->raiseWidget(4);
TQStringList backup = theArguments[index].toStringList();
// backup needed because calling clear will kill what ever has been saved.
@ -313,7 +313,7 @@ void AddAction::slotParameterChanged()
theArguments[index].asDouble() = theValueDoubleNumInput->value();
else if(type.find("bool") != -1)
theArguments[index].asBool() = theValueCheckBox->isChecked();
else if(type.find(TQSTRINGLIST_OBJECT_NAME_STRING) != -1)
else if(type.find("TQStringList") != -1)
theArguments[index].asStringList() = theValueEditListBox->items();
else
theArguments[index].asString() = theValueLineEdit->text();

2
tdelirc/profiles/konqueror.profile.xml
Unescape View File

@ -8,7 +8,7 @@
<action objid="KonquerorIface" prototype="void createNewWindow(QString)" repeat="0" autostart="0">
<name>Create New Window</name>
<comment>Creates a new window and loads an arbitrary URL.</comment>
<argument type=TQSTRING_OBJECT_NAME_STRING><comment>The URL to load in the window initially.</comment></argument>
<argument type="TQString"><comment>The URL to load in the window initially.</comment></argument>
</action>
<action objid="MainApplication-Interface" prototype="void quit()" repeat="0" autostart="0">
<name>Quit</name>

8
tdelirc/profiles/tdelauncher.profile.xml
Unescape View File

@ -6,13 +6,13 @@
<action objid="default" prototype="void tdeinit_exec(QString, QStringList)" repeat="0" autostart="0">
<name>Execute</name>
<comment>Runs a program or script</comment>
<argument type=TQSTRING_OBJECT_NAME_STRING><comment>The executable name and path of the program or script to run</comment></argument>
<argument type=TQSTRINGLIST_OBJECT_NAME_STRING><comment>Parameters for the program or script</comment></argument>
<argument type="TQString"><comment>The executable name and path of the program or script to run</comment></argument>
<argument type="TQStringList"><comment>Parameters for the program or script</comment></argument>
</action>
<action objid="default" prototype="void tdeinit_exec_wait(QString, QStringList)" repeat="0" autostart="0">
<name>Execute and Wait</name>
<comment>Runs a program or script and waits for it to finish</comment>
<argument type=TQSTRING_OBJECT_NAME_STRING><comment>The executable name and path of the program or script to run</comment></argument>
<argument type=TQSTRINGLIST_OBJECT_NAME_STRING><comment>Parameters for the program or script</comment></argument>
<argument type="TQString"><comment>The executable name and path of the program or script to run</comment></argument>
<argument type="TQStringList"><comment>Parameters for the program or script</comment></argument>
</action>
</profile>

Write Preview
Loading…
Cancel
Save