Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

2 files changed, 26 insertions, 26 deletions

diff --git a/kteatime/timeedit.cpp b/kteatime/timeedit.cpp
index 221029d..032b12e 100644
--- a/kteatime/timeedit.cpp
+++ b/kteatime/timeedit.cpp
@@ -71,10 +71,10 @@ TimeEdit::TimeEdit(TQWidget* parent, const char* name)
 	layout->addWidget(secondBox);
 	layout->addWidget(sec);
 
-	connect(minuteBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(spinBoxValueChanged(int)) );
-	connect(secondBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(spinBoxValueChanged(int)) );
-	connect(secondBox, TQT_SIGNAL(wrapUp()), TQT_SLOT(wrappedUp()));
-	connect(secondBox, TQT_SIGNAL(wrapDown()), TQT_SLOT(wrappedDown()));
+	connect(minuteBox, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(spinBoxValueChanged(int)) );
+	connect(secondBox, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(spinBoxValueChanged(int)) );
+	connect(secondBox, TQ_SIGNAL(wrapUp()), TQ_SLOT(wrappedUp()));
+	connect(secondBox, TQ_SIGNAL(wrapDown()), TQ_SLOT(wrappedDown()));
 }
 
 TimeEdit::~TimeEdit()
@@ -107,7 +107,7 @@ int TimeEdit::value()
 	return minuteBox->value()*60 + secondBox->value();
 }
 
-/** SLOT: Handle wrap-up of seconds-box */
+/** Slot: Handle wrap-up of seconds-box */
 void TimeEdit::wrappedUp()
 {
 	if (minuteBox->value() != minuteBox->maxValue()) {
@@ -117,7 +117,7 @@ void TimeEdit::wrappedUp()
 	}
 }
 
-/** SLOT: Handle wrap-down of seconds-box */
+/** Slot: Handle wrap-down of seconds-box */
 void TimeEdit::wrappedDown()
 {
 	// well, the "if" should always be true
@@ -128,7 +128,7 @@ void TimeEdit::wrappedDown()
 	}
 }
 
-/** SLOT: Handle any change in minutes of seconds */
+/** Slot: Handle any change in minutes of seconds */
 void TimeEdit::spinBoxValueChanged(int)
 {
 	if (value() == 0) {
@@ -139,7 +139,7 @@ void TimeEdit::spinBoxValueChanged(int)
 	emit valueChanged(value());
 }
 
-/** TQT_SLOT (overloading TQSpinBox): set focus */
+/** Slot (overloading TQSpinBox): set focus */
 void TimeEdit::setFocus()
 {
 	minuteBox->setFocus();
diff --git a/kteatime/toplevel.cpp b/kteatime/toplevel.cpp
index b7ecb46..f38437a 100644
--- a/kteatime/toplevel.cpp
+++ b/kteatime/toplevel.cpp
@@ -118,24 +118,24 @@ TopLevel::TopLevel() : KSystemTray()
 
 
 	startAct = new TDEAction(i18n("&Start"), "1rightarrow", 0,
-	                       this, TQT_SLOT(start()), actionCollection(), "start");
+	                       this, TQ_SLOT(start()), actionCollection(), "start");
 	stopAct = new TDEAction(i18n("Sto&p"), "cancel", 0,
-	                      this, TQT_SLOT(stop()), actionCollection(), "stop");
+	                      this, TQ_SLOT(stop()), actionCollection(), "stop");
 	confAct = new TDEAction(i18n("&Configure..."), "configure", 0,
-	                      this, TQT_SLOT(config()), actionCollection(), "configure");
+	                      this, TQ_SLOT(config()), actionCollection(), "configure");
 	anonAct = new TDEAction(i18n("&Anonymous..."), 0, 0,
-	                      this, TQT_SLOT(anonymous()), actionCollection(), "anonymous");
+	                      this, TQ_SLOT(anonymous()), actionCollection(), "anonymous");
 //	TDEAction *quitAct = actionCollection()->action("file_quit");
 
 	// create app menu (displayed on right-click)
 	menu = new TQPopupMenu();
 	menu->setCheckable(true);
-	connect(menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(teaSelected(int)));
+	connect(menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(teaSelected(int)));
 
 	// this menu will be displayed when no tea is steeping, and left mouse button is clicked
 	start_menu = new TQPopupMenu();
 	start_menu->setCheckable(true);     // menu isn't tickable, but this gives some add. spacing
-	connect(start_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(teaStartSelected(int)));
+	connect(start_menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(teaStartSelected(int)));
 
 	rebuildTeaMenus();      // populate tops of menus with tea-entries from config
 
@@ -152,13 +152,13 @@ TopLevel::TopLevel() : KSystemTray()
 	menu->insertSeparator();
 	confAct->plug(menu);
 	menu->insertItem(SmallIcon("help"), i18n("&Help"), helpMnu);
-	menu->insertItem(SmallIcon("system-log-out"), i18n("Quit"), kapp, TQT_SLOT(quit()));
+	menu->insertItem(SmallIcon("system-log-out"), i18n("Quit"), kapp, TQ_SLOT(quit()));
 //	quitAct->plug(menu);    // FIXME: this doesn't seem to work with above definition of quitAct?
 	                        //        (need special 'quit'-method?)
 
 	// this menu will be displayed when a tea is steeping, and left mouse button is clicked
 	steeping_menu = new TQPopupMenu();
-//	steeping_menu->insertItem(SmallIcon("cancel"), i18n("Just &Cancel Current"), this, TQT_SLOT(stop()));
+//	steeping_menu->insertItem(SmallIcon("cancel"), i18n("Just &Cancel Current"), this, TQ_SLOT(stop()));
 	stopAct->plug(steeping_menu);   // FIXME: can provide different text for this incarnation?
 
 //	start_menu->insertSeparator();
