summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2023-07-12 11:38:31 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2023-07-13 09:58:51 +0900
commit793159b9690c22c00b6dd78ed24f56c620cd0db8 (patch)
tree27f7cb8d3819879af63967d05771af6326551c27
parent8a349b7e9ea3f9692976c988090294c78ce35d53 (diff)
downloadtdeutils-793159b9690c22c00b6dd78ed24f56c620cd0db8.tar.gz
tdeutils-793159b9690c22c00b6dd78ed24f56c620cd0db8.zip
Replace _OBJECT_NAME_STRING defines with actual strings. This relates to the merging of tqtinterface with tqt3.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit 53c180e71c2d6bc90bb777b4bd304d5f235040e3)
-rw-r--r--kregexpeditor/KWidgetStreamer/kwidgetstreamer.cpp22
-rw-r--r--kregexpeditor/KWidgetStreamer/kwidgetstreamer.h2
-rw-r--r--superkaramba/src/config_python.cpp2
-rw-r--r--superkaramba/src/input_python.cpp2
-rw-r--r--superkaramba/src/noatunsensor.cpp2
-rw-r--r--tdelirc/kcmlirc/addaction.cpp4
-rw-r--r--tdelirc/profiles/konqueror.profile.xml2
-rw-r--r--tdelirc/profiles/tdelauncher.profile.xml8
8 files changed, 22 insertions, 22 deletions
diff --git a/kregexpeditor/KWidgetStreamer/kwidgetstreamer.cpp b/kregexpeditor/KWidgetStreamer/kwidgetstreamer.cpp
index 721257c..70af32f 100644
--- a/kregexpeditor/KWidgetStreamer/kwidgetstreamer.cpp
+++ b/kregexpeditor/KWidgetStreamer/kwidgetstreamer.cpp
@@ -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);
}
diff --git a/kregexpeditor/KWidgetStreamer/kwidgetstreamer.h b/kregexpeditor/KWidgetStreamer/kwidgetstreamer.h
index 6d9bfd7..6ac3349 100644
--- a/kregexpeditor/KWidgetStreamer/kwidgetstreamer.h
+++ b/kregexpeditor/KWidgetStreamer/kwidgetstreamer.h
@@ -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>
**/
diff --git a/superkaramba/src/config_python.cpp b/superkaramba/src/config_python.cpp
index 0b9b34b..1a094eb 100644
--- a/superkaramba/src/config_python.cpp
+++ b/superkaramba/src/config_python.cpp
@@ -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());
}
diff --git a/superkaramba/src/input_python.cpp b/superkaramba/src/input_python.cpp
index fb451bd..727daaa 100644
--- a/superkaramba/src/input_python.cpp
+++ b/superkaramba/src/input_python.cpp
@@ -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);
diff --git a/superkaramba/src/noatunsensor.cpp b/superkaramba/src/noatunsensor.cpp
index 129e8e0..0a06473 100644
--- a/superkaramba/src/noatunsensor.cpp
+++ b/superkaramba/src/noatunsensor.cpp
@@ -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("_")," " );
diff --git a/tdelirc/kcmlirc/addaction.cpp b/tdelirc/kcmlirc/addaction.cpp
index 8a87775..b43879b 100644
--- a/tdelirc/kcmlirc/addaction.cpp
+++ b/tdelirc/kcmlirc/addaction.cpp
@@ -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();
diff --git a/tdelirc/profiles/konqueror.profile.xml b/tdelirc/profiles/konqueror.profile.xml
index 0fdfdba..ab6ed8a 100644
--- a/tdelirc/profiles/konqueror.profile.xml
+++ b/tdelirc/profiles/konqueror.profile.xml
@@ -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>
diff --git a/tdelirc/profiles/tdelauncher.profile.xml b/tdelirc/profiles/tdelauncher.profile.xml
index 57eca31..88475f2 100644
--- a/tdelirc/profiles/tdelauncher.profile.xml
+++ b/tdelirc/profiles/tdelauncher.profile.xml
@@ -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>