diff --git a/KMFSysTray/kmfiptwatcher.cpp b/KMFSysTray/kmfiptwatcher.cpp index 789fb25..65c92ec 100644 --- a/KMFSysTray/kmfiptwatcher.cpp +++ b/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" ) { diff --git a/kmyfirewall/compilers/iptables/kmfiptablescompiler.cpp b/kmyfirewall/compilers/iptables/kmfiptablescompiler.cpp index 3fbc70e..9fb21ae 100644 --- a/kmyfirewall/compilers/iptables/kmfiptablescompiler.cpp +++ b/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" ); diff --git a/kmyfirewall/compilers/iptables/kmfiptablescompiler.h b/kmyfirewall/compilers/iptables/kmfiptablescompiler.h index aca6eac..36c8783 100644 --- a/kmyfirewall/compilers/iptables/kmfiptablescompiler.h +++ b/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(); */ diff --git a/kmyfirewall/compilers/pf/kmfpfcompiler.h b/kmyfirewall/compilers/pf/kmfpfcompiler.h index d57b42f..a1fc7c7 100644 --- a/kmyfirewall/compilers/pf/kmfpfcompiler.h +++ b/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(); */ diff --git a/kmyfirewall/installer/kmfinstallerplugin.h b/kmyfirewall/installer/kmfinstallerplugin.h index 54e2d4b..895fb1f 100644 --- a/kmyfirewall/installer/kmfinstallerplugin.h +++ b/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; diff --git a/kmyfirewall/installer/linux/kmfiptinstaller.h b/kmyfirewall/installer/linux/kmfiptinstaller.h index c403a01..48479ea 100644 --- a/kmyfirewall/installer/linux/kmfiptinstaller.h +++ b/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() ); }; } diff --git a/kmyfirewall/installer/openbsd/kmfpfinstaller.h b/kmyfirewall/installer/openbsd/kmfpfinstaller.h index c1731a6..96fb969 100644 --- a/kmyfirewall/installer/openbsd/kmfpfinstaller.h +++ b/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() ); }; } diff --git a/kmyfirewall/ruleoptionplugins/custom_option/kmfruleoptioneditcustom.h b/kmyfirewall/ruleoptionplugins/custom_option/kmfruleoptioneditcustom.h index 18d5cea..a243d3e 100644 --- a/kmyfirewall/ruleoptionplugins/custom_option/kmfruleoptioneditcustom.h +++ b/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(); */ diff --git a/kmyfirewall/ruleoptionplugins/interface_option/kmfruleoptioneditinterface.h b/kmyfirewall/ruleoptionplugins/interface_option/kmfruleoptioneditinterface.h index 8df6a9e..9ae5535 100644 --- a/kmyfirewall/ruleoptionplugins/interface_option/kmfruleoptioneditinterface.h +++ b/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(); */ diff --git a/kmyfirewall/ruleoptionplugins/ip_option/kmfruleoptioneditip.h b/kmyfirewall/ruleoptionplugins/ip_option/kmfruleoptioneditip.h index 8fd0064..547254a 100644 --- a/kmyfirewall/ruleoptionplugins/ip_option/kmfruleoptioneditip.h +++ b/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(); */ diff --git a/kmyfirewall/ruleoptionplugins/limit_option/kmfruleoptioneditlimit.h b/kmyfirewall/ruleoptionplugins/limit_option/kmfruleoptioneditlimit.h index 7e716e9..c75571c 100644 --- a/kmyfirewall/ruleoptionplugins/limit_option/kmfruleoptioneditlimit.h +++ b/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(); */ diff --git a/kmyfirewall/ruleoptionplugins/log_target_option/kmfruletargetoptioneditlog.h b/kmyfirewall/ruleoptionplugins/log_target_option/kmfruletargetoptioneditlog.h index c7c84b7..a4395be 100644 --- a/kmyfirewall/ruleoptionplugins/log_target_option/kmfruletargetoptioneditlog.h +++ b/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(); */ diff --git a/kmyfirewall/ruleoptionplugins/mac_option/kmfruleoptioneditmac.h b/kmyfirewall/ruleoptionplugins/mac_option/kmfruleoptioneditmac.h index 53169c0..e077b04 100644 --- a/kmyfirewall/ruleoptionplugins/mac_option/kmfruleoptioneditmac.h +++ b/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(); */ diff --git a/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruletargetoptioneditmark.h b/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruletargetoptioneditmark.h index 51df05b..e7c381e 100644 --- a/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruletargetoptioneditmark.h +++ b/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(); */ diff --git a/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruletargetoptioneditnat.h b/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruletargetoptioneditnat.h index d621789..207ee8e 100644 --- a/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruletargetoptioneditnat.h +++ b/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(); */ diff --git a/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleoptioneditprotocol.h b/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleoptioneditprotocol.h index 5b7dfbb..7c64d58 100644 --- a/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleoptioneditprotocol.h +++ b/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(); */ diff --git a/kmyfirewall/ruleoptionplugins/state_option/kmfruleoptioneditstate.h b/kmyfirewall/ruleoptionplugins/state_option/kmfruleoptioneditstate.h index 0829d11..4a4fc04 100644 --- a/kmyfirewall/ruleoptionplugins/state_option/kmfruleoptioneditstate.h +++ b/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(); */ diff --git a/kmyfirewall/ruleoptionplugins/tos_option/kmfruleoptionedittos.h b/kmyfirewall/ruleoptionplugins/tos_option/kmfruleoptionedittos.h index e1fbb87..a513062 100644 --- a/kmyfirewall/ruleoptionplugins/tos_option/kmfruleoptionedittos.h +++ b/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(); */ diff --git a/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruletargetoptionedittos.h b/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruletargetoptionedittos.h index 149fc41..c4b3551 100644 --- a/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruletargetoptionedittos.h +++ b/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(); */