Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

7 files changed, 31 insertions, 31 deletions

diff --git a/kanagram/src/kanagram.cpp b/kanagram/src/kanagram.cpp
index bf0f0c1f..d6ba31af 100644
--- a/kanagram/src/kanagram.cpp
+++ b/kanagram/src/kanagram.cpp
@@ -119,9 +119,9 @@ Kanagram::Kanagram() : TQWidget(0, 0, WStaticContents | WNoAutoErase), m_overNex
 	m_inputBox->setGeometry(TQRect(52, 427, 273, 29));
 	m_inputBox->setFrame(false);
 	
-	connect(m_inputBox, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(checkWord()));
-	connect(m_hintTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(hideHint()));
-	connect(m_inputBox, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(update()));
+	connect(m_inputBox, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(checkWord()));
+	connect(m_hintTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(hideHint()));
+	connect(m_inputBox, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(update()));
 	
 	TQFont f = TQFont();
 	f.setPointSize(17);
@@ -465,7 +465,7 @@ void Kanagram::mousePressEvent(TQMouseEvent *e)
 		{
 			if(m_useSounds) play("right.ogg");
 			m_inputBox->setPaletteBackgroundColor(TQColor(0, 255, 0));
-			TQTimer::singleShot(1000, this, TQT_SLOT(resetInputBox()));
+			TQTimer::singleShot(1000, this, TQ_SLOT(resetInputBox()));
 			m_inputBox->clear();
 			hideHint();
 			m_game->nextAnagram();
@@ -475,7 +475,7 @@ void Kanagram::mousePressEvent(TQMouseEvent *e)
 		{
 			if(m_useSounds) play("wrong.ogg");
 			m_inputBox->setPaletteBackgroundColor(TQColor(255, 0, 0));
-			TQTimer::singleShot(1000, this, TQT_SLOT(resetInputBox()));
+			TQTimer::singleShot(1000, this, TQ_SLOT(resetInputBox()));
 			m_inputBox->clear();
 			update();
 		}
@@ -744,8 +744,8 @@ void Kanagram::showSettings()
 	m_vocabSettings = new VocabSettings( configDialog );
 	configDialog->addPage( m_vocabSettings, i18n("Vocabularies"), "edit" );
 	configDialog->addPage( new NewStuff( configDialog ), i18n("New Stuff"), "knewstuff" );
-	connect(configDialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(loadSettings()));
-	connect(configDialog, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(refreshVocabularies()));
+	connect(configDialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(loadSettings()));
+	connect(configDialog, TQ_SIGNAL(applyClicked()), this, TQ_SLOT(refreshVocabularies()));
 	configDialog->exec();
 	delete configDialog;
 }
diff --git a/kanagram/src/keduvocdocument.cpp b/kanagram/src/keduvocdocument.cpp
index 046ad56e..47053372 100644
--- a/kanagram/src/keduvocdocument.cpp
+++ b/kanagram/src/keduvocdocument.cpp
@@ -99,7 +99,7 @@ bool KEduVocDocument::open(const KURL& url, bool /*append*/)
   if (!url.isEmpty())
     doc_url = url;
 
-  // TODO EPT  connect( this, TQT_SIGNAL(progressChanged(KEduVocDocument*,int)), parent, TQT_SLOT(slotProgress(KEduVocDocument*,int)) );
+  // TODO EPT  connect( this, TQ_SIGNAL(progressChanged(KEduVocDocument*,int)), parent, TQ_SLOT(slotProgress(KEduVocDocument*,int)) );
 
   TQString tmpfile;
   if (TDEIO::NetAccess::download( url, tmpfile, 0 ))
@@ -182,7 +182,7 @@ bool KEduVocDocument::open(const KURL& url, bool /*append*/)
 
 bool KEduVocDocument::saveAs(TQObject * /*parent*/, const KURL & url, FileType ft, const TQString & generator)
 {
-//  connect( this, TQT_SIGNAL(progressChanged(KEduVocDocument*,int)), parent, TQT_SLOT(slotProgress(KEduVocDocument*,int)) );
+//  connect( this, TQ_SIGNAL(progressChanged(KEduVocDocument*,int)), parent, TQ_SLOT(slotProgress(KEduVocDocument*,int)) );
 
   KURL tmp (url);
 
diff --git a/kanagram/src/main.cpp b/kanagram/src/main.cpp
index 75481435..34c5288d 100644
--- a/kanagram/src/main.cpp
+++ b/kanagram/src/main.cpp
@@ -35,7 +35,7 @@ int main(int argc, char *argv[])
 	about.addCredit("Artemiy Pavlov", I18N_NOOP("Sound effects"), 0, "http://artemiolabs.com");
 	TDECmdLineArgs::init(argc, argv, &about);
 	TDEApplication app;
-	app.connect(&app, TQT_SIGNAL(lastWindowClosed()), &app, TQT_SLOT(quit()));
+	app.connect(&app, TQ_SIGNAL(lastWindowClosed()), &app, TQ_SLOT(quit()));
 	
 	KanagramSettings::setJustGotFont(false);
 	TQFont f("squeaky chalk sound");
diff --git a/kanagram/src/mainsettings.cpp b/kanagram/src/mainsettings.cpp
index 8307bb1d..ff53034c 100644
--- a/kanagram/src/mainsettings.cpp
+++ b/kanagram/src/mainsettings.cpp
@@ -39,8 +39,8 @@ MainSettings::MainSettings(TQWidget *parent) : MainSettingsWidget(parent)
 {
 	m_parent = (TDEConfigDialog*)parent;
 
-	connect(parent, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(slotChangeTranslation()));
-	connect(cboxTranslation, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotUpdateParent()));
+	connect(parent, TQ_SIGNAL(applyClicked()), this, TQ_SLOT(slotChangeTranslation()));
+	connect(cboxTranslation, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotUpdateParent()));
 	
 	setupTranslations();
 
