Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 69e4de2f4cee257151ca13b207dc677b2d958fed)

7 files changed, 38 insertions, 38 deletions

diff --git a/libtdeedu/extdate/extdatepicker.cpp b/libtdeedu/extdate/extdatepicker.cpp
index 48eeeae6..b8874d75 100644
--- a/libtdeedu/extdate/extdatepicker.cpp
+++ b/libtdeedu/extdate/extdatepicker.cpp
@@ -178,17 +178,17 @@ void ExtDatePicker::init( const ExtDate &dt )
       monthForward->setIconSet(BarIconSet(TQString::fromLatin1("1rightarrow")));
       monthBackward->setIconSet(BarIconSet(TQString::fromLatin1("1leftarrow")));
   }
-  connect(table, TQT_SIGNAL(dateChanged(const ExtDate&)), TQT_SLOT(dateChangedSlot(const ExtDate&)));
-  connect(table, TQT_SIGNAL(tableClicked()), TQT_SLOT(tableClickedSlot()));
-  connect(monthForward, TQT_SIGNAL(clicked()), TQT_SLOT(monthForwardClicked()));
-  connect(monthBackward, TQT_SIGNAL(clicked()), TQT_SLOT(monthBackwardClicked()));
-  connect(yearForward, TQT_SIGNAL(clicked()), TQT_SLOT(yearForwardClicked()));
-  connect(yearBackward, TQT_SIGNAL(clicked()), TQT_SLOT(yearBackwardClicked()));
-  connect(d->selectWeek, TQT_SIGNAL(activated(int)), TQT_SLOT(weekSelected(int)));
-  connect(d->todayButton, TQT_SIGNAL(clicked()), TQT_SLOT(todayButtonClicked()));
-  connect(selectMonth, TQT_SIGNAL(clicked()), TQT_SLOT(selectMonthClicked()));
-  connect(selectYear, TQT_SIGNAL(toggled(bool)), TQT_SLOT(selectYearClicked()));
-  connect(line, TQT_SIGNAL(returnPressed()), TQT_SLOT(lineEnterPressed()));
+  connect(table, TQ_SIGNAL(dateChanged(const ExtDate&)), TQ_SLOT(dateChangedSlot(const ExtDate&)));
+  connect(table, TQ_SIGNAL(tableClicked()), TQ_SLOT(tableClickedSlot()));
+  connect(monthForward, TQ_SIGNAL(clicked()), TQ_SLOT(monthForwardClicked()));
+  connect(monthBackward, TQ_SIGNAL(clicked()), TQ_SLOT(monthBackwardClicked()));
+  connect(yearForward, TQ_SIGNAL(clicked()), TQ_SLOT(yearForwardClicked()));
+  connect(yearBackward, TQ_SIGNAL(clicked()), TQ_SLOT(yearBackwardClicked()));
+  connect(d->selectWeek, TQ_SIGNAL(activated(int)), TQ_SLOT(weekSelected(int)));
+  connect(d->todayButton, TQ_SIGNAL(clicked()), TQ_SLOT(todayButtonClicked()));
+  connect(selectMonth, TQ_SIGNAL(clicked()), TQ_SLOT(selectMonthClicked()));
+  connect(selectYear, TQ_SIGNAL(toggled(bool)), TQ_SLOT(selectYearClicked()));
+  connect(line, TQ_SIGNAL(returnPressed()), TQ_SLOT(lineEnterPressed()));
   table->setFocus();
 
 
@@ -388,7 +388,7 @@ ExtDatePicker::selectYearClicked()
   // -----
   picker->resize(picker->sizeHint());
   popup->setMainWidget(picker);
-  connect(picker, TQT_SIGNAL(closeMe(int)), popup, TQT_SLOT(close(int)));
+  connect(picker, TQ_SIGNAL(closeMe(int)), popup, TQ_SLOT(close(int)));
   picker->setFocus();
   if(popup->exec(selectYear->mapToGlobal(TQPoint(0, selectMonth->height()))))
     {
@@ -511,8 +511,8 @@ ExtDatePicker::setCloseButton( bool enable )
         d->navigationLayout->addWidget(d->closeButton);
         TQToolTip::add(d->closeButton, i18n("Close"));
         d->closeButton->setPixmap( SmallIcon("remove") );
-        connect( d->closeButton, TQT_SIGNAL( clicked() ),
-                 topLevelWidget(), TQT_SLOT( close() ) );
+        connect( d->closeButton, TQ_SIGNAL( clicked() ),
+                 topLevelWidget(), TQ_SLOT( close() ) );
     }
     else {
         delete d->closeButton;
diff --git a/libtdeedu/extdate/extdatetbl.cpp b/libtdeedu/extdate/extdatetbl.cpp
index a4a8e244..662e8a7c 100644
--- a/libtdeedu/extdate/extdatetbl.cpp
+++ b/libtdeedu/extdate/extdatetbl.cpp
@@ -576,7 +576,7 @@ ExtDateInternalWeekSelector::ExtDateInternalWeekSelector
   setFont(font);
   setFrameStyle(TQFrame::NoFrame);
   setValidator(val);
-  connect(this, TQT_SIGNAL(returnPressed()), TQT_SLOT(weekEnteredSlot()));
+  connect(this, TQ_SIGNAL(returnPressed()), TQ_SLOT(weekEnteredSlot()));
 }
 
 void
