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 b8cc513c5e875739c6790da651f6a3f47ed8f657)

10 files changed, 20 insertions, 20 deletions

diff --git a/languages/cpp/app_templates/kateplugin/plugin_app.h b/languages/cpp/app_templates/kateplugin/plugin_app.h
index 847e6175..19ccdfdb 100644
--- a/languages/cpp/app_templates/kateplugin/plugin_app.h
+++ b/languages/cpp/app_templates/kateplugin/plugin_app.h
@@ -23,7 +23,7 @@ class KatePluginFactory : public KLibFactory
     KatePluginFactory();
     virtual ~KatePluginFactory();
 
-    virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
+    virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = "TQObject", const TQStringList &args = TQStringList() );
 
   private:
     static TDEInstance* s_instance;
diff --git a/languages/cpp/app_templates/kateplugin2/plugin_app.h b/languages/cpp/app_templates/kateplugin2/plugin_app.h
index 80fb0103..c7ee6f13 100644
--- a/languages/cpp/app_templates/kateplugin2/plugin_app.h
+++ b/languages/cpp/app_templates/kateplugin2/plugin_app.h
@@ -27,7 +27,7 @@ public:
     KatePluginFactory();
     virtual ~KatePluginFactory();
 
-    virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
+    virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = "TQObject", const TQStringList &args = TQStringList() );
 
 private:
     static TDEInstance* s_instance;
diff --git a/languages/cpp/app_templates/kpartplugin/plugin_app.h b/languages/cpp/app_templates/kpartplugin/plugin_app.h
index 16142b33..bfb1357b 100644
--- a/languages/cpp/app_templates/kpartplugin/plugin_app.h
+++ b/languages/cpp/app_templates/kpartplugin/plugin_app.h
@@ -25,7 +25,7 @@ public:
   %{APPNAME}Factory();
   virtual ~%{APPNAME}Factory();
 
-  virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
+  virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = "TQObject", const TQStringList &args = TQStringList() );
 
   static TDEInstance* instance();
 
diff --git a/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.cpp b/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.cpp
index 229c28a8..d4092b03 100644
--- a/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.cpp
+++ b/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.cpp
@@ -31,7 +31,7 @@ void tdemdikonsole::respawn()
 
 	if (!m_part) return;
 
-	if (m_part->widget()->inherits(TQFRAME_OBJECT_NAME_STRING))
+	if (m_part->widget()->inherits("TQFrame"))
 		((TQFrame*)m_part->widget())->setFrameStyle(TQFrame::Panel|TQFrame::Sunken);
 
 	m_haskonsole=true;