@@ -73,7 +73,7 @@ MainSettings::MainSettings(TQWidget *parent) : MainSettingsWidget(parent)
 		if (!TQFontInfo(f).exactMatch())
 		{
 			kcfg_useStandardFonts->setEnabled(false);
-			connect(getFontsButton, TQT_SIGNAL(pressed()), this, TQT_SLOT(getAndInstallFont()));
+			connect(getFontsButton, TQ_SIGNAL(pressed()), this, TQ_SLOT(getAndInstallFont()));
 		}
 		else
 		{
diff --git a/kanagram/src/newstuff.cpp b/kanagram/src/newstuff.cpp
index 7293775d..c17cbea2 100644
--- a/kanagram/src/newstuff.cpp
+++ b/kanagram/src/newstuff.cpp
@@ -13,7 +13,7 @@
 
 NewStuff::NewStuff(TQWidget *parent) : NewStuffWidget(parent)
 {
-	connect(btnGetNew, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotGetNewVocabs()));
+	connect(btnGetNew, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotGetNewVocabs()));
 }
 
 NewStuff::~NewStuff()
diff --git a/kanagram/src/vocabedit.cpp b/kanagram/src/vocabedit.cpp
index 77002048..8035bda2 100644
--- a/kanagram/src/vocabedit.cpp
+++ b/kanagram/src/vocabedit.cpp
@@ -58,20 +58,20 @@ VocabEdit::VocabEdit(TQWidget *parent, TQString fileName) : VocabEditWidget(pare
 		txtDescription->setText(doc->getDocRemark());
 	}
 
-	connect(btnSave, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSave()));
-	connect(btnNewWord, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewWord()));
-	connect(btnRemoveWord, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRemoveWord()));
-	connect(btnClose, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClose()));
+	connect(btnSave, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSave()));
+	connect(btnNewWord, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNewWord()));
+	connect(btnRemoveWord, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRemoveWord()));
+	connect(btnClose, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClose()));
 	
-	connect(txtWord, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotWordTextChanged(const TQString &)));
-	connect(txtHint, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotHintTextChanged(const TQString &)));
+	connect(txtWord, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotWordTextChanged(const TQString &)));
+	connect(txtHint, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotHintTextChanged(const TQString &)));
 
 	//Connect the name and description boxes to a general textChanged slot, so that we can keep track of
 	//whether they've been changed or not
-	connect(txtVocabName, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotTextChanged(const TQString &)));
-	connect(txtDescription, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotTextChanged(const TQString &)));
+	connect(txtVocabName, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotTextChanged(const TQString &)));
+	connect(txtDescription, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotTextChanged(const TQString &)));
 
-	connect(lboxWords, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()));
+	connect(lboxWords, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged()));
 
 	//Has anything in the dialog changed?
 	m_textChanged = false;
@@ -140,15 +140,15 @@ void VocabEdit::slotNewWord()
 void VocabEdit::slotSelectionChanged()
 {
 	//A little hack to make things work right
-	disconnect(txtWord, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotWordTextChanged(const TQString &)));
-	disconnect(txtHint, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotHintTextChanged(const TQString &)));
+	disconnect(txtWord, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotWordTextChanged(const TQString &)));
+	disconnect(txtHint, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotHintTextChanged(const TQString &)));
 	if(lboxWords->currentItem() >= 0)
 	{
 		txtWord->setText(m_vocabList[lboxWords->currentItem()].getOriginal());
 		txtHint->setText(m_vocabList[lboxWords->currentItem()].getRemark(0));
 	}
-	connect(txtWord, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotWordTextChanged(const TQString &)));
-	connect(txtHint, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotHintTextChanged(const TQString &)));
+	connect(txtWord, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotWordTextChanged(const TQString &)));
+	connect(txtHint, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotHintTextChanged(const TQString &)));
 }
 
 void VocabEdit::slotWordTextChanged(const TQString &changes)
diff --git a/kanagram/src/vocabsettings.cpp b/kanagram/src/vocabsettings.cpp
index d965abd5..e439b173 100644
--- a/kanagram/src/vocabsettings.cpp
+++ b/kanagram/src/vocabsettings.cpp
@@ -18,10 +18,10 @@
 
 VocabSettings::VocabSettings(TQWidget *parent) : VocabSettingsWidget(parent)
 {
-	connect(btnCreateNew, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCreateNew()));
-	connect(btnEdit, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEdit()));
-	connect(btnDelete, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDelete()));
-	connect(lviewVocab, TQT_SIGNAL(selectionChanged(TQListViewItem *)), this, TQT_SLOT(slotSelectionChanged(TQListViewItem *)));
+	connect(btnCreateNew, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCreateNew()));
+	connect(btnEdit, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEdit()));
+	connect(btnDelete, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDelete()));
+	connect(lviewVocab, TQ_SIGNAL(selectionChanged(TQListViewItem *)), this, TQ_SLOT(slotSelectionChanged(TQListViewItem *)));
 
 	refreshView();
 }