@@ -826,7 +826,7 @@ ExtDateInternalYearSelector::ExtDateInternalYearSelector
   //there si also a year limit in ExtCalendarSystemGregorian...
   val->setRange(-50000, 50000);
   setValidator(val);
-  connect(this, TQT_SIGNAL(returnPressed()), TQT_SLOT(yearEnteredSlot()));
+  connect(this, TQ_SIGNAL(returnPressed()), TQ_SLOT(yearEnteredSlot()));
 }
 
 ExtDateInternalYearSelector::~ExtDateInternalYearSelector() {
diff --git a/libtdeedu/extdate/extdatetimeedit.cpp b/libtdeedu/extdate/extdatetimeedit.cpp
index 1d67eae3..d9f19cd6 100644
--- a/libtdeedu/extdate/extdatetimeedit.cpp
+++ b/libtdeedu/extdate/extdatetimeedit.cpp
@@ -830,10 +830,10 @@ void ExtDateEdit::init()
   d->ed = new ExtDateTimeEditor( this, "date editor" );
   d->controls->setEditWidget( d->ed );
   setFocusProxy( d->ed );
-  connect( d->controls, TQT_SIGNAL( stepUpPressed() ), TQT_SLOT( stepUp() ) );
-  connect( d->controls, TQT_SIGNAL( stepDownPressed() ), TQT_SLOT( stepDown() ) );
-  connect( this, TQT_SIGNAL( valueChanged(const ExtDate&) ),
-      TQT_SLOT( updateButtons() ) );
+  connect( d->controls, TQ_SIGNAL( stepUpPressed() ), TQ_SLOT( stepUp() ) );
+  connect( d->controls, TQ_SIGNAL( stepDownPressed() ), TQ_SLOT( stepDown() ) );
+  connect( this, TQ_SIGNAL( valueChanged(const ExtDate&) ),
+      TQ_SLOT( updateButtons() ) );
   d->ed->appendSection( TQNumberSection( 0,4 ) );
   d->ed->appendSection( TQNumberSection( 5,7 ) );
   d->ed->appendSection( TQNumberSection( 8,10 ) );
@@ -1740,8 +1740,8 @@ public:
 //     d->controls = new ExtDateTimeSpinWidget( this, qstrcmp( name(), "qt_datetime_timeedit" ) == 0 ? "qt_spin_widget" : "time edit controls" );
 //     d->controls->setEditWidget( d->ed );
 //     setFocusProxy( d->ed );
-//     connect( d->controls, TQT_SIGNAL( stepUpPressed() ), TQT_SLOT( stepUp() ) );
-//     connect( d->controls, TQT_SIGNAL( stepDownPressed() ), TQT_SLOT( stepDown() ) );
+//     connect( d->controls, TQ_SIGNAL( stepUpPressed() ), TQ_SLOT( stepUp() ) );
+//     connect( d->controls, TQ_SIGNAL( stepDownPressed() ), TQ_SLOT( stepDown() ) );
 //
 //     d->ed->appendSection( TQNumberSection( 0,0, TRUE, 0 ) );
 //     d->ed->appendSection( TQNumberSection( 0,0, TRUE, 1 ) );
@@ -2610,10 +2610,10 @@ void ExtDateTimeEdit::init()
     de = new ExtDateEdit( this, "qt_datetime_dateedit" );
     te = new TQTimeEdit( this, "qt_datetime_timeedit" );
     d->adv = FALSE;
-    connect( de, TQT_SIGNAL( valueChanged( const ExtDate& ) ),
-	     this, TQT_SLOT( newValue( const ExtDate& ) ) );
-    connect( te, TQT_SIGNAL( valueChanged( const TQTime& ) ),
-	     this, TQT_SLOT( newValue( const TQTime& ) ) );
+    connect( de, TQ_SIGNAL( valueChanged( const ExtDate& ) ),
+	     this, TQ_SLOT( newValue( const ExtDate& ) ) );
+    connect( te, TQ_SIGNAL( valueChanged( const TQTime& ) ),
+	     this, TQ_SLOT( newValue( const TQTime& ) ) );
     setFocusProxy( de );
     setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed );
 }
