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>

kmymoney2/views/kmymoneyview.cpp

@@ -254,7 +254,7 @@ KMyMoneyView::KMyMoneyView(TQWidget *parent, const char *name)
   m_forecastView = new KForecastView(m_forecastViewFrame, "ForecastView");
 
   // get rid of the title text
-  TQWidget* widget = dynamic_cast<TQWidget*>(child("KJanusWidgetTitleLabel", TQLABEL_OBJECT_NAME_STRING));
+  TQWidget* widget = dynamic_cast<TQWidget*>(child("KJanusWidgetTitleLabel", "TQLabel"));
   if(widget)
     widget->hide();
 

kmymoney2/widgets/kguiutils.cpp

@@ -55,13 +55,13 @@
 void kMandatoryFieldGroup::add(TQWidget *widget)
 {
   if (!widgets.contains(widget)) {
-    if (widget->inherits(TQCHECKBOX_OBJECT_NAME_STRING))
-      connect((TQCheckBox*)widget->tqt_cast(TQCHECKBOX_OBJECT_NAME_STRING),
+    if (widget->inherits("TQCheckBox"))
+      connect((TQCheckBox*)widget->tqt_cast("TQCheckBox"),
                TQT_SIGNAL(clicked()),
                this, TQT_SLOT(changed()));
 
-    else if (widget->inherits(TQCOMBOBOX_OBJECT_NAME_STRING)) {
-      TQComboBox* combo = (TQComboBox*)widget->tqt_cast(TQCOMBOBOX_OBJECT_NAME_STRING);
+    else if (widget->inherits("TQComboBox")) {
+      TQComboBox* combo = (TQComboBox*)widget->tqt_cast("TQComboBox");
       TQLineEdit* lineedit = combo->lineEdit();
       if(lineedit) {
         connect(lineedit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(changed()));
@@ -70,18 +70,18 @@ void kMandatoryFieldGroup::add(TQWidget *widget)
       }
     }
 
-    else if (widget->inherits(TQLINEEDIT_OBJECT_NAME_STRING))
-      connect((TQLineEdit*)widget->tqt_cast(TQLINEEDIT_OBJECT_NAME_STRING),
+    else if (widget->inherits("TQLineEdit"))
+      connect((TQLineEdit*)widget->tqt_cast("TQLineEdit"),
                TQT_SIGNAL(textChanged(const TQString&)),
                this, TQT_SLOT(changed()));
 
-    else if (widget->inherits(TQSPINBOX_OBJECT_NAME_STRING))
-      connect((TQSpinBox*)widget->tqt_cast(TQSPINBOX_OBJECT_NAME_STRING),
+    else if (widget->inherits("TQSpinBox"))
+      connect((TQSpinBox*)widget->tqt_cast("TQSpinBox"),
                TQT_SIGNAL(valueChanged(const TQString&)),
                       this, TQT_SLOT(changed()));
 
-    else if (widget->inherits(TQLISTBOX_OBJECT_NAME_STRING))
-      connect((TQListBox*)widget->tqt_cast(TQLISTBOX_OBJECT_NAME_STRING),
+    else if (widget->inherits("TQListBox"))
+      connect((TQListBox*)widget->tqt_cast("TQListBox"),
                TQT_SIGNAL(selectionChanged()),
                       this, TQT_SLOT(changed()));
 
@@ -125,29 +125,29 @@ void kMandatoryFieldGroup::changed(void)
     if(!(widget->isEnabled())) {
       continue;
     }
-    if (widget->inherits(TQCHECKBOX_OBJECT_NAME_STRING)) {
-      if (((TQCheckBox*)widget->tqt_cast(TQCHECKBOX_OBJECT_NAME_STRING))->state() == TQButton::NoChange) {
+    if (widget->inherits("TQCheckBox")) {
+      if (((TQCheckBox*)widget->tqt_cast("TQCheckBox"))->state() == TQButton::NoChange) {
         enable = false;
         break;
       } else
         continue;
     }
-    if (widget->inherits(TQCOMBOBOX_OBJECT_NAME_STRING)) {
-      if (((TQComboBox*)widget->tqt_cast(TQCOMBOBOX_OBJECT_NAME_STRING))->currentText().isEmpty()) {
+    if (widget->inherits("TQComboBox")) {
+      if (((TQComboBox*)widget->tqt_cast("TQComboBox"))->currentText().isEmpty()) {
         enable = false;
         break;
       } else
         continue;
     }
-    if (widget->inherits(TQLINEEDIT_OBJECT_NAME_STRING)) {
-      if (((TQLineEdit*)widget->tqt_cast(TQLINEEDIT_OBJECT_NAME_STRING))->text().isEmpty()) {
+    if (widget->inherits("TQLineEdit")) {
+      if (((TQLineEdit*)widget->tqt_cast("TQLineEdit"))->text().isEmpty()) {
         enable = false;
         break;
       } else
         continue;
     }
-    if (widget->inherits(TQLISTBOX_OBJECT_NAME_STRING)) {
-      if (((TQListBox*)widget->tqt_cast(TQLISTBOX_OBJECT_NAME_STRING))->selectedItem() == 0) {
+    if (widget->inherits("TQListBox")) {
+      if (((TQListBox*)widget->tqt_cast("TQListBox"))->selectedItem() == 0) {
         enable = false;
         break;
       } else