Remove various '#define' strings - part 6

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

5 files changed, 12 insertions, 12 deletions

diff --git a/kmymoney2/widgets/kmymoneycalculator.cpp b/kmymoney2/widgets/kmymoneycalculator.cpp
index 5222288..758f4a2 100644
--- a/kmymoney2/widgets/kmymoneycalculator.cpp
+++ b/kmymoney2/widgets/kmymoneycalculator.cpp
@@ -108,17 +108,17 @@ kMyMoneyCalculator::kMyMoneyCalculator(TQWidget* parent, const char *name)
   changeDisplay("0");
 
   // connect the digit signals through a signal mapper
-  TQSignalMapper* mapper = new TQSignalMapper(TQT_TQOBJECT(this));
+  TQSignalMapper* mapper = new TQSignalMapper(this);
   for(int i = 0; i < 10; ++i) {
-    mapper->setMapping(TQT_TQOBJECT(buttons[i]), i);
+    mapper->setMapping(buttons[i], i);
     connect(buttons[i], TQT_SIGNAL(clicked()), mapper, TQT_SLOT(map()));
   }
   connect(mapper, TQT_SIGNAL(mapped(int)), this, TQT_SLOT(digitClicked(int)));
 
   // connect the calculation operations through another mapper
-  mapper = new TQSignalMapper(TQT_TQOBJECT(this));
+  mapper = new TQSignalMapper(this);
   for(int i = PLUS; i <= EQUAL; ++i) {
-    mapper->setMapping(TQT_TQOBJECT(buttons[i]), i);
+    mapper->setMapping(buttons[i], i);
     connect(buttons[i], TQT_SIGNAL(clicked()), mapper, TQT_SLOT(map()));
   }
   connect(mapper, TQT_SIGNAL(mapped(int)), this, TQT_SLOT(calculationClicked(int)));
diff --git a/kmymoney2/widgets/kmymoneydateinput.cpp b/kmymoney2/widgets/kmymoneydateinput.cpp
index 539660d..957b245 100644
--- a/kmymoney2/widgets/kmymoneydateinput.cpp
+++ b/kmymoney2/widgets/kmymoneydateinput.cpp
@@ -149,9 +149,9 @@ kMyMoneyDateInput::kMyMoneyDateInput(TQWidget *parent, const char *name, TQt::Al
 void kMyMoneyDateInput::markAsBadDate(bool bad, const TQColor& color)
 {
   if(dateEdit->focusProxy()) {
-    TQT_TQWIDGET(dateEdit->focusProxy())->setPaletteForegroundColor(paletteForegroundColor());
+    dateEdit->focusProxy()->setPaletteForegroundColor(paletteForegroundColor());
     if(bad)
-      TQT_TQWIDGET(dateEdit->focusProxy())->setPaletteForegroundColor(color);
+      dateEdit->focusProxy()->setPaletteForegroundColor(color);
   }
 }
 
@@ -345,7 +345,7 @@ TQWidget* kMyMoneyDateInput::focusWidget(void) const
 {
   TQWidget* w = dateEdit;
   while(w->focusProxy())
-    w = TQT_TQWIDGET(w->focusProxy());
+    w = w->focusProxy();
   return w;
 }
 
diff --git a/kmymoney2/widgets/kmymoneyedit.cpp b/kmymoney2/widgets/kmymoneyedit.cpp
index 609037e..cef4ffb 100644
--- a/kmymoney2/widgets/kmymoneyedit.cpp
+++ b/kmymoney2/widgets/kmymoneyedit.cpp
@@ -213,7 +213,7 @@ void kMyMoneyEdit::init(void)
   setFocusProxy(m_edit);
 
   // Yes, just a simple double validator !
-  kMyMoneyMoneyValidator *validator = new kMyMoneyMoneyValidator(TQT_TQOBJECT(this));
+  kMyMoneyMoneyValidator *validator = new kMyMoneyMoneyValidator(this);
   m_edit->setValidator(validator);
   m_edit->setAlignment(AlignRight | AlignVCenter);
 
@@ -504,7 +504,7 @@ TQWidget* kMyMoneyEdit::focusWidget(void) const
 {
   TQWidget* w = m_edit;
   while(w->focusProxy())
-    w = TQT_TQWIDGET(w->focusProxy());
+    w = w->focusProxy();
   return w;
 }
 
diff --git a/kmymoney2/widgets/kmymoneywizard.cpp b/kmymoney2/widgets/kmymoneywizard.cpp
index 395b329..42740fe 100644
--- a/kmymoney2/widgets/kmymoneywizard.cpp
+++ b/kmymoney2/widgets/kmymoneywizard.cpp
@@ -60,9 +60,9 @@ void KMyMoneyWizardPagePrivate::emitCompleteStateChanged(void)
 KMyMoneyWizardPage::KMyMoneyWizardPage(unsigned int step, TQWidget* widget, const char* name) :
   m_step(step),
   m_widget(widget),
-  d(new KMyMoneyWizardPagePrivate(TQT_TQOBJECT(widget), name))
+  d(new KMyMoneyWizardPagePrivate(widget, name))
 {
-  m_mandatoryGroup = new kMandatoryFieldGroup(TQT_TQOBJECT(widget));
+  m_mandatoryGroup = new kMandatoryFieldGroup(widget);
   TQObject::connect(m_mandatoryGroup, TQT_SIGNAL(stateChanged()), object(), TQT_SIGNAL(completeStateChanged()));
   widget->hide();
 }
diff --git a/kmymoney2/widgets/transaction.cpp b/kmymoney2/widgets/transaction.cpp
index 4327bdd..7f153ff 100644
--- a/kmymoney2/widgets/transaction.cpp
+++ b/kmymoney2/widgets/transaction.cpp
@@ -606,7 +606,7 @@ TQWidget* Transaction::focusWidget(TQWidget* w) const
 {
   if(w) {
     while(w->focusProxy())
-      w = TQT_TQWIDGET(w->focusProxy());
+      w = w->focusProxy();
   }
   return w;
 }