Replace _OBJECT_NAME_STRING defines with actual strings. This relates to the merging of tqtinterface with tqt3.

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 55a03e677444b0bc517f2518e29d44686e86746e)

3 files changed, 5 insertions, 5 deletions

diff --git a/ksayit/Freeverb_plugin/ksayitfreeverblib.h b/ksayit/Freeverb_plugin/ksayitfreeverblib.h
index 65fe54c..a8ef9c3 100644
--- a/ksayit/Freeverb_plugin/ksayitfreeverblib.h
+++ b/ksayit/Freeverb_plugin/ksayitfreeverblib.h
@@ -36,7 +36,7 @@ public:
     virtual ~FreeverbPluginFactory(){ delete p_instance; };
     
     TQObject* createObject(TQObject *parent=0, const char* name=0, 
-            const char* className=TQOBJECT_OBJECT_NAME_STRING, 
+            const char* className="TQObject", 
             const TQStringList &args=TQStringList());        
 
 private:
diff --git a/kttsd/kttsjobmgr/kttsjobmgr.cpp b/kttsd/kttsjobmgr/kttsjobmgr.cpp
index d761860..7a527f6 100644
--- a/kttsd/kttsjobmgr/kttsjobmgr.cpp
+++ b/kttsd/kttsjobmgr/kttsjobmgr.cpp
@@ -764,7 +764,7 @@ TQString KttsJobMgrPart::cachedTalkerCodeToTalkerID(const TQString& talkerCode)
 void KttsJobMgrPart::enableJobActions(bool enable)
 {
     if (!m_buttonBox) return;
-    TQObjectList *l = m_buttonBox->queryList( TQPUSHBUTTON_OBJECT_NAME_STRING, "job_*", true, true );
+    TQObjectList *l = m_buttonBox->queryList( "TQPushButton", "job_*", true, true );
     TQObjectListIt it( *l ); // iterate over the buttons
     TQObject *obj;
 
@@ -783,7 +783,7 @@ void KttsJobMgrPart::enableJobActions(bool enable)
         {
             bool enableLater = item->nextSibling();
 
-            l = m_buttonBox->queryList( TQPUSHBUTTON_OBJECT_NAME_STRING, "job_later", false, true );
+            l = m_buttonBox->queryList( "TQPushButton", "job_later", false, true );
             it = TQObjectListIt( *l ); // iterate over the buttons
             if ( (obj = it.current()) != 0 ) {
                 // for each found object...
@@ -801,7 +801,7 @@ void KttsJobMgrPart::enableJobActions(bool enable)
 void KttsJobMgrPart::enableJobPartActions(bool enable)
 {
     if (!m_buttonBox) return;
-    TQObjectList *l = m_buttonBox->queryList( TQPUSHBUTTON_OBJECT_NAME_STRING, "part_*", true, true );
+    TQObjectList *l = m_buttonBox->queryList( "TQPushButton", "part_*", true, true );
     TQObjectListIt it( *l ); // iterate over the buttons
     TQObject *obj;
 
diff --git a/kttsd/kttsjobmgr/kttsjobmgr.h b/kttsd/kttsjobmgr/kttsjobmgr.h
index 9102f5c..272b4c8 100644
--- a/kttsd/kttsjobmgr/kttsjobmgr.h
+++ b/kttsd/kttsjobmgr/kttsjobmgr.h
@@ -43,7 +43,7 @@ public:
     virtual ~KttsJobMgrFactory();
 
     virtual TQObject* createObject(TQObject* parent = 0, const char* name = 0,
-                            const char* classname = TQOBJECT_OBJECT_NAME_STRING,
+                            const char* classname = "TQObject",
                             const TQStringList &args = TQStringList());
 
     static TDEInstance *instance();