diff --git a/languages/cpp/cppnewclassdlg.cpp b/languages/cpp/cppnewclassdlg.cpp
index dda53df7..e0655d99 100644
--- a/languages/cpp/cppnewclassdlg.cpp
+++ b/languages/cpp/cppnewclassdlg.cpp
@@ -374,7 +374,7 @@ void CppNewClassDialog::checkTQWidgetInheritance( int val )
 		if ( baseclasses_view->childCount() == 0 )
 		{
 			addBaseClass();
-			basename_edit->setText( TQWIDGET_OBJECT_NAME_STRING );
+			basename_edit->setText( "TQWidget" );
 		}
 		/*        constructors_cpp_edit->append(classname_edit->text() + "::" + classname_edit->text() +
 		            "(TQWidget *parent, const char *name):\n    TQWidget(parent, name)\n{\n}\n");
@@ -396,7 +396,7 @@ void CppNewClassDialog::qobject_box_stateChanged( int val )
 	if ( baseclasses_view->childCount() == 0 )
 	{
 		addBaseClass();
-		basename_edit->setText( TQOBJECT_OBJECT_NAME_STRING );
+		basename_edit->setText( "TQObject" );
 	}
 
 
@@ -1437,7 +1437,7 @@ void CppNewClassDialog::ClassGenerator::common_text()
 	headeronly = dlg.headeronly_box->isChecked();
 
 	if ( ( dlg.baseclasses_view->childCount() == 0 ) && childClass )
-		new TQListViewItem( dlg.baseclasses_view, TQWIDGET_OBJECT_NAME_STRING, "public" );
+		new TQListViewItem( dlg.baseclasses_view, "TQWidget", "public" );
 	if ( objc && ( dlg.baseclasses_view->childCount() == 0 ) )
 		new TQListViewItem( dlg.baseclasses_view, "NSObject", "public" );
 
@@ -1962,7 +1962,7 @@ void CppNewClassDialog::ClassGenerator::gen_interface()
 		{
 			if ( !it.current() ->text( 0 ).isEmpty() )
 				if ( !it.current() ->text( 3 ).isEmpty() )
-					//          if ((!childClass) || (it.current()->text(0) != TQWIDGET_OBJECT_NAME_STRING))
+					//          if ((!childClass) || (it.current()->text(0) != "TQWidget"))
 					includeBaseHeader += ( includeBaseHeader.isEmpty() ? TQString( "" ) : TQString( "\n" ) ) + TQString::fromLatin1( "#include " ) +
 					                     ( it.current() ->text( 2 ).toInt() == 0 ? TQString( "<" ) : TQString( "\"" ) )
 					                     + it.current() ->text( 3 )
diff --git a/languages/cpp/subclassingdlg.cpp b/languages/cpp/subclassingdlg.cpp
index 48bc3f91..e64e0727 100644
--- a/languages/cpp/subclassingdlg.cpp
+++ b/languages/cpp/subclassingdlg.cpp
@@ -191,13 +191,13 @@ void SubclassingDlg::readUiFile()
 
   // Special widget specific slots
 	SlotItem *newSlot;
-	m_qtBaseClassName = DomUtil::elementByPathExt(doc,"widget").attribute("class",TQDIALOG_OBJECT_NAME_STRING);
+	m_qtBaseClassName = DomUtil::elementByPathExt(doc,"widget").attribute("class","TQDialog");
 
-	if ( (m_qtBaseClassName==TQMAINWINDOW_OBJECT_NAME_STRING) || (m_qtBaseClassName==TQWIDGET_OBJECT_NAME_STRING) )
+	if ( (m_qtBaseClassName=="TQMainWindow") || (m_qtBaseClassName=="TQWidget") )
 		m_canBeModal = false;
 	else
 		m_canBeModal = true;
-	if (m_qtBaseClassName != TQWIDGET_OBJECT_NAME_STRING)
+	if (m_qtBaseClassName != "TQWidget")
 	{
 		newSlot = new SLOT_ACCEPT;
 		newSlot->setOn(false);
@@ -214,7 +214,7 @@ void SubclassingDlg::readUiFile()
 		m_slots << newSlot;
 	}
 
-	if (m_qtBaseClassName == TQWIZARD_OBJECT_NAME_STRING)
+	if (m_qtBaseClassName == "TQWizard")
 	{
 		newSlot = new SLOT_NEXT;
 		m_slotView->insertItem(newSlot);
diff --git a/languages/kjssupport/subclassingdlg.cpp b/languages/kjssupport/subclassingdlg.cpp
index 513e0180..34d1f682 100644
--- a/languages/kjssupport/subclassingdlg.cpp
+++ b/languages/kjssupport/subclassingdlg.cpp
@@ -188,13 +188,13 @@ void SubclassingDlg::readUiFile()
 
   // Special widget specific slots
   SlotItem *newSlot;
-  m_qtBaseClassName = DomUtil::elementByPathExt(doc,"widget").attribute("class",TQDIALOG_OBJECT_NAME_STRING);
+  m_qtBaseClassName = DomUtil::elementByPathExt(doc,"widget").attribute("class","TQDialog");
 
-  if ( (m_qtBaseClassName==TQMAINWINDOW_OBJECT_NAME_STRING) || (m_qtBaseClassName==TQWIDGET_OBJECT_NAME_STRING) )
+  if ( (m_qtBaseClassName=="TQMainWindow") || (m_qtBaseClassName=="TQWidget") )
     m_canBeModal = false;
   else
     m_canBeModal = true;
-  if (m_qtBaseClassName != TQWIDGET_OBJECT_NAME_STRING)
+  if (m_qtBaseClassName != "TQWidget")
   {
       newSlot = new SLOT_ACCEPT;
       newSlot->setOn(false);
@@ -211,7 +211,7 @@ void SubclassingDlg::readUiFile()
       m_slots << newSlot;
   }
 
-  if (m_qtBaseClassName == TQWIZARD_OBJECT_NAME_STRING)
+  if (m_qtBaseClassName == "TQWizard")
   {
     newSlot = new SLOT_NEXT;
     m_slotView->insertItem(newSlot);
diff --git a/languages/python/app_templates/pyqt/templates-ui-dialog b/languages/python/app_templates/pyqt/templates-ui-dialog
index 92e9bfff..16eb3a67 100644
--- a/languages/python/app_templates/pyqt/templates-ui-dialog
+++ b/languages/python/app_templates/pyqt/templates-ui-dialog
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>Form1</class>
-<widget class=TQDIALOG_OBJECT_NAME_STRING>
+<widget class="TQDialog">
     <property name="name">
         <cstring>Form1</cstring>
     </property>
diff --git a/languages/python/app_templates/pyqt/templates-ui-mainwin b/languages/python/app_templates/pyqt/templates-ui-mainwin
index d8eff427..5ce4dec8 100644
--- a/languages/python/app_templates/pyqt/templates-ui-mainwin
+++ b/languages/python/app_templates/pyqt/templates-ui-mainwin
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>Form1</class>
-<widget class=TQMAINWINDOW_OBJECT_NAME_STRING>
+<widget class="TQMainWindow">
     <property name="name">
         <cstring>Form1</cstring>
     </property>
diff --git a/languages/sql/sqlconfigwidget.ui.h b/languages/sql/sqlconfigwidget.ui.h
index c06413e7..e1a4d975 100644
--- a/languages/sql/sqlconfigwidget.ui.h
+++ b/languages/sql/sqlconfigwidget.ui.h
@@ -38,7 +38,7 @@ public:
 
     virtual void setContentFromEditor( TQWidget* w )
     {
-	if ( w->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) )
+	if ( w->inherits( "TQComboBox" ) )
 	    setText( ( (TQComboBox*)w )->currentText() );
 	else
 	    TQTableItem::setContentFromEditor( w );
@@ -62,7 +62,7 @@ public:
 
     virtual void setContentFromEditor( TQWidget* w )
     {
-	if ( w->inherits( TQSPINBOX_OBJECT_NAME_STRING ) )
+	if ( w->inherits( "TQSpinBox" ) )
 	    setText( ( (TQSpinBox*)w )->text() );
 	else
 	    TQTableItem::setContentFromEditor( w );