@@ -691,7 +691,7 @@ void TopLevel::config()
     listbox->addColumn(i18n("Time"));
     listbox->header()->setClickEnabled(false, listbox->header()->count()-1);
     listbox->setSorting(-1);
-    connect(listbox, TQT_SIGNAL(selectionChanged()), TQT_SLOT(listBoxItemSelected()));
+    connect(listbox, TQ_SIGNAL(selectionChanged()), TQ_SLOT(listBoxItemSelected()));
 
     // now buttons for editing the tea-list
     TQWidget *listgroup_widget = new TQWidget(listgroup);
@@ -701,28 +701,28 @@ void TopLevel::config()
     TQToolTip::add(btn_new, i18n("New"));
     btn_new->setPixmap(SmallIcon("document-new"));
     btn_new->setMinimumSize(btn_new->sizeHint() * 1.2);
-    connect(btn_new, TQT_SIGNAL(clicked()), TQT_SLOT(newButtonClicked()));
+    connect(btn_new, TQ_SIGNAL(clicked()), TQ_SLOT(newButtonClicked()));
     hbox->addWidget(btn_new);
 
     btn_del = new TQPushButton(TQString(), listgroup_widget);
     TQToolTip::add(btn_del, i18n("Delete"));
     btn_del->setIconSet(SmallIconSet("edit-delete"));
     btn_del->setMinimumSize(btn_new->sizeHint() * 1.2);
-    connect(btn_del, TQT_SIGNAL(clicked()), TQT_SLOT(delButtonClicked()));
+    connect(btn_del, TQ_SIGNAL(clicked()), TQ_SLOT(delButtonClicked()));
     hbox->addWidget(btn_del);
 
     btn_up = new TQPushButton(TQString(), listgroup_widget);
     TQToolTip::add(btn_up, i18n("Up"));
     btn_up->setIconSet(SmallIconSet("go-up"));
     btn_up->setMinimumSize(btn_up->sizeHint() * 1.2);
-    connect(btn_up, TQT_SIGNAL(clicked()), TQT_SLOT(upButtonClicked()));
+    connect(btn_up, TQ_SIGNAL(clicked()), TQ_SLOT(upButtonClicked()));
     hbox->addWidget(btn_up);
 
     btn_down = new TQPushButton(TQString(), listgroup_widget);
     TQToolTip::add(btn_down, i18n("Down"));
     btn_down->setIconSet(SmallIconSet("go-down"));
     btn_down->setMinimumSize(btn_down->sizeHint() * 1.2);
-    connect(btn_down, TQT_SIGNAL(clicked()), TQT_SLOT(downButtonClicked()));
+    connect(btn_down, TQ_SIGNAL(clicked()), TQ_SLOT(downButtonClicked()));
     hbox->addWidget(btn_down);
 
     hbox->addStretch(10);
@@ -742,13 +742,13 @@ void TopLevel::config()
     nameEdit->setAlignment(TQLineEdit::AlignLeft);
     TQLabel *l = new TQLabel(nameEdit, i18n("Name:"), propleft);
     l->setFixedSize(l->sizeHint());
-    connect(nameEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(nameEditTextChanged(const TQString&)) );
+    connect(nameEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(nameEditTextChanged(const TQString&)) );
 
     timeEdit = new TimeEdit(propright);
     timeEdit->setFixedHeight(timeEdit->sizeHint().height());
     l = new TQLabel(timeEdit, i18n("Tea time:"), propleft);
     l->setFixedSize(l->sizeHint());
-    connect(timeEdit, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(spinBoxValueChanged(int)));
+    connect(timeEdit, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(spinBoxValueChanged(int)));
 
     /* bottom - timeout actions */
     TQGroupBox *actiongroup = new TQGroupBox(4,TQt::Vertical, i18n("Action"), page);
@@ -758,7 +758,7 @@ void TopLevel::config()
     TQBoxLayout *actionconf_hbox = new TQHBoxLayout(actionconf_widget);
     btn_conf = new TQPushButton(i18n("Configure Events..."), actionconf_widget);
     actionconf_hbox->addWidget(btn_conf);
-    connect(btn_conf, TQT_SIGNAL(clicked()), TQT_SLOT(confButtonClicked()));
+    connect(btn_conf, TQ_SIGNAL(clicked()), TQ_SLOT(confButtonClicked()));
     actionconf_hbox->addStretch(10);
 
     eventEnable = new TQCheckBox(i18n("Event"), actiongroup);
@@ -773,7 +773,7 @@ void TopLevel::config()
     actionEdit = new TQLineEdit(actionbox);
     actionEdit->setFixedHeight(actionEdit->sizeHint().height());
     TQToolTip::add(actionEdit, i18n("Enter command here; '%t' will be replaced with name of steeping tea"));
-    connect(actionEnable, TQT_SIGNAL(toggled(bool)), TQT_SLOT(actionEnableToggled(bool)));
+    connect(actionEnable, TQ_SIGNAL(toggled(bool)), TQ_SLOT(actionEnableToggled(bool)));
     rightside->addStretch();
 
     // single checkbox
@@ -784,7 +784,7 @@ void TopLevel::config()
     // let listbox claim all remaining vertical space
     top_box->setStretchFactor(box, 10);
 
-    connect(confdlg, TQT_SIGNAL(helpClicked()), TQT_SLOT(help()));
+    connect(confdlg, TQ_SIGNAL(helpClicked()), TQ_SLOT(help()));
   }
 
   // now add all defined teas (and their times) to the listview