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 36c049e135b0cec7cf97b41888860186813df5f0)

4 files changed, 7 insertions, 7 deletions

diff --git a/tdeprint/kprintdialog.cpp b/tdeprint/kprintdialog.cpp
index 9df774510..e12d4bafe 100644
--- a/tdeprint/kprintdialog.cpp
+++ b/tdeprint/kprintdialog.cpp
@@ -484,12 +484,12 @@ void KPrintDialog::setDialogPages(TQPtrList<KPrintDialogPage> *pages)
 			d->m_pages.append(pages->take(0));
 		d->m_pages.first()->reparent(d->m_dummy, TQPoint(0,0));
 		d->m_pages.first()->show();
-		delete d->m_dummy->child("TabWidget", TQTABWIDGET_OBJECT_NAME_STRING);
+		delete d->m_dummy->child("TabWidget", "TQTabWidget");
 	}
 	else
 	{
 		// more than one page.
-		TQTabWidget	*tabs = static_cast<TQTabWidget*>(TQT_TQWIDGET(d->m_dummy->child("TabWidget", TQTABWIDGET_OBJECT_NAME_STRING)));
+		TQTabWidget	*tabs = static_cast<TQTabWidget*>(TQT_TQWIDGET(d->m_dummy->child("TabWidget", "TQTabWidget")));
 		if (!tabs)
 		{
 			// TQTabWidget doesn't exist. Create it and reparent all
@@ -822,7 +822,7 @@ void KPrintDialog::slotWizard()
 void KPrintDialog::reload()
 {
 	// remove printer dependent pages (usually from plugin)
-	TQTabWidget	*tabs = static_cast<TQTabWidget*>(TQT_TQWIDGET(d->m_dummy->child("TabWidget", TQTABWIDGET_OBJECT_NAME_STRING)));
+	TQTabWidget	*tabs = static_cast<TQTabWidget*>(TQT_TQWIDGET(d->m_dummy->child("TabWidget", "TQTabWidget")));
 	for (uint i=0; i<d->m_pages.count(); i++)
 		if (d->m_pages.at(i)->onlyRealPrinters())
 		{
@@ -951,7 +951,7 @@ void KPrintDialog::enableDialogPage( int index, bool flag )
 
 	if ( d->m_pages.count() > 1 )
 	{
-		TQTabWidget	*tabs = static_cast<TQTabWidget*>(TQT_TQWIDGET(d->m_dummy->child("TabWidget", TQTABWIDGET_OBJECT_NAME_STRING)));
+		TQTabWidget	*tabs = static_cast<TQTabWidget*>(TQT_TQWIDGET(d->m_dummy->child("TabWidget", "TQTabWidget")));
 		tabs->setTabEnabled( d->m_pages.at( index ), flag );
 	}
 	else
diff --git a/tdeprint/lpd/kmlpdfactory.h b/tdeprint/lpd/kmlpdfactory.h
index ffc05af71..8748e1e19 100644
--- a/tdeprint/lpd/kmlpdfactory.h
+++ b/tdeprint/lpd/kmlpdfactory.h
@@ -29,7 +29,7 @@ public:
 	virtual ~KLpdFactory();
 
 protected:
-	TQObject* createObject(TQObject *parent = 0, const char *name = 0, const char *className = TQOBJECT_OBJECT_NAME_STRING, const TQStringList& args = TQStringList());
+	TQObject* createObject(TQObject *parent = 0, const char *name = 0, const char *className = "TQObject", const TQStringList& args = TQStringList());
 };
 
 #endif
diff --git a/tdeprint/management/kiconselectaction.cpp b/tdeprint/management/kiconselectaction.cpp
index 984d2c128..ea6efa753 100644
--- a/tdeprint/management/kiconselectaction.cpp
+++ b/tdeprint/management/kiconselectaction.cpp
@@ -76,7 +76,7 @@ void TDEIconSelectAction::setItems(const TQStringList& lst, const TQStringList&
 int TDEIconSelectAction::plug(TQWidget* widget, int index)
 {
 	int	value(-1);
-	if (widget->inherits(TQPOPUPMENU_OBJECT_NAME_STRING))
+	if (widget->inherits("TQPopupMenu"))
 	{
 		createPopupMenu();
 		value = TDESelectAction::plug(widget, index);
diff --git a/tdeprint/tools/escputil/escpwidget.cpp b/tdeprint/tools/escputil/escpwidget.cpp
index 901d509c9..59ae3982d 100644
--- a/tdeprint/tools/escputil/escpwidget.cpp
+++ b/tdeprint/tools/escputil/escpwidget.cpp
@@ -39,7 +39,7 @@ class EscpFactory : public KLibFactory
 public:
 	EscpFactory(TQObject *parent = 0, const char *name = 0) : KLibFactory(parent, name) {}
 protected:
-	TQObject* createObject(TQObject *parent = 0, const char *name = 0, const char * className = TQOBJECT_OBJECT_NAME_STRING, const TQStringList& args = TQStringList())
+	TQObject* createObject(TQObject *parent = 0, const char *name = 0, const char * className = "TQObject", const TQStringList& args = TQStringList())
 	{
                Q_UNUSED(className);
 		KDialogBase	*dlg = new KDialogBase(TQT_TQWIDGET(parent), name, true, i18n("EPSON InkJet Printer Utilities"), KDialogBase::Close);