diff --git a/libtdeedu/extdate/extdatewidget.cpp b/libtdeedu/extdate/extdatewidget.cpp
index 5d790bf4..87252215 100644
--- a/libtdeedu/extdate/extdatewidget.cpp
+++ b/libtdeedu/extdate/extdatewidget.cpp
@@ -89,9 +89,9 @@ ExtDateWidget::ExtDateWidget( const ExtDate &date, TQWidget *parent,
 //   d->m_year = new ExtDateWidgetSpinBox(d->calendar->minValidYear(),
 // 				     d->calendar->maxValidYear(), this);
 //
-//   connect(d->m_day, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotDateChanged()));
-//   connect(d->m_month, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotDateChanged()));
-//   connect(d->m_year, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotDateChanged()));
+//   connect(d->m_day, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotDateChanged()));
+//   connect(d->m_month, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotDateChanged()));
+//   connect(d->m_year, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotDateChanged()));
 // }
 
 void ExtDateWidget::init(const ExtDate& date)
@@ -113,9 +113,9 @@ void ExtDateWidget::init(const ExtDate& date)
   d->m_year = new ExtDateWidgetSpinBox(d->calendar->minValidYear(),
 				     d->calendar->maxValidYear(), this);
 
-  connect(d->m_day, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotDateChanged()));
-  connect(d->m_month, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotDateChanged()));
-  connect(d->m_year, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotDateChanged()));
+  connect(d->m_day, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotDateChanged()));
+  connect(d->m_month, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotDateChanged()));
+  connect(d->m_year, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotDateChanged()));
 }
 
 ExtDateWidget::~ExtDateWidget()
diff --git a/libtdeedu/extdate/main.cpp b/libtdeedu/extdate/main.cpp
index 53e8d92f..585668c6 100644
--- a/libtdeedu/extdate/main.cpp
+++ b/libtdeedu/extdate/main.cpp
@@ -25,6 +25,6 @@ int main( int argc, char *argv[] )
 	TDEApplication a;
 	TestWidget *t = new TestWidget(0,0);
 	t->show();
-	TQObject::connect(kapp, TQT_SIGNAL(lastWindowClosed()), kapp, TQT_SLOT(quit()));
+	TQObject::connect(kapp, TQ_SIGNAL(lastWindowClosed()), kapp, TQ_SLOT(quit()));
 	return a.exec();
 }
diff --git a/libtdeedu/extdate/testwidget.cpp b/libtdeedu/extdate/testwidget.cpp
index a6912ef4..81965cc1 100644
--- a/libtdeedu/extdate/testwidget.cpp
+++ b/libtdeedu/extdate/testwidget.cpp
@@ -53,8 +53,8 @@ TestWidget::TestWidget( TQWidget *p, const char *name ) : TDEMainWindow( p, name
 
 	setCentralWidget(w);
 
-	connect( kdp, TQT_SIGNAL( dateChanged(TQDate) ), this, TQT_SLOT( slotKDateChanged(TQDate) ) );
-	connect( edp, TQT_SIGNAL( dateChanged(const ExtDate&) ), this, TQT_SLOT( slotExtDateChanged(const ExtDate&) ) );
+	connect( kdp, TQ_SIGNAL( dateChanged(TQDate) ), this, TQ_SLOT( slotKDateChanged(TQDate) ) );
+	connect( edp, TQ_SIGNAL( dateChanged(const ExtDate&) ), this, TQ_SLOT( slotExtDateChanged(const ExtDate&) ) );
 }
 
 void TestWidget::slotKDateChanged(TQDate d) {
diff --git a/libtdeedu/tdeeduui/tdeeduglossary.cpp b/libtdeedu/tdeeduui/tdeeduglossary.cpp
index 50443f2f..5bb50343 100644
--- a/libtdeedu/tdeeduui/tdeeduglossary.cpp
+++ b/libtdeedu/tdeeduui/tdeeduglossary.cpp
@@ -203,9 +203,9 @@ GlossaryDialog::GlossaryDialog( bool folded, TQWidget *parent, const char *name)
  
 	m_htmlpart = new TDEHTMLPart( vs, "html-part" );
  
-	connect( m_htmlpart->browserExtension(), TQT_SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs & ) ), this, TQT_SLOT( displayItem( const KURL &, const KParts::URLArgs & ) ) );
-	connect( m_glosstree, TQT_SIGNAL(clicked( TQListViewItem * )), this, TQT_SLOT(slotClicked( TQListViewItem * )));
-	connect( clear, TQT_SIGNAL(clicked()), m_search, TQT_SLOT(clear()));
+	connect( m_htmlpart->browserExtension(), TQ_SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs & ) ), this, TQ_SLOT( displayItem( const KURL &, const KParts::URLArgs & ) ) );
+	connect( m_glosstree, TQ_SIGNAL(clicked( TQListViewItem * )), this, TQ_SLOT(slotClicked( TQListViewItem * )));
+	connect( clear, TQ_SIGNAL(clicked()), m_search, TQ_SLOT(clear()));
  
 	resize( 600, 400 );
 }