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 cd00c5640f)
r14.1.x
Michele Calgaro 1 year ago
parent 12d78a43bb
commit c313fc51aa
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -118,7 +118,7 @@ void KMFIPTWatcher::queryChainsInTable( const TQString& table, KMFIPTDoc* iptdoc
emit sigUpdateActive( false );
} else {
TQDataStream answer( reply_data, IO_ReadOnly );
if ( reply_type == TQSTRINGLIST_OBJECT_NAME_STRING ) {
if ( reply_type == "TQStringList" ) {
TQStringList result;
answer >> result;
IPTable *tableObj = iptdoc->table( table );
@ -175,7 +175,7 @@ void KMFIPTWatcher::fetchChainPolicy( IPTChain* chain ) {
emit sigUpdateActive( false );
} else {
TQDataStream answer( reply_data, IO_ReadOnly );
if ( reply_type == TQSTRING_OBJECT_NAME_STRING ) {
if ( reply_type == "TQString" ) {
TQString result;
answer >> result;
kdDebug() << "Found Chain Policy: " << chain->table()->name() << " " << chain->name() << " " << result << endl;
@ -253,7 +253,7 @@ void KMFIPTWatcher::fetchRulesProperties( IPTRule* rule, int index ) {
emit sigUpdateActive( false );
} else {
TQDataStream answer( reply_data, IO_ReadOnly );
if ( reply_type == TQSTRINGLIST_OBJECT_NAME_STRING ) {
if ( reply_type == "TQStringList" ) {
TQStringList result;
answer >> result;
if ( *result.at( 0 ) == "ERROR" ) {

@ -187,7 +187,7 @@ void KMFIPTablesCompiler::slotConvertToIPTDoc() {
delete converter;
if ( ! m_iptWidget ) {
m_iptWidget = new TQTabWidget( 0 , TQTABWIDGET_OBJECT_NAME_STRING );
m_iptWidget = new TQTabWidget( 0 , "TQTabWidget" );
m_iptViewFilter = new KMFListView( 0, "view" );
m_iptViewNat = new KMFListView( 0, "view" );
m_iptViewMangle = new KMFListView( 0, "view" );

@ -83,7 +83,7 @@ public:
/* delete s_instance; */
};
virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0,
const char* name = TQOBJECT_OBJECT_NAME_STRING,
const char* name = "TQObject",
const TQStringList &args = TQStringList() );
/* static TDEInstance* instance(); */

@ -122,7 +122,7 @@ public:
/* delete s_instance; */
};
virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0,
const char* name = TQOBJECT_OBJECT_NAME_STRING,
const char* name = "TQObject",
const TQStringList &args = TQStringList() );
/* static TDEInstance* instance(); */

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

@ -131,7 +131,7 @@ public:
KMFIPTInstallerFactory( TQObject *parent = 0, const char *name = 0 );
virtual ~KMFIPTInstallerFactory() {};
virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0,
const char* name = TQOBJECT_OBJECT_NAME_STRING,
const char* name = "TQObject",
const TQStringList &args = TQStringList() );
};
}

@ -110,7 +110,7 @@ public:
KMFPFInstallerFactory( TQObject *parent = 0, const char *name = 0 );
virtual ~KMFPFInstallerFactory() {};
virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0,
const char* name = TQOBJECT_OBJECT_NAME_STRING,
const char* name = "TQObject",
const TQStringList &args = TQStringList() );
};
}

@ -76,7 +76,7 @@ public:
/* delete s_instance; */
};
virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0,
const char* name = TQOBJECT_OBJECT_NAME_STRING,
const char* name = "TQObject",
const TQStringList &args = TQStringList() );
/* static TDEInstance* instance(); */

@ -60,7 +60,7 @@ public:
/* delete s_instance; */
};
virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0,
const char* name = TQOBJECT_OBJECT_NAME_STRING,
const char* name = "TQObject",
const TQStringList &args = TQStringList() );
/* static TDEInstance* instance(); */

@ -70,7 +70,7 @@ public:
/* delete s_instance; */
};
virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0,
const char* name = TQOBJECT_OBJECT_NAME_STRING,
const char* name = "TQObject",
const TQStringList &args = TQStringList() );
/* static TDEInstance* instance(); */

@ -70,7 +70,7 @@ public:
/* delete s_instance; */
};
virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0,
const char* name = TQOBJECT_OBJECT_NAME_STRING,
const char* name = "TQObject",
const TQStringList &args = TQStringList() );
/* static TDEInstance* instance(); */

@ -59,7 +59,7 @@ public:
/* delete s_instance; */
};
virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0,
const char* name = TQOBJECT_OBJECT_NAME_STRING,
const char* name = "TQObject",
const TQStringList &args = TQStringList() );
/* static TDEInstance* instance(); */

@ -74,7 +74,7 @@ public:
/* delete s_instance; */
};
virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0,
const char* name = TQOBJECT_OBJECT_NAME_STRING,
const char* name = "TQObject",
const TQStringList &args = TQStringList() );
/* static TDEInstance* instance(); */

@ -62,7 +62,7 @@ public:
/* delete s_instance; */
};
virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0,
const char* name = TQOBJECT_OBJECT_NAME_STRING,
const char* name = "TQObject",
const TQStringList &args = TQStringList() );
/* static TDEInstance* instance(); */

@ -71,7 +71,7 @@ public:
/* delete s_instance; */
};
virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0,
const char* name = TQOBJECT_OBJECT_NAME_STRING,
const char* name = "TQObject",
const TQStringList &args = TQStringList() );
/* static TDEInstance* instance(); */

@ -72,7 +72,7 @@ public:
/* delete s_instance; */
};
virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0,
const char* name = TQOBJECT_OBJECT_NAME_STRING,
const char* name = "TQObject",
const TQStringList &args = TQStringList() );
/* static TDEInstance* instance(); */

@ -70,7 +70,7 @@ public:
/* delete s_instance; */
};
virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0,
const char* name = TQOBJECT_OBJECT_NAME_STRING,
const char* name = "TQObject",
const TQStringList &args = TQStringList() );
/* static TDEInstance* instance(); */

@ -70,7 +70,7 @@ public:
/* delete s_instance; */
};
virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0,
const char* name = TQOBJECT_OBJECT_NAME_STRING,
const char* name = "TQObject",
const TQStringList &args = TQStringList() );
/* static TDEInstance* instance(); */

@ -59,7 +59,7 @@ public:
/* delete s_instance; */
};
virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0,
const char* name = TQOBJECT_OBJECT_NAME_STRING,
const char* name = "TQObject",
const TQStringList &args = TQStringList() );
/* static TDEInstance* instance(); */

Loading…
Cancel
Save