Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>

1 files changed, 17 insertions, 17 deletions

diff --git a/tdeui/tests/kcomboboxtest.cpp b/tdeui/tests/kcomboboxtest.cpp
index d2b59a4c2..7e51396c1 100644
--- a/tdeui/tests/kcomboboxtest.cpp
+++ b/tdeui/tests/kcomboboxtest.cpp
@@ -40,8 +40,8 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name )
   
   m_qc = new TQComboBox(hbox, "QtReadOnlyCombo" );
   lbl->setBuddy (m_qc);  
-  TQObject::connect (m_qc, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int)));
-  TQObject::connect (m_qc, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT (slotActivated(const TQString&)));
+  TQObject::connect (m_qc, TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivated(int)));
+  TQObject::connect (m_qc, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT (slotActivated(const TQString&)));
   vbox->addWidget (hbox);
   
   // Read-only combobox
@@ -53,8 +53,8 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name )
   m_ro = new KComboBox(hbox, "ReadOnlyCombo" );
   lbl->setBuddy (m_ro);
   m_ro->setCompletionMode( TDEGlobalSettings::CompletionAuto );
-  TQObject::connect (m_ro, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int)));
-  TQObject::connect (m_ro, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT (slotActivated(const TQString&)));
+  TQObject::connect (m_ro, TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivated(int)));
+  TQObject::connect (m_ro, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT (slotActivated(const TQString&)));
   vbox->addWidget (hbox);
 
   // Read-write combobox
@@ -68,10 +68,10 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name )
   m_rw->setDuplicatesEnabled( true );
   m_rw->setInsertionPolicy( TQComboBox::NoInsertion );
   m_rw->setTrapReturnKey( true );
-  TQObject::connect (m_rw, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int)));
-  TQObject::connect (m_rw, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotActivated(const TQString&)));
-  TQObject::connect (m_rw, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()));
-  TQObject::connect (m_rw, TQT_SIGNAL(returnPressed(const TQString&)), TQT_SLOT(slotReturnPressed(const TQString&)));
+  TQObject::connect (m_rw, TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivated(int)));
+  TQObject::connect (m_rw, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(slotActivated(const TQString&)));
+  TQObject::connect (m_rw, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()));
+  TQObject::connect (m_rw, TQ_SIGNAL(returnPressed(const TQString&)), TQ_SLOT(slotReturnPressed(const TQString&)));
   vbox->addWidget (hbox);
 
   // History combobox...
@@ -84,9 +84,9 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name )
   lbl->setBuddy (m_hc);
   m_hc->setDuplicatesEnabled( true );
   m_hc->setInsertionPolicy( TQComboBox::NoInsertion );
-  TQObject::connect (m_hc, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int)));
-  TQObject::connect (m_hc, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotActivated(const TQString&)));
-  TQObject::connect (m_hc, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()));  
+  TQObject::connect (m_hc, TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivated(int)));
+  TQObject::connect (m_hc, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(slotActivated(const TQString&)));
+  TQObject::connect (m_hc, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()));  
   vbox->addWidget (hbox);
   m_hc->setTrapReturnKey(true);
 
@@ -99,19 +99,19 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name )
   m_konqc = new KComboBox( true, hbox, "KonqyCombo" );
   lbl->setBuddy (m_konqc);
   m_konqc->setMaxCount( 10 );
-  TQObject::connect (m_konqc, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int)));
-  TQObject::connect (m_konqc, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT (slotActivated(const TQString&)));
-  TQObject::connect (m_konqc, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()));
+  TQObject::connect (m_konqc, TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivated(int)));
+  TQObject::connect (m_konqc, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT (slotActivated(const TQString&)));
+  TQObject::connect (m_konqc, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()));
   vbox->addWidget (hbox);
 
   // Create an exit button
   hbox = new TQHBox (this);
   m_btnExit = new TQPushButton( "E&xit", hbox );
-  TQObject::connect( m_btnExit, TQT_SIGNAL(clicked()), TQT_SLOT(quitApp()) );
+  TQObject::connect( m_btnExit, TQ_SIGNAL(clicked()), TQ_SLOT(quitApp()) );
 
   // Create a disable button...
   m_btnEnable = new TQPushButton( "Disa&ble", hbox );
-  TQObject::connect (m_btnEnable, TQT_SIGNAL(clicked()), TQT_SLOT(slotDisable()));
+  TQObject::connect (m_btnEnable, TQ_SIGNAL(clicked()), TQ_SLOT(slotDisable()));
 
   vbox->addWidget (hbox);
 
@@ -150,7 +150,7 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name )
   m_konqc->setCurrentItem( m_konqc->count()-1 );
 
   m_timer = new TQTimer (this);
-  connect (m_timer, TQT_SIGNAL (timeout()), TQT_SLOT (slotTimeout()));
+  connect (m_timer, TQ_SIGNAL (timeout()), TQ_SLOT (slotTimeout()));
 }
 
 KComboBoxTest::~KComboBoxTest()