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>

KMFSysTray/kmfiptwatcher.cpp

@@ -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" ) {

kmyfirewall/compilers/iptables/kmfiptablescompiler.cpp

@@ -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" );

kmyfirewall/compilers/iptables/kmfiptablescompiler.h

@@ -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(); */
 

kmyfirewall/compilers/pf/kmfpfcompiler.h

@@ -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(); */
 

kmyfirewall/installer/kmfinstallerplugin.h

@@ -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;

kmyfirewall/installer/linux/kmfiptinstaller.h

@@ -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() );
 };
 }

kmyfirewall/installer/openbsd/kmfpfinstaller.h

@@ -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() );
 };
 }

kmyfirewall/ruleoptionplugins/custom_option/kmfruleoptioneditcustom.h

@@ -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(); */
 

kmyfirewall/ruleoptionplugins/interface_option/kmfruleoptioneditinterface.h

@@ -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(); */
 

kmyfirewall/ruleoptionplugins/ip_option/kmfruleoptioneditip.h

@@ -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(); */
 

kmyfirewall/ruleoptionplugins/limit_option/kmfruleoptioneditlimit.h

@@ -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(); */
 

kmyfirewall/ruleoptionplugins/log_target_option/kmfruletargetoptioneditlog.h

@@ -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(); */
 

kmyfirewall/ruleoptionplugins/mac_option/kmfruleoptioneditmac.h

@@ -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(); */
 

kmyfirewall/ruleoptionplugins/mark_target_option/kmfruletargetoptioneditmark.h

@@ -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(); */
 

kmyfirewall/ruleoptionplugins/nat_target_option/kmfruletargetoptioneditnat.h

@@ -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(); */
 

kmyfirewall/ruleoptionplugins/protocol_option/kmfruleoptioneditprotocol.h

@@ -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(); */
 

kmyfirewall/ruleoptionplugins/state_option/kmfruleoptioneditstate.h

@@ -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(); */
 

kmyfirewall/ruleoptionplugins/tos_option/kmfruleoptionedittos.h

@@ -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(); */
 

kmyfirewall/ruleoptionplugins/tos_target_option/kmfruletargetoptionedittos.h

@@ -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(); */