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 20e4a19b0d7cc800d57be50c56d69023adae4046)

8 files changed, 10 insertions, 10 deletions

diff --git a/kivio/kiviopart/kivioarrowheadaction.cpp b/kivio/kiviopart/kivioarrowheadaction.cpp
index 31c2c5b3b..8d7beefa4 100644
--- a/kivio/kiviopart/kivioarrowheadaction.cpp
+++ b/kivio/kiviopart/kivioarrowheadaction.cpp
@@ -85,7 +85,7 @@ int KivioArrowHeadAction::plug( TQWidget* widget, int index)
   if (kapp && !kapp->authorizeTDEAction(name()))
     return -1;
   kdDebug(129) << "TDEAction::plug( " << widget << ", " << index << " )" << endl; // remove -- ellis
-  if ( widget->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) )
+  if ( widget->inherits("TQPopupMenu") )
   {
     TQPopupMenu* menu = static_cast<TQPopupMenu*>( widget );
     int id;
@@ -139,7 +139,7 @@ int KivioArrowHeadAction::plug( TQWidget* widget, int index)
 
     return containerCount() - 1;
   }
-  else if ( widget->inherits( TQMENUBAR_OBJECT_NAME_STRING ) )
+  else if ( widget->inherits( "TQMenuBar" ) )
   {
     TQMenuBar *bar = static_cast<TQMenuBar *>( widget );
 
diff --git a/kivio/kiviopart/kiviostencilsetaction.cpp b/kivio/kiviopart/kiviostencilsetaction.cpp
index d8d08d899..5d0040827 100644
--- a/kivio/kiviopart/kiviostencilsetaction.cpp
+++ b/kivio/kiviopart/kiviostencilsetaction.cpp
@@ -98,7 +98,7 @@ int KivioStencilSetAction::plug( TQWidget* widget, int index)
   if (kapp && !kapp->authorizeTDEAction(name()))
     return -1;
   kdDebug(129) << "TDEAction::plug( " << widget << ", " << index << " )" << endl; // remove -- ellis
-  if ( widget->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) )
+  if ( widget->inherits("TQPopupMenu") )
   {
     TQPopupMenu* menu = static_cast<TQPopupMenu*>( widget );
     int id;
@@ -152,7 +152,7 @@ int KivioStencilSetAction::plug( TQWidget* widget, int index)
 
     return containerCount() - 1;
   }
-  else if ( widget->inherits( TQMENUBAR_OBJECT_NAME_STRING ) )
+  else if ( widget->inherits( "TQMenuBar" ) )
   {
     TQMenuBar *bar = static_cast<TQMenuBar *>( widget );
 
diff --git a/kivio/plugins/kivioconnectortool/plugin.h b/kivio/plugins/kivioconnectortool/plugin.h
index 7afc83ce1..cc09afcf5 100644
--- a/kivio/plugins/kivioconnectortool/plugin.h
+++ b/kivio/plugins/kivioconnectortool/plugin.h
@@ -34,7 +34,7 @@ public:
   ~ConnectorToolFactory();
 
   virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0,
-                           const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
+                           const char* classname = "TQObject", const TQStringList &args = TQStringList() );
 
   static TDEInstance* global();
 
diff --git a/kivio/plugins/kivioselecttool/plugin.h b/kivio/plugins/kivioselecttool/plugin.h
index ee901dd36..c4e612c19 100644
--- a/kivio/plugins/kivioselecttool/plugin.h
+++ b/kivio/plugins/kivioselecttool/plugin.h
@@ -34,7 +34,7 @@ public:
   ~SelectToolFactory();
 
   virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0,
-                           const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
+                           const char* classname = "TQObject", const TQStringList &args = TQStringList() );
 
   static TDEInstance* global();
 
diff --git a/kivio/plugins/kiviosmlconnector/plugin.h b/kivio/plugins/kiviosmlconnector/plugin.h
index 54c81ebc7..5ac52f5e9 100644
--- a/kivio/plugins/kiviosmlconnector/plugin.h
+++ b/kivio/plugins/kiviosmlconnector/plugin.h
@@ -34,7 +34,7 @@ public:
   ~SMLConnectorFactory();
 
   virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0,
-                           const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
+                           const char* classname = "TQObject", const TQStringList &args = TQStringList() );
 
   static TDEInstance* global();
 
diff --git a/kivio/plugins/kiviotargettool/kiviotargettoolfactory.h b/kivio/plugins/kiviotargettool/kiviotargettoolfactory.h
index 091cba2d2..e6ead8aa8 100644
--- a/kivio/plugins/kiviotargettool/kiviotargettoolfactory.h
+++ b/kivio/plugins/kiviotargettool/kiviotargettoolfactory.h
@@ -35,7 +35,7 @@ class KivioTargetToolFactory : public KLibFactory
     ~KivioTargetToolFactory();
 
     virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0,
-                            const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
+                            const char* classname = "TQObject", const TQStringList &args = TQStringList() );
   
     static TDEInstance* global();
   
diff --git a/kivio/plugins/kiviotexttool/plugin.h b/kivio/plugins/kiviotexttool/plugin.h
index 4eaa9cc6c..681f40d7e 100644
--- a/kivio/plugins/kiviotexttool/plugin.h
+++ b/kivio/plugins/kiviotexttool/plugin.h
@@ -34,7 +34,7 @@ public:
   ~TextToolFactory();
 
   virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0,
-                           const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
+                           const char* classname = "TQObject", const TQStringList &args = TQStringList() );
 
   static TDEInstance* global();
 
diff --git a/kivio/plugins/kiviozoomtool/plugin.h b/kivio/plugins/kiviozoomtool/plugin.h
index 4b2d80388..8db8e5316 100644
--- a/kivio/plugins/kiviozoomtool/plugin.h
+++ b/kivio/plugins/kiviozoomtool/plugin.h
@@ -34,7 +34,7 @@ public:
   ~ZoomToolFactory();
 
   virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0,
-                           const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
+                           const char* classname = "TQObject", const TQStringList &args = TQStringList() );
   static TDEInstance* global();
 
 private: