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 f07dd2b54f)
r14.1.x
Michele Calgaro 1 year ago
parent 900386ad46
commit b5ae045e4d
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -45,7 +45,7 @@ class KatePluginFactory : public KLibFactory
KatePluginFactory();
virtual ~KatePluginFactory();
virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = "TQObject", const TQStringList &args = TQStringList() );
private:
static TDEInstance* s_instance;

@ -68,7 +68,7 @@ class KatePluginFactory : public KLibFactory
virtual ~KatePluginFactory() { delete s_instance; }
virtual TQObject* createObject(TQObject *parent = 0, const char *pname = 0,
const char *name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList());
const char *name = "TQObject", const TQStringList &args = TQStringList());
private:
static TDEInstance* s_instance;

@ -242,7 +242,7 @@ const TQString AmarokInterface::getTrackTitle() const
else
{
TQDataStream reply(replyData, IO_ReadOnly);
if (replyType == TQSTRING_OBJECT_NAME_STRING)
if (replyType == "TQString")
{
reply >> title;
return title;

@ -265,7 +265,7 @@ const TQString JuKInterface::getTrackTitle() const
replyType, replyData))
{
TQDataStream reply(replyData, IO_ReadOnly);
if (replyType == TQSTRING_OBJECT_NAME_STRING)
if (replyType == "TQString")
{
reply >> title;
return title;

@ -213,7 +213,7 @@ const TQString KsCDInterface::getTrackTitle() const
replyType, replyData))
{
TQDataStream reply(replyData, IO_ReadOnly);
if (replyType == TQSTRING_OBJECT_NAME_STRING)
if (replyType == "TQString")
{
reply >> title;
}
@ -224,7 +224,7 @@ const TQString KsCDInterface::getTrackTitle() const
replyType, replyData))
{
TQDataStream reply(replyData, IO_ReadOnly);
if (replyType == TQSTRING_OBJECT_NAME_STRING)
if (replyType == "TQString")
{
reply >> album;
}
@ -235,7 +235,7 @@ const TQString KsCDInterface::getTrackTitle() const
replyType, replyData))
{
TQDataStream reply(replyData, IO_ReadOnly);
if (replyType == TQSTRING_OBJECT_NAME_STRING)
if (replyType == "TQString")
{
reply >> artist;
}

@ -259,7 +259,7 @@ const TQString NoatunInterface::getTrackTitle() const
replyData, false, 200))
{
TQDataStream reply(replyData, IO_ReadOnly);
if (replyType == TQSTRING_OBJECT_NAME_STRING)
if (replyType == "TQString")
reply >> title;
}
return title;

@ -215,7 +215,7 @@ TQString MetabarWidget::getCurrentURL()
if (reply.isValid()) {
TQString url;
reply.get(url, TQSTRING_OBJECT_NAME_STRING);
reply.get(url, "TQString");
if(!url.isNull() && !url.isEmpty()){
return url;

@ -229,7 +229,7 @@ bool SettingsPlugin::cookiesEnabled( const TQString& url )
bool enabled = false;
if ( replyType == TQSTRING_OBJECT_NAME_STRING )
if ( replyType == "TQString" )
{
TQString advice;
TQDataStream s( reply, IO_ReadOnly );

Loading…
Cancel
Save