Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 332d9eadbd720cb99b62730d346994098cbde160)

22 files changed, 144 insertions, 144 deletions

diff --git a/ksystemlog/src/acpid/acpidOptions.cpp b/ksystemlog/src/acpid/acpidOptions.cpp
index 38e8ce8..53048b0 100644
--- a/ksystemlog/src/acpid/acpidOptions.cpp
+++ b/ksystemlog/src/acpid/acpidOptions.cpp
@@ -52,7 +52,7 @@ AcpidOptions::AcpidOptions(TQWidget *parent) :
 	TQString description=i18n("<qt><p>These files will be analyzed to display <b>ACPId log</b>. This list also determines the order in which the files are read.</p></qt>");
 	fileList=new FileList(this, description);
 	
-	connect(fileList, TQT_SIGNAL(fileListChanged(int)), this, TQT_SLOT(slotFileListChanged(int)));
+	connect(fileList, TQ_SIGNAL(fileListChanged(int)), this, TQ_SLOT(slotFileListChanged(int)));
 	
 	readConfig();
 	
diff --git a/ksystemlog/src/apache/apacheOptions.cpp b/ksystemlog/src/apache/apacheOptions.cpp
index b16b4ca..e3b8757 100644
--- a/ksystemlog/src/apache/apacheOptions.cpp
+++ b/ksystemlog/src/apache/apacheOptions.cpp
@@ -55,8 +55,8 @@ ApacheOptions::ApacheOptions(TQWidget *parent) :
 	tabs.addTab(&apacheFileList, Globals::apacheMode->pixmap, Globals::apacheMode->name);
 	tabs.addTab(&apacheAccessFileList, Globals::apacheAccessMode->pixmap, Globals::apacheAccessMode->name);
 	
-	connect(&apacheFileList, TQT_SIGNAL(fileListChanged(int)), this, TQT_SLOT(slotFileListChanged(int)));
-	connect(&apacheAccessFileList, TQT_SIGNAL(fileListChanged(int)), this, TQT_SLOT(slotFileListChanged(int)));
+	connect(&apacheFileList, TQ_SIGNAL(fileListChanged(int)), this, TQ_SLOT(slotFileListChanged(int)));
+	connect(&apacheAccessFileList, TQ_SIGNAL(fileListChanged(int)), this, TQ_SLOT(slotFileListChanged(int)));
 	
 	readConfig();
 	
diff --git a/ksystemlog/src/bootauth/bootAuthenticationOptions.cpp b/ksystemlog/src/bootauth/bootAuthenticationOptions.cpp
index 0f3f359..c4e32ab 100644
--- a/ksystemlog/src/bootauth/bootAuthenticationOptions.cpp
+++ b/ksystemlog/src/bootauth/bootAuthenticationOptions.cpp
@@ -58,7 +58,7 @@ BootAuthenticationOptions::BootAuthenticationOptions(TQWidget *parent) :
 	TQToolTip::add(bootURLRequester, i18n("<qt>Here, you can type or choose the boot log file (example: <i>/var/log/boot.log</i> or <i>/var/log/dmesg</i>).</qt>"));
 	TQWhatsThis::add(bootURLRequester, i18n("<qt>You can type or choose here the boot log file. This file will be analyzed by KSystemLog when you choose the <b>Boot log</b> menu item. Generally, the name is <i>/var/log/boot.log</i> or <i>/var/log/dmesg</i></qt>"));
 
-	connect(bootURLRequester, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(onOptionsChanged(const TQString&)));
+	connect(bootURLRequester, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(onOptionsChanged(const TQString&)));
 	
 	//Authentication log file
 	TQVGroupBox* authenticationBox=new TQVGroupBox(i18n("Authentication Log File"), this);
@@ -69,7 +69,7 @@ BootAuthenticationOptions::BootAuthenticationOptions(TQWidget *parent) :
 	TQToolTip::add(authenticationURLRequester, i18n("<qt>Here, you can type or choose the authentication log file (example: <i>/var/log/auth.log</i>).</qt>"));
 	TQWhatsThis::add(authenticationURLRequester, i18n("<qt>You can type or choose here the authentication log file. This file will be analyzed by KSystemLog when you will choose the <b>Authentication log</b> menu item. Generally, its name is <i>/var/log/auth.log</i></qt>"));
 	
-	connect(authenticationURLRequester, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(onOptionsChanged(const TQString&)));
+	connect(authenticationURLRequester, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(onOptionsChanged(const TQString&)));
 	
 	TQSpacerItem* spacer=new TQSpacerItem(0, 0, TQSizePolicy::Preferred, TQSizePolicy::Expanding);
 
diff --git a/ksystemlog/src/cron/cronOptions.cpp b/ksystemlog/src/cron/cronOptions.cpp
index 510a8d3..96b7a2c 100644
--- a/ksystemlog/src/cron/cronOptions.cpp
+++ b/ksystemlog/src/cron/cronOptions.cpp
@@ -52,7 +52,7 @@ CronOptions::CronOptions(TQWidget *parent) :
 	TQString description= i18n("<qt><p>These files will be analyzed to display <b>Cron Logs</b> (planned tasks logs). This list also determines the order in which the files are read.</p></qt>");
 	fileList=new SpecificFileList(this, description);
 	
-	connect(fileList, TQT_SIGNAL(fileListChanged(int)), this, TQT_SLOT(slotFileListChanged(int)));
+	connect(fileList, TQ_SIGNAL(fileListChanged(int)), this, TQ_SLOT(slotFileListChanged(int)));
 
 	readConfig();
 	
diff --git a/ksystemlog/src/cups/cupsOptions.cpp b/ksystemlog/src/cups/cupsOptions.cpp
index 08dad76..ccd13d5 100644
--- a/ksystemlog/src/cups/cupsOptions.cpp
+++ b/ksystemlog/src/cups/cupsOptions.cpp
@@ -55,8 +55,8 @@ CupsOptions::CupsOptions(TQWidget *parent) :
 	tabs.addTab(&cupsFileList, Globals::cupsMode->pixmap, Globals::cupsMode->name);
 	tabs.addTab(&cupsAccessFileList, Globals::cupsAccessMode->pixmap, Globals::cupsAccessMode->name);
 	
-	connect(&cupsFileList, TQT_SIGNAL(fileListChanged(int)), this, TQT_SLOT(slotFileListChanged(int)));
-	connect(&cupsAccessFileList, TQT_SIGNAL(fileListChanged(int)), this, TQT_SLOT(slotFileListChanged(int)));
+	connect(&cupsFileList, TQ_SIGNAL(fileListChanged(int)), this, TQ_SLOT(slotFileListChanged(int)));
+	connect(&cupsAccessFileList, TQ_SIGNAL(fileListChanged(int)), this, TQ_SLOT(slotFileListChanged(int)));
 	
 	readConfig();
 	
diff --git a/ksystemlog/src/daemon/daemonOptions.cpp b/ksystemlog/src/daemon/daemonOptions.cpp
index c459916..c805483 100644
--- a/ksystemlog/src/daemon/daemonOptions.cpp
+++ b/ksystemlog/src/daemon/daemonOptions.cpp
@@ -52,7 +52,7 @@ DaemonOptions::DaemonOptions(TQWidget *parent) :
 	TQString description= i18n("<qt><p>These files will be analyzed to display <b>daemons Logs</b>. This list also determine the order in which the files are read.</p></qt>");
 	fileList=new SpecificFileList(this, description);
 	
-	connect(fileList, TQT_SIGNAL(fileListChanged(int)), this, TQT_SLOT(slotFileListChanged(int)));
+	connect(fileList, TQ_SIGNAL(fileListChanged(int)), this, TQ_SLOT(slotFileListChanged(int)));
 
 	readConfig();
 	
diff --git a/ksystemlog/src/detailDialog.cpp b/ksystemlog/src/detailDialog.cpp
index fbf90ca..5640a5b 100644
--- a/ksystemlog/src/detailDialog.cpp
+++ b/ksystemlog/src/detailDialog.cpp
@@ -44,14 +44,14 @@ DetailDialog::DetailDialog(View* v, TQWidget *parent, const char *name) :
 	
 	
 	previous->setText(i18n("&Previous"));
-	connect(previous, TQT_SIGNAL(clicked()), this, TQT_SLOT(previousItem()));
+	connect(previous, TQ_SIGNAL(clicked()), this, TQ_SLOT(previousItem()));
 	
 	next->setText(i18n("&Next"));
-	connect(next, TQT_SIGNAL(clicked()), this, TQT_SLOT(nextItem()));
+	connect(next, TQ_SIGNAL(clicked()), this, TQ_SLOT(nextItem()));
 	
 	//close->setText(KStdGuiItem::close().text());
 	//close->setIcon(KStdGuiItem::close().iconSet());
-	connect(closeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(closeDetails()));
+	connect(closeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(closeDetails()));
 	
 	updateDetails();
 	
@@ -94,7 +94,7 @@ DetailDialog::DetailDialog(View* v, TQWidget *parent, const char *name) :
 	
 	
 	previous=new TQPushButton(KStdGuiItem::back().iconSet(), i18n("&Previous"), widget);
-	connect(previous, TQT_SIGNAL(clicked()), this, TQT_SLOT(previousItem()));
+	connect(previous, TQ_SIGNAL(clicked()), this, TQ_SLOT(previousItem()));
 	//1=Stretch factor (ratio between object in the TQHBoxLayout)
 	buttons->addWidget(previous, 1, TQt::AlignRight);
 	
@@ -103,7 +103,7 @@ DetailDialog::DetailDialog(View* v, TQWidget *parent, const char *name) :
 
 	buttons->setStretchFactor(previous, 1);
 	next=new TQPushButton(KStdGuiItem::forward().iconSet(), i18n("&Next"), widget);
-	connect(next, TQT_SIGNAL(clicked()), this, TQT_SLOT(nextItem()));
+	connect(next, TQ_SIGNAL(clicked()), this, TQ_SLOT(nextItem()));
 	//1=Stretch factor (ratio between object in the TQHBoxLayout)
 	buttons->addWidget(next, 1, TQt::AlignLeft);
 	
@@ -113,7 +113,7 @@ DetailDialog::DetailDialog(View* v, TQWidget *parent, const char *name) :
 	
 	
 	TQPushButton* close=new TQPushButton(KStdGuiItem::close().iconSet(), KStdGuiItem::close().text(), widget);
-	connect(close, TQT_SIGNAL(clicked()), this, TQT_SLOT(closeDetails()));
+	connect(close, TQ_SIGNAL(clicked()), this, TQ_SLOT(closeDetails()));
 	buttons->addWidget(close, 0, TQt::AlignRight);
 
 	TQToolTip::add(next, i18n("Close the Detail dialog."));
diff --git a/ksystemlog/src/fileList.cpp b/ksystemlog/src/fileList.cpp
index 9b5a90e..1c5b9b4 100644
--- a/ksystemlog/src/fileList.cpp
+++ b/ksystemlog/src/fileList.cpp
@@ -66,46 +66,46 @@ FileList::FileList(TQWidget *parent, TQString description) :
 	
 
 	add=new TQPushButton(SmallIcon("document-open"), i18n("&Add File..."), buttons);
-	connect(add, TQT_SIGNAL(clicked()), this, TQT_SLOT(addItem()));
+	connect(add, TQ_SIGNAL(clicked()), this, TQ_SLOT(addItem()));
 	TQToolTip::add(add, i18n("Choose a new file"));
 	TQWhatsThis::add(add, i18n("Opens a dialog box to choose a new file to be added to the list."));
 
 	
 	remove=new TQPushButton(SmallIconSet("edit_remove"), i18n("&Remove"), buttons);
-	connect(remove, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeSelectedItem()));
+	connect(remove, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeSelectedItem()));
 	TQToolTip::add(remove, i18n("Delete the current file(s)"));
 	TQWhatsThis::add(remove, i18n("Deletes the selected files of the list."));
 	
 	up=new TQPushButton(SmallIconSet("go-up"), i18n("Move &Up"), buttons);
-	connect(up, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveUpItem()));
+	connect(up, TQ_SIGNAL(clicked()), this, TQ_SLOT(moveUpItem()));
 	TQToolTip::add(up, i18n("Move up the current file(s)"));
 	TQWhatsThis::add(up, i18n("<qt>Moves up the selected files in the list. This option allows the files to be read <b>in first</b> by KSystemLog.</qt>"));
 	
 	down=new TQPushButton(SmallIconSet("go-down"), i18n("Move &Down"), buttons);
-	connect(down, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveDownItem()));
+	connect(down, TQ_SIGNAL(clicked()), this, TQ_SLOT(moveDownItem()));
 	TQToolTip::add(down, i18n("Move down the current file(s)"));
 	TQWhatsThis::add(down, i18n("<qt>Moves down the selected files in the list. This option allows the files to be read <b>at last</b> by KSystemLog.</qt>"));
 
 	removeAll=new TQPushButton(SmallIconSet("cancel"), i18n("Re&move All"), buttons);
-	connect(removeAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeAllItem()));
+	connect(removeAll, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeAllItem()));
 	TQToolTip::add(removeAll, i18n("Remove all files"));
 	TQWhatsThis::add(removeAll, i18n("<qt>Remove all files of the list, even if they are not selected.</qt>"));
 
 	fileListMenu=new TDEPopupMenu(this);
 	fileListMenu->insertTitle(i18n("File List"));
-	fileListMenu->insertItem(SmallIcon("document-open"), i18n("&Add File..."), this, TQT_SLOT(addItem()), 0, ADD_FILE_MENU_ID);
-	fileListMenu->insertItem(SmallIcon("edit_remove"), i18n("&Remove"), this, TQT_SLOT(removeSelectedItem()), 0, REMOVE_MENU_ID);
+	fileListMenu->insertItem(SmallIcon("document-open"), i18n("&Add File..."), this, TQ_SLOT(addItem()), 0, ADD_FILE_MENU_ID);
+	fileListMenu->insertItem(SmallIcon("edit_remove"), i18n("&Remove"), this, TQ_SLOT(removeSelectedItem()), 0, REMOVE_MENU_ID);
 	fileListMenu->insertSeparator();
-	fileListMenu->insertItem(SmallIcon("go-up"), i18n("Move &Up"), this, TQT_SLOT(moveUpItem()), 0, MOVE_UP_MENU_ID);
-	fileListMenu->insertItem(SmallIcon("go-down"), i18n("Move &Down"), this, TQT_SLOT(moveDownItem()), 0, MOVE_DOWN_MENU_ID);
+	fileListMenu->insertItem(SmallIcon("go-up"), i18n("Move &Up"), this, TQ_SLOT(moveUpItem()), 0, MOVE_UP_MENU_ID);
+	fileListMenu->insertItem(SmallIcon("go-down"), i18n("Move &Down"), this, TQ_SLOT(moveDownItem()), 0, MOVE_DOWN_MENU_ID);
 	fileListMenu->insertSeparator();
-	fileListMenu->insertItem(SmallIcon("cancel"), i18n("Re&move All"), this, TQT_SLOT(removeAllItem()), 0, REMOVE_ALL_MENU_ID);
+	fileListMenu->insertItem(SmallIcon("cancel"), i18n("Re&move All"), this, TQ_SLOT(removeAllItem()), 0, REMOVE_ALL_MENU_ID);
 	
-	connect(fileList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(updateButtons()));
+	connect(fileList, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(updateButtons()));
 	
-	connect(this, TQT_SIGNAL(fileListChanged(int)), this, TQT_SLOT(updateButtons()));
+	connect(this, TQ_SIGNAL(fileListChanged(int)), this, TQ_SLOT(updateButtons()));
 	
-	connect(fileList, TQT_SIGNAL(rightButtonClicked(TQListBoxItem*, const TQPoint &)), this, TQT_SLOT(displayPopupMenu(TQListBoxItem*, const TQPoint&)));
+	connect(fileList, TQ_SIGNAL(rightButtonClicked(TQListBoxItem*, const TQPoint &)), this, TQ_SLOT(displayPopupMenu(TQListBoxItem*, const TQPoint&)));
 	
 	updateButtons();
 
diff --git a/ksystemlog/src/findManager.cpp b/ksystemlog/src/findManager.cpp
index 7b1d7f3..63b4cb2 100644
--- a/ksystemlog/src/findManager.cpp
+++ b/ksystemlog/src/findManager.cpp
@@ -46,7 +46,7 @@ void FindManager::slotFind() {
 		kdDebug() << "KFindDialog creation" << endl;
 		//TODO Save the Find options to Config file
 		findDialog=new KFindDialog(false, main, "find_dialog");
-		connect(findDialog, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotFindNext()));
+		connect(findDialog, TQ_SIGNAL(okClicked()), this, TQ_SLOT(slotFindNext()));
 	
 		findDialog->show();
 	}
@@ -79,8 +79,8 @@ void FindManager::slotFirstFind() {
 	
 	//This creates a find-next-prompt dialog if needed.
 	findManager=new KFind(findDialog->pattern(), findDialog->options(), main, findDialog);
-	connect(findManager, TQT_SIGNAL(highlight(const TQString&, int, int)), this, TQT_SLOT(highlightSearch(const TQString&, int, int)));
-	connect(findManager, TQT_SIGNAL(findNext()), this, TQT_SLOT(slotFindNext()));
+	connect(findManager, TQ_SIGNAL(highlight(const TQString&, int, int)), this, TQ_SLOT(highlightSearch(const TQString&, int, int)));
+	connect(findManager, TQ_SIGNAL(findNext()), this, TQ_SLOT(slotFindNext()));
 	
 	//Do not keep the KFindDialog open
 	findDialog->hide();
diff --git a/ksystemlog/src/generalOptions.cpp b/ksystemlog/src/generalOptions.cpp
index 674f70e..9f6f642 100644
--- a/ksystemlog/src/generalOptions.cpp
+++ b/ksystemlog/src/generalOptions.cpp
@@ -49,13 +49,13 @@ GeneralOptions::GeneralOptions(TQWidget *parent) :
 	TQVGroupBox* logLinesBox=new TQVGroupBox(i18n("Log Lines List"), this);
 	new TQLabel(i18n("Maximum lines displayed:"), logLinesBox);
 	maxLines=new TQSpinBox(10, 30000, 10, logLinesBox);
-	connect(maxLines, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(onOptionsChanged()));
+	connect(maxLines, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(onOptionsChanged()));
 	
 	TQToolTip::add(maxLines, i18n("<qt>Choose here the maximum number of log lines displayed in the main view.</qt>"));
 	TQWhatsThis::add(maxLines, i18n("<qt>You can choose here the maximum number of log lines displayed in the main view.</qt>"));
 
 	deleteDuplicatedLines=new TQCheckBox(i18n("Delete duplicated log lines (may be slow)"), logLinesBox);
-	connect(deleteDuplicatedLines, TQT_SIGNAL(clicked()), this, TQT_SLOT(onOptionsChanged()));
+	connect(deleteDuplicatedLines, TQ_SIGNAL(clicked()), this, TQ_SLOT(onOptionsChanged()));
 	
 	TQToolTip::add(deleteDuplicatedLines, i18n("<qt>Select this option if you want to delete duplicated log lines <b>(may be slow)</b>.</qt>"));
 	TQWhatsThis::add(deleteDuplicatedLines, i18n("<qt>You can select this option if you want to delete duplicated log lines. <b>This option can slow the reading</b>.</qt>"));
@@ -66,7 +66,7 @@ GeneralOptions::GeneralOptions(TQWidget *parent) :
 	TQVGroupBox* maxCharBox=new TQVGroupBox(i18n("Maximum Characters to Read per Line"), this);
 	new TQLabel(i18n("Number of characters:"), maxCharBox);
 	maxCharacters=new TQSpinBox(10, 30000, 10, maxCharBox);
-	connect(maxCharacters, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(onOptionsChanged()));
+	connect(maxCharacters, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(onOptionsChanged()));
 
 	TQToolTip::add(maxCharacters, i18n("<qt>Choose here the maximum number of characters to read from each log line.</qt>"));
 	TQWhatsThis::add(maxCharacters, i18n("<qt>You can choose here the maximum number of characters to read from each log line.</qt>")); 
@@ -75,13 +75,13 @@ GeneralOptions::GeneralOptions(TQWidget *parent) :
 	TQVGroupBox* options= new TQVGroupBox( i18n( "Options" ), this );
 	
 	deleteProcessId=new TQCheckBox(i18n("Delete process identifier from process name"), options);
-	connect(deleteProcessId, TQT_SIGNAL(clicked()), this, TQT_SLOT(onOptionsChanged()));
+	connect(deleteProcessId, TQ_SIGNAL(clicked()), this, TQ_SLOT(onOptionsChanged()));
 	
 	TQToolTip::add(deleteProcessId, i18n("<qt>Delete process identifier from process name.</qt>"));
 	TQWhatsThis::add(deleteProcessId, i18n("<qt>You can select this option if you want to delete the process identifier from process name. For example, you will sometimes see in the <b>Process</b> column something like <i>cron<b>[3433]</b></i>. If this option is activated, the annoying bold part will be erased.</qt>"));
 
 	colorizeLogLines=new TQCheckBox(i18n("Colorize log lines"), options);
-	connect(colorizeLogLines, TQT_SIGNAL(clicked()), this, TQT_SLOT(onOptionsChanged()));
+	connect(colorizeLogLines, TQ_SIGNAL(clicked()), this, TQ_SLOT(onOptionsChanged()));
 	
 	TQToolTip::add(colorizeLogLines, i18n("<qt>This option allows the colorization of log lines, depending on their log level.</qt>"));
 	TQWhatsThis::add(colorizeLogLines, i18n("<qt>This option allows the colorization of log lines, depending on their log level. For example, an error will be in red, a warning in orange... This will help you to better see problems.</qt>"));
diff --git a/ksystemlog/src/kernel/kernelOptions.cpp b/ksystemlog/src/kernel/kernelOptions.cpp
index 15be385..e693aee 100644
--- a/ksystemlog/src/kernel/kernelOptions.cpp
+++ b/ksystemlog/src/kernel/kernelOptions.cpp
@@ -52,7 +52,7 @@ KernelOptions::KernelOptions(TQWidget *parent) :
 	TQString description= i18n("<qt><p>These files will be analyzed to display <b>Kernel logs</b>. This list also determines the order in which the files are read.</p></qt>");
 	fileList=new SpecificFileList(this, description);
 	
-	connect(fileList, TQT_SIGNAL(fileListChanged(int)), this, TQT_SLOT(slotFileListChanged(int)));
+	connect(fileList, TQ_SIGNAL(fileListChanged(int)), this, TQ_SLOT(slotFileListChanged(int)));
 
 	readConfig();
 	
diff --git a/ksystemlog/src/ksystemlog.cpp b/ksystemlog/src/ksystemlog.cpp
index cc1c8eb..76fd0a1 100644
--- a/ksystemlog/src/ksystemlog.cpp
+++ b/ksystemlog/src/ksystemlog.cpp
@@ -151,16 +151,16 @@ KSystemLog::KSystemLog() :
 void KSystemLog::setupTabBar() {
 	tabs=new KTabWidget(this, "tabs");
 	
-	connect(tabs, TQT_SIGNAL(currentChanged(TQWidget*)), this, TQT_SLOT(currentTabChanged(TQWidget*)));
+	connect(tabs, TQ_SIGNAL(currentChanged(TQWidget*)), this, TQ_SLOT(currentTabChanged(TQWidget*)));
 	
 	TQPushButton* tabNewTabButton=new TQPushButton(SmallIcon("tab_new"), "", tabs);	
-	connect(tabNewTabButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(newTab()));
+	connect(tabNewTabButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(newTab()));
 	
 	TQToolTip::add(tabNewTabButton, i18n("Create a new tab"));
 	TQWhatsThis::add(tabNewTabButton, i18n("Creates a new tab which can display another log."));
 	
 	TQPushButton* tabCloseTabButton=new TQPushButton(SmallIcon("tab_remove"), "", tabs);
-	connect(tabCloseTabButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(closeTab()));
+	connect(tabCloseTabButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(closeTab()));
 	
 	TQToolTip::add(tabCloseTabButton, i18n("Close the current tab"));
 	TQWhatsThis::add(tabCloseTabButton, i18n("Closes the current tab."));
@@ -272,12 +272,12 @@ void KSystemLog::setupStatusBar() {
 
 void KSystemLog::setupActions() {
 
-	KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection(), "file_open");
+	KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection(), "file_open");
 	actionCollection()->action("file_open")->setToolTip(i18n("Open a file in KSystemLog"));
 	actionCollection()->action("file_open")->setWhatsThis(i18n("Opens a file in KSystemLog and displays its content in the current tab."));	
 	
 	//TODO Not used for the moment
-	//KStdAction::print(this, TQT_SLOT(filePrint()), actionCollection());
+	//KStdAction::print(this, TQ_SLOT(filePrint()), actionCollection());
 	
 	saveAction=KStdAction::saveAs(this, NULL, actionCollection(), "file_save");
 	//TODO Retrieve the system's shortcut of the save action (and not Save as...)
@@ -286,7 +286,7 @@ void KSystemLog::setupActions() {
 	saveAction->setWhatsThis(i18n("Saves the selection to a file. This action is useful if you want to create an attachment or a backup of a particular log."));	
 	saveAction->setEnabled(false);
 	
-	KStdAction::quit(this, TQT_SLOT(quit()), actionCollection(), "file_quit");
+	KStdAction::quit(this, TQ_SLOT(quit()), actionCollection(), "file_quit");
 	actionCollection()->action("file_quit")->setToolTip(i18n("Quit KSystemLog"));
 	actionCollection()->action("file_quit")->setWhatsThis(i18n("Quits KSystemLog."));	
 	
@@ -310,62 +310,62 @@ void KSystemLog::setupActions() {
 	sendMailAction->setWhatsThis(i18n("Sends the selection by mail. Simply select the important lines and click on this menu entry to send the selection to a friend or a mailing list."));	
 	sendMailAction->setEnabled(false);
 	
-	logMessageAction=new TDEAction(i18n("&Send Message..."), "document-new", CTRL+Key_L, this, TQT_SLOT(slotLogMessage()), actionCollection(), "log_message" );
+	logMessageAction=new TDEAction(i18n("&Send Message..."), "document-new", CTRL+Key_L, this, TQ_SLOT(slotLogMessage()), actionCollection(), "log_message" );
 	logMessageAction->setToolTip(i18n("Send a message to the log system"));
 	logMessageAction->setWhatsThis(i18n("This action will open a dialog which lets you send a message to the log system."));
 	
-	KStdAction::selectAll(this, TQT_SLOT(slotSelectAll()), actionCollection(), "select_all");
+	KStdAction::selectAll(this, TQ_SLOT(slotSelectAll()), actionCollection(), "select_all");
 	actionCollection()->action("select_all")->setToolTip(i18n("Select all lines of the current log"));
 	actionCollection()->action("select_all")->setWhatsThis(i18n("Selects all lines of the current log. This action is useful if you want, for example, to save all the content of the current log in a file."));
 	
-	KStdAction::find(findManager, TQT_SLOT(slotFind()), actionCollection(), "find");
-	KStdAction::findNext(findManager, TQT_SLOT(slotFindNext()), actionCollection(), "find_next");
+	KStdAction::find(findManager, TQ_SLOT(slotFind()), actionCollection(), "find");
+	KStdAction::findNext(findManager, TQ_SLOT(slotFindNext()), actionCollection(), "find_next");
 
 	//TODO Find a solution to display at the right place this action (see Akregator interface)
-	filterBarAction=new TDEToggleAction(i18n("Show &Filter Bar"), TQString(), 0, this, TQT_SLOT(slotToggleFilterBar()), actionCollection(), "toggle_filter_bar");
+	filterBarAction=new TDEToggleAction(i18n("Show &Filter Bar"), TQString(), 0, this, TQ_SLOT(slotToggleFilterBar()), actionCollection(), "toggle_filter_bar");
 #if defined(TDE_MAKE_VERSION) && TDE_VERSION >= TDE_MAKE_VERSION(3,3,0)
 	filterBarAction->setEnabled(true);
 #else
 	filterBarAction->setEnabled(false);
 #endif
 
-	KStdAction::preferences(this, TQT_SLOT(slotOptions()), actionCollection());
+	KStdAction::preferences(this, TQ_SLOT(slotOptions()), actionCollection());
 	
-	newTabAction=new TDEAction(i18n("&New Tab"), "tab_new", CTRL+Key_T, this, TQT_SLOT(newTab()), actionCollection(), "new_tab" );
+	newTabAction=new TDEAction(i18n("&New Tab"), "tab_new", CTRL+Key_T, this, TQ_SLOT(newTab()), actionCollection(), "new_tab" );
 	newTabAction->setToolTip(i18n("Create a new tab"));
 	newTabAction->setWhatsThis(i18n("Creates a new tab which can display another log."));
 	
-	closeTabAction=new TDEAction(i18n("&Close Tab"), "tab_remove", CTRL+Key_W, this, TQT_SLOT(closeTab()), actionCollection(), "close_tab" );
+	closeTabAction=new TDEAction(i18n("&Close Tab"), "tab_remove", CTRL+Key_W, this, TQ_SLOT(closeTab()), actionCollection(), "close_tab" );
 	closeTabAction->setToolTip(i18n("Close the current tab"));
 	closeTabAction->setWhatsThis(i18n("Closes the current tab."));
 	
-	duplicateTabAction=new TDEAction(i18n("&Duplicate Tab"), "tab_duplicate", SHIFT+CTRL+Key_N, this, TQT_SLOT(duplicateTab()), actionCollection(), "duplicate_tab" );
+	duplicateTabAction=new TDEAction(i18n("&Duplicate Tab"), "tab_duplicate", SHIFT+CTRL+Key_N, this, TQ_SLOT(duplicateTab()), actionCollection(), "duplicate_tab" );
 	duplicateTabAction->setToolTip(i18n("Duplicate the current tab"));
 	duplicateTabAction->setWhatsThis(i18n("Duplicates the current tab."));
 	
-	moveTabLeftAction=new TDEAction(i18n("Move Tab &Left"), "1leftarrow", SHIFT+CTRL+Key_Left, this, TQT_SLOT(moveTabLeft()), actionCollection(), "move_tab_left" );
+	moveTabLeftAction=new TDEAction(i18n("Move Tab &Left"), "1leftarrow", SHIFT+CTRL+Key_Left, this, TQ_SLOT(moveTabLeft()), actionCollection(), "move_tab_left" );
 	moveTabLeftAction->setToolTip(i18n("Move the current tab to the left"));
 	moveTabLeftAction->setWhatsThis(i18n("Moves the current tab to the left."));
 	
-	moveTabRightAction=new TDEAction(i18n("Move Tab &Right"), "1rightarrow", SHIFT+CTRL+Key_Right, this, TQT_SLOT(moveTabRight()), actionCollection(), "move_tab_right" );
+	moveTabRightAction=new TDEAction(i18n("Move Tab &Right"), "1rightarrow", SHIFT+CTRL+Key_Right, this, TQ_SLOT(moveTabRight()), actionCollection(), "move_tab_right" );
 	moveTabRightAction->setToolTip(i18n("Move the current tab to the right"));
 	moveTabRightAction->setWhatsThis(i18n("Moves the current tab to the right."));
 	
 	
-	reloadAction=new TDEAction(i18n("&Reload"), "reload", Key_F5, this, TQT_SLOT(reloadCurrent()), actionCollection(), "reload" );
+	reloadAction=new TDEAction(i18n("&Reload"), "reload", Key_F5, this, TQ_SLOT(reloadCurrent()), actionCollection(), "reload" );
 	reloadAction->setToolTip(i18n("Reload the current log"));
 	reloadAction->setWhatsThis(i18n("Reloads the current log, if you want to be sure that the view is correctly updated."));
 	
-	resumeParsingAction=new TDEAction(i18n("Resu&me Parsing"), "media-playback-start", CTRL+Key_M, this, TQT_SLOT(resumeParsing()), actionCollection(), "resume_parsing");
+	resumeParsingAction=new TDEAction(i18n("Resu&me Parsing"), "media-playback-start", CTRL+Key_M, this, TQ_SLOT(resumeParsing()), actionCollection(), "resume_parsing");
 	resumeParsingAction->setToolTip(i18n("Resume the watching of the current log"));
 	resumeParsingAction->setWhatsThis(i18n("Resumes the watching of the current log. This action is only available when the user has already paused the reading."));
 	resumeParsingAction->setEnabled(true);
 	
-	pauseParsingAction=new TDEAction(i18n("S&top Parsing"), "media-playback-stop", CTRL+Key_P, this, TQT_SLOT(pauseParsing()), actionCollection(), "pause_parsing");
+	pauseParsingAction=new TDEAction(i18n("S&top Parsing"), "media-playback-stop", CTRL+Key_P, this, TQ_SLOT(pauseParsing()), actionCollection(), "pause_parsing");
 	pauseParsingAction->setToolTip(i18n("Pause the watching of the current log"));
 	pauseParsingAction->setWhatsThis(i18n("Pauses the watching of the current log. This action is particularly useful when the system is writing too many lines to log files, causing KSystemLog to reload too frequently."));
 
-	detailAction=new TDEAction(i18n("&Details"), "viewmag", ALT+Key_Return, this, TQT_SLOT(slotDetails()), actionCollection(), "details");
+	detailAction=new TDEAction(i18n("&Details"), "viewmag", ALT+Key_Return, this, TQ_SLOT(slotDetails()), actionCollection(), "details");
 	detailAction->setToolTip(i18n("Display details on the currently selected line"));
 	detailAction->setWhatsThis(i18n("Displays a dialog box which contains details on the currently selected line. You are able to navigate through the logs from this dialog box with the <b>Previous</b> / <b>Next</b> buttons."));
 	detailAction->setEnabled(false);
@@ -375,13 +375,13 @@ void KSystemLog::setupActions() {
 	tooltipEnabledAction->setWhatsThis(i18n("Disables/Enables the tooltips displayed when the cursor hovers a log line."));
 	
 	
-	connect(tooltipEnabledAction, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotTooltipEnabled(bool)));
+	connect(tooltipEnabledAction, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotTooltipEnabled(bool)));
 	
 	newLinesDisplayedAction=new TDEToggleAction(i18n("&Display New Lines"), 0, actionCollection(), "display_new_line");
 	newLinesDisplayedAction->setToolTip(i18n("Display or not new lines if the log changes"));
 	newLinesDisplayedAction->setWhatsThis(i18n("Displays or not the new lines if the log changes. This option is useful when you want to see an old log lines and that KSystemLog often refreshes the current view."));
 	
-	connect(newLinesDisplayedAction, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotNewLinesDisplayed(bool)));
+	connect(newLinesDisplayedAction, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotNewLinesDisplayed(bool)));
 
 	setupGroupBy();
 
@@ -394,9 +394,9 @@ void KSystemLog::setupLogActions() {
 	
 	//Define a macro allowing the connection of the signal from log action to the slotLogAction object
 	#if defined(TDE_MAKE_VERSION) && TDE_VERSION >= TDE_MAKE_VERSION(3,4,0)
-		#define CONNECTED_SLOT(action) connect(action, TQT_SIGNAL(activated(TDEAction::ActivationReason, TQt::ButtonState)), slotLogAction, TQT_SLOT(slotLogAction(TDEAction::ActivationReason, TQt::ButtonState)));
+		#define CONNECTED_SLOT(action) connect(action, TQ_SIGNAL(activated(TDEAction::ActivationReason, TQt::ButtonState)), slotLogAction, TQ_SLOT(slotLogAction(TDEAction::ActivationReason, TQt::ButtonState)));
 	#else
-		#define CONNECTED_SLOT(action) connect(action, TQT_SIGNAL(activated()), slotLogAction, TQT_SLOT(slotLogAction()));
+		#define CONNECTED_SLOT(action) connect(action, TQ_SIGNAL(activated()), slotLogAction, TQ_SLOT(slotLogAction()));
 	#endif
 	
 	
@@ -657,22 +657,22 @@ LogManager* KSystemLog::newTab() {
 	LogManager* manager=new LogManager(this, loadingDialog);
 	
 	//Signals from LogManager to Main Class
-	connect(manager, TQT_SIGNAL(changeTitle(View*, const TQString&)), this, TQT_SLOT(changeTab(View*, const TQString& )));
-	connect(manager, TQT_SIGNAL(changeTitle(View*, const TQIconSet&, const TQString&)), this, TQT_SLOT(changeTab(View*, const TQIconSet&, const TQString&)));
-	connect(manager, TQT_SIGNAL(changeCaption(const TQString&)), this, TQT_SLOT(setCaption(const TQString&)));
-	connect(manager, TQT_SIGNAL(changeStatusbar(const TQString&)), this, TQT_SLOT(changeStatusbar(const TQString&)));
-	connect(manager, TQT_SIGNAL(logUpdated(int)), this, TQT_SLOT(logUpdated(int)));
-	connect(manager, TQT_SIGNAL(reloaded()), this, TQT_SLOT(logManagerReloaded()));
-	connect(manager, TQT_SIGNAL(GUIUpdated()), this, TQT_SLOT(updateGUI()));
-	connect(manager, TQT_SIGNAL(detailsCalled()), this, TQT_SLOT(slotDetails()));
-	connect(manager, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()));
+	connect(manager, TQ_SIGNAL(changeTitle(View*, const TQString&)), this, TQ_SLOT(changeTab(View*, const TQString& )));
+	connect(manager, TQ_SIGNAL(changeTitle(View*, const TQIconSet&, const TQString&)), this, TQ_SLOT(changeTab(View*, const TQIconSet&, const TQString&)));
+	connect(manager, TQ_SIGNAL(changeCaption(const TQString&)), this, TQ_SLOT(setCaption(const TQString&)));
+	connect(manager, TQ_SIGNAL(changeStatusbar(const TQString&)), this, TQ_SLOT(changeStatusbar(const TQString&)));
+	connect(manager, TQ_SIGNAL(logUpdated(int)), this, TQ_SLOT(logUpdated(int)));
+	connect(manager, TQ_SIGNAL(reloaded()), this, TQ_SLOT(logManagerReloaded()));
+	connect(manager, TQ_SIGNAL(GUIUpdated()), this, TQ_SLOT(updateGUI()));
+	connect(manager, TQ_SIGNAL(detailsCalled()), this, TQ_SLOT(slotDetails()));
+	connect(manager, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged()));
 	
 	//Signals from Main Actions to LogManager
-	connect(expandAllAction, TQT_SIGNAL(activated()), manager, TQT_SLOT(slotExpandAll()));
-	connect(collapseAllAction, TQT_SIGNAL(activated()), manager, TQT_SLOT(slotCollapseAll()));
-	connect(saveAction, TQT_SIGNAL(activated()), manager, TQT_SLOT(slotFileSave()));
-	connect(copyAction, TQT_SIGNAL(activated()), manager, TQT_SLOT(slotCopyToClipboard()));
-	connect(sendMailAction, TQT_SIGNAL(activated()), manager, TQT_SLOT(slotSendMail()));
+	connect(expandAllAction, TQ_SIGNAL(activated()), manager, TQ_SLOT(slotExpandAll()));
+	connect(collapseAllAction, TQ_SIGNAL(activated()), manager, TQ_SLOT(slotCollapseAll()));
+	connect(saveAction, TQ_SIGNAL(activated()), manager, TQ_SLOT(slotFileSave()));
+	connect(copyAction, TQ_SIGNAL(activated()), manager, TQ_SLOT(slotCopyToClipboard()));
+	connect(sendMailAction, TQ_SIGNAL(activated()), manager, TQ_SLOT(slotSendMail()));
 	
 	logManagers.append(manager);
 	
@@ -821,8 +821,8 @@ void KSystemLog::slotDetails() {
 	//If the dialog has not been created, we create it
 	if (detailDialog==NULL) {
 		detailDialog=new DetailDialog(activeLogManager()->getView(), this, "detail_dialog");
-		connect(activeLogManager()->getView()->getLogList(), TQT_SIGNAL(selectionChanged()), detailDialog, TQT_SLOT(selectionChanged()));
-		//connect(activeLogManager()->getView()->getLogList(), TQT_SIGNAL(triggerUpdate()), detailDialog, TQT_SLOT(selectionChanged()));
+		connect(activeLogManager()->getView()->getLogList(), TQ_SIGNAL(selectionChanged()), detailDialog, TQ_SLOT(selectionChanged()));
+		//connect(activeLogManager()->getView()->getLogList(), TQ_SIGNAL(triggerUpdate()), detailDialog, TQ_SLOT(selectionChanged()));
 	}
 
 	detailDialog->show();
@@ -1329,7 +1329,7 @@ void KSystemLog::setupGroupBy() {
 	
 	menu->insertSeparator();
 
-	connect(menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(groupByChanged(int)));
+	connect(menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(groupByChanged(int)));
 	
 }
 
diff --git a/ksystemlog/src/logManager.cpp b/ksystemlog/src/logManager.cpp
index 314bd61..f0cbcd0 100644
--- a/ksystemlog/src/logManager.cpp
+++ b/ksystemlog/src/logManager.cpp
@@ -73,12 +73,12 @@ LogManager::LogManager(KSystemLog* m, LoadingDialog* progress) :
 	view=new View(main);
 	
 	view->setLogManager(this);
-	connect(view, TQT_SIGNAL(changeStatusbar(const TQString&)), this, TQT_SLOT(slotChangeStatusbar(const TQString&)));
-	connect(view, TQT_SIGNAL(changeCaption(const TQString&)), this, TQT_SLOT(slotChangeCaption(const TQString&)));
+	connect(view, TQ_SIGNAL(changeStatusbar(const TQString&)), this, TQ_SLOT(slotChangeStatusbar(const TQString&)));
+	connect(view, TQ_SIGNAL(changeCaption(const TQString&)), this, TQ_SLOT(slotChangeCaption(const TQString&)));
 	
-	connect(view->getLogList(), TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint&, int)), this, TQT_SLOT(slotDetails(TQListViewItem *, const TQPoint&, int)));
-	connect(view->getLogList(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()));
-	connect(view->getLogList(), TQT_SIGNAL(rightButtonPressed(TQListViewItem*, const TQPoint&, int)), this, TQT_SLOT(slotOpenContextualMenu(TQListViewItem*, const TQPoint&, int)));
+	connect(view->getLogList(), TQ_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint&, int)), this, TQ_SLOT(slotDetails(TQListViewItem *, const TQPoint&, int)));
+	connect(view->getLogList(), TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged()));
+	connect(view->getLogList(), TQ_SIGNAL(rightButtonPressed(TQListViewItem*, const TQPoint&, int)), this, TQ_SLOT(slotOpenContextualMenu(TQListViewItem*, const TQPoint&, int)));
 
 }
 
@@ -342,13 +342,13 @@ void LogManager::initialize(LogMode* mode) {
 
 	//Find the reader instance used for this new mode
 	reader=ReaderFactory::createReader(mode);
-	connect(reader, TQT_SIGNAL(statusbarChanged(const TQString&)), this, TQT_SLOT(slotChangeStatusbar(const TQString&)));
-	connect(reader, TQT_SIGNAL(logUpdated(int)), this, TQT_SLOT(slotLogUpdated(int)));
-	connect(reader, TQT_SIGNAL(openingProgressed(int)), this, TQT_SLOT(openingProgress(int)));
+	connect(reader, TQ_SIGNAL(statusbarChanged(const TQString&)), this, TQ_SLOT(slotChangeStatusbar(const TQString&)));
+	connect(reader, TQ_SIGNAL(logUpdated(int)), this, TQ_SLOT(slotLogUpdated(int)));
+	connect(reader, TQ_SIGNAL(openingProgressed(int)), this, TQ_SLOT(openingProgress(int)));
 	
-	connect(reader, TQT_SIGNAL(readingBegin()), this, TQT_SLOT(readingBegun()));
-	connect(reader, TQT_SIGNAL(readingFile(int)), this, TQT_SLOT(readingFile(int)));
-	connect(reader, TQT_SIGNAL(readingEnd()), this, TQT_SLOT(readingEnded()));
+	connect(reader, TQ_SIGNAL(readingBegin()), this, TQ_SLOT(readingBegun()));
+	connect(reader, TQ_SIGNAL(readingFile(int)), this, TQ_SLOT(readingFile(int)));
+	connect(reader, TQ_SIGNAL(readingEnd()), this, TQ_SLOT(readingEnded()));
 
 	
 	//Inform this reader that this LogManager is now its parent
diff --git a/ksystemlog/src/loggerDialog.cpp b/ksystemlog/src/loggerDialog.cpp
index d284584..88581b3 100644
--- a/ksystemlog/src/loggerDialog.cpp
+++ b/ksystemlog/src/loggerDialog.cpp
@@ -41,16 +41,16 @@
 LoggerDialog::LoggerDialog(TQWidget *parent, const char *name) :
 	LoggerDialogBase(parent, name) {
 		
-	connect(buttonOK, TQT_SIGNAL(clicked()), this, TQT_SLOT(sendMessage()));
+	connect(buttonOK, TQ_SIGNAL(clicked()), this, TQ_SLOT(sendMessage()));
 	
-	connect(tagActivation, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(tagActivationChanged(bool)));
-	connect(fileActivation, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(fileActivationChanged(bool)));
-	connect(messageActivation, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(messageActivationChanged(bool)));
+	connect(tagActivation, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(tagActivationChanged(bool)));
+	connect(fileActivation, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(fileActivationChanged(bool)));
+	connect(messageActivation, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(messageActivationChanged(bool)));
 	
 	
-	connect(file, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(textChanged(const TQString&)));
-	connect(message, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(textChanged(const TQString&)));
-	connect(tag, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(textChanged(const TQString&)));
+	connect(file, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(textChanged(const TQString&)));
+	connect(message, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(textChanged(const TQString&)));
+	connect(tag, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(textChanged(const TQString&)));
 
 	buildMaps();
 	
diff --git a/ksystemlog/src/mail/mailOptions.cpp b/ksystemlog/src/mail/mailOptions.cpp
index a297073..241aaf0 100644
--- a/ksystemlog/src/mail/mailOptions.cpp
+++ b/ksystemlog/src/mail/mailOptions.cpp
@@ -53,7 +53,7 @@ MailOptions::MailOptions(TQWidget *parent) :
 	TQString description= i18n("<qt><p>These files will be analyzed to display <b>Mail Logs</b>. This list also determine the order in which the files are read.</p></qt>");
 	fileList=new SpecificFileList(this, description);
 	
-	connect(fileList, TQT_SIGNAL(fileListChanged(int)), this, TQT_SLOT(slotFileListChanged(int)));
+	connect(fileList, TQ_SIGNAL(fileListChanged(int)), this, TQ_SLOT(slotFileListChanged(int)));
 
 	readConfig();
 	
diff --git a/ksystemlog/src/options.cpp b/ksystemlog/src/options.cpp
index 755ff62..4dfc116 100644
--- a/ksystemlog/src/options.cpp
+++ b/ksystemlog/src/options.cpp
@@ -58,8 +58,8 @@ Options::Options(TQWidget* parent, const char *name, bool modal) :
 	
 	disableApplyButton();
 
-	connect(this, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(saveConfig()));
-	connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(saveConfig()));
+	connect(this, TQ_SIGNAL(applyClicked()), this, TQ_SLOT(saveConfig()));
+	connect(this, TQ_SIGNAL(okClicked()), this, TQ_SLOT(saveConfig()));
 	
 	
 	//Really update size of this Configuration Dialog Box
@@ -106,10 +106,10 @@ void Options::setupGeneralOptions() {
 	//Done by the setAutoAdd method
 	//frameLayout->addWidget(container, 0, 0, 0);
 
-	connect(generalOptions, TQT_SIGNAL(optionsChanged(bool)), this, TQT_SLOT(optionsChanged(bool)));
+	connect(generalOptions, TQ_SIGNAL(optionsChanged(bool)), this, TQ_SLOT(optionsChanged(bool)));
 
-	connect(this, TQT_SIGNAL(applyClicked()), generalOptions, TQT_SLOT(saveConfig()));
-	connect(this, TQT_SIGNAL(okClicked()), generalOptions, TQT_SLOT(saveConfig()));
+	connect(this, TQ_SIGNAL(applyClicked()), generalOptions, TQ_SLOT(saveConfig()));
+	connect(this, TQ_SIGNAL(okClicked()), generalOptions, TQ_SLOT(saveConfig()));
 
 }
 
@@ -132,10 +132,10 @@ void Options::setupBootAuthenticationOptions() {
 	bootAuthenticationOptions = new BootAuthenticationOptions(container->viewport());
 	container->addChild(bootAuthenticationOptions, 0, 0);
 
-	connect(bootAuthenticationOptions, TQT_SIGNAL(optionsChanged(bool)), this, TQT_SLOT(optionsChanged(bool)));
+	connect(bootAuthenticationOptions, TQ_SIGNAL(optionsChanged(bool)), this, TQ_SLOT(optionsChanged(bool)));
 
-	connect(this, TQT_SIGNAL(applyClicked()), bootAuthenticationOptions, TQT_SLOT(saveConfig()));
-	connect(this, TQT_SIGNAL(okClicked()), bootAuthenticationOptions, TQT_SLOT(saveConfig()));
+	connect(this, TQ_SIGNAL(applyClicked()), bootAuthenticationOptions, TQ_SLOT(saveConfig()));
+	connect(this, TQ_SIGNAL(okClicked()), bootAuthenticationOptions, TQ_SLOT(saveConfig()));
 
 }
 
@@ -163,10 +163,10 @@ void Options::setupSystemOptions() {
 	//Done by the setAutoAdd method
 	//frameLayout->addWidget(container, 0, 0, 0);
 
-	connect(systemOptions, TQT_SIGNAL(optionsChanged(bool)), this, TQT_SLOT(optionsChanged(bool)));
+	connect(systemOptions, TQ_SIGNAL(optionsChanged(bool)), this, TQ_SLOT(optionsChanged(bool)));
 
-	connect(this, TQT_SIGNAL(applyClicked()), systemOptions, TQT_SLOT(saveConfig()));
-	connect(this, TQT_SIGNAL(okClicked()), systemOptions, TQT_SLOT(saveConfig()));
+	connect(this, TQ_SIGNAL(applyClicked()), systemOptions, TQ_SLOT(saveConfig()));
+	connect(this, TQ_SIGNAL(okClicked()), systemOptions, TQ_SLOT(saveConfig()));
 }
 
 void Options::setupKernelOptions() {
@@ -190,10 +190,10 @@ void Options::setupKernelOptions() {
 	//Done by the setAutoAdd method
 	//frameLayout->addWidget(container, 0, 0, 0);
 
-	connect(kernelOptions, TQT_SIGNAL(optionsChanged(bool)), this, TQT_SLOT(optionsChanged(bool)));
+	connect(kernelOptions, TQ_SIGNAL(optionsChanged(bool)), this, TQ_SLOT(optionsChanged(bool)));
 
-	connect(this, TQT_SIGNAL(applyClicked()), kernelOptions, TQT_SLOT(saveConfig()));
-	connect(this, TQT_SIGNAL(okClicked()), kernelOptions, TQT_SLOT(saveConfig()));
+	connect(this, TQ_SIGNAL(applyClicked()), kernelOptions, TQ_SLOT(saveConfig()));
+	connect(this, TQ_SIGNAL(okClicked()), kernelOptions, TQ_SLOT(saveConfig()));
 }
 
 void Options::setupCronOptions() {
@@ -217,10 +217,10 @@ void Options::setupCronOptions() {
 	//Done by the setAutoAdd method
 	//frameLayout->addWidget(container, 0, 0, 0);
 
-	connect(cronOptions, TQT_SIGNAL(optionsChanged(bool)), this, TQT_SLOT(optionsChanged(bool)));
+	connect(cronOptions, TQ_SIGNAL(optionsChanged(bool)), this, TQ_SLOT(optionsChanged(bool)));
 
-	connect(this, TQT_SIGNAL(applyClicked()), cronOptions, TQT_SLOT(saveConfig()));
-	connect(this, TQT_SIGNAL(okClicked()), cronOptions, TQT_SLOT(saveConfig()));
+	connect(this, TQ_SIGNAL(applyClicked()), cronOptions, TQ_SLOT(saveConfig()));
+	connect(this, TQ_SIGNAL(okClicked()), cronOptions, TQ_SLOT(saveConfig()));
 }
 
 void Options::setupDaemonOptions() {
@@ -244,10 +244,10 @@ void Options::setupDaemonOptions() {
 	//Done by the setAutoAdd method
 	//frameLayout->addWidget(container, 0, 0, 0);
 
-	connect(daemonOptions, TQT_SIGNAL(optionsChanged(bool)), this, TQT_SLOT(optionsChanged(bool)));
+	connect(daemonOptions, TQ_SIGNAL(optionsChanged(bool)), this, TQ_SLOT(optionsChanged(bool)));
 
-	connect(this, TQT_SIGNAL(applyClicked()), daemonOptions, TQT_SLOT(saveConfig()));
-	connect(this, TQT_SIGNAL(okClicked()), daemonOptions, TQT_SLOT(saveConfig()));
+	connect(this, TQ_SIGNAL(applyClicked()), daemonOptions, TQ_SLOT(saveConfig()));
+	connect(this, TQ_SIGNAL(okClicked()), daemonOptions, TQ_SLOT(saveConfig()));
 }
 
 void Options::setupXorgOptions() {
@@ -271,10 +271,10 @@ void Options::setupXorgOptions() {
 	//Done by the setAutoAdd method
 	//frameLayout->addWidget(container, 0, 0, 0);
 
-	connect(xorgOptions, TQT_SIGNAL(optionsChanged(bool)), this, TQT_SLOT(optionsChanged(bool)));
+	connect(xorgOptions, TQ_SIGNAL(optionsChanged(bool)), this, TQ_SLOT(optionsChanged(bool)));
 
-	connect(this, TQT_SIGNAL(applyClicked()), xorgOptions, TQT_SLOT(saveConfig()));
-	connect(this, TQT_SIGNAL(okClicked()), xorgOptions, TQT_SLOT(saveConfig()));
+	connect(this, TQ_SIGNAL(applyClicked()), xorgOptions, TQ_SLOT(saveConfig()));
+	connect(this, TQ_SIGNAL(okClicked()), xorgOptions, TQ_SLOT(saveConfig()));
 
 }
 
@@ -300,10 +300,10 @@ void Options::setupAcpidOptions() {
 	//Done by the setAutoAdd method
 	//frameLayout->addWidget(container, 0, 0, 0);
 
-	connect(acpidOptions, TQT_SIGNAL(optionsChanged(bool)), this, TQT_SLOT(optionsChanged(bool)));
+	connect(acpidOptions, TQ_SIGNAL(optionsChanged(bool)), this, TQ_SLOT(optionsChanged(bool)));
 
-	connect(this, TQT_SIGNAL(applyClicked()), acpidOptions, TQT_SLOT(saveConfig()));
-	connect(this, TQT_SIGNAL(okClicked()), acpidOptions, TQT_SLOT(saveConfig()));
+	connect(this, TQ_SIGNAL(applyClicked()), acpidOptions, TQ_SLOT(saveConfig()));
+	connect(this, TQ_SIGNAL(okClicked()), acpidOptions, TQ_SLOT(saveConfig()));
 
 }
 
@@ -329,10 +329,10 @@ void Options::setupCupsOptions() {
 	//Done by the setAutoAdd method
 	//frameLayout->addWidget(container, 0, 0, 0);
 
-	connect(cupsOptions, TQT_SIGNAL(optionsChanged(bool)), this, TQT_SLOT(optionsChanged(bool)));
+	connect(cupsOptions, TQ_SIGNAL(optionsChanged(bool)), this, TQ_SLOT(optionsChanged(bool)));
 
-	connect(this, TQT_SIGNAL(applyClicked()), cupsOptions, TQT_SLOT(saveConfig()));
-	connect(this, TQT_SIGNAL(okClicked()), cupsOptions, TQT_SLOT(saveConfig()));
+	connect(this, TQ_SIGNAL(applyClicked()), cupsOptions, TQ_SLOT(saveConfig()));
+	connect(this, TQ_SIGNAL(okClicked()), cupsOptions, TQ_SLOT(saveConfig()));
 
 }
 
@@ -357,10 +357,10 @@ void Options::setupApacheOptions() {
 	//Done by the setAutoAdd method
 	//frameLayout->addWidget(container, 0, 0, 0);
 
-	connect(apacheOptions, TQT_SIGNAL(optionsChanged(bool)), this, TQT_SLOT(optionsChanged(bool)));
+	connect(apacheOptions, TQ_SIGNAL(optionsChanged(bool)), this, TQ_SLOT(optionsChanged(bool)));
 
-	connect(this, TQT_SIGNAL(applyClicked()), apacheOptions, TQT_SLOT(saveConfig()));
-	connect(this, TQT_SIGNAL(okClicked()), apacheOptions, TQT_SLOT(saveConfig()));
+	connect(this, TQ_SIGNAL(applyClicked()), apacheOptions, TQ_SLOT(saveConfig()));
+	connect(this, TQ_SIGNAL(okClicked()), apacheOptions, TQ_SLOT(saveConfig()));
 
 }
 
@@ -386,10 +386,10 @@ void Options::setupMailOptions() {
 	//Done by the setAutoAdd method
 	//frameLayout->addWidget(container, 0, 0, 0);
 
-	connect(mailOptions, TQT_SIGNAL(optionsChanged(bool)), this, TQT_SLOT(optionsChanged(bool)));
+	connect(mailOptions, TQ_SIGNAL(optionsChanged(bool)), this, TQ_SLOT(optionsChanged(bool)));
 
-	connect(this, TQT_SIGNAL(applyClicked()), mailOptions, TQT_SLOT(saveConfig()));
-	connect(this, TQT_SIGNAL(okClicked()), mailOptions, TQT_SLOT(saveConfig()));
+	connect(this, TQ_SIGNAL(applyClicked()), mailOptions, TQ_SLOT(saveConfig()));
+	connect(this, TQ_SIGNAL(okClicked()), mailOptions, TQ_SLOT(saveConfig()));
 }
 
 
diff --git a/ksystemlog/src/reader.cpp b/ksystemlog/src/reader.cpp
index f81f880..651549e 100644
--- a/ksystemlog/src/reader.cpp
+++ b/ksystemlog/src/reader.cpp
@@ -36,7 +36,7 @@ Reader::Reader(TQObject *parent, const char *name) :
 	
 	watch=new KDirWatch();
 	kdDebug() << watch->internalMethod() << endl;
-	connect(watch, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(logChanged(const TQString&)));
+	connect(watch, TQ_SIGNAL(dirty(const TQString&)), this, TQ_SLOT(logChanged(const TQString&)));
 }
 
 Reader::~Reader() {
diff --git a/ksystemlog/src/samba/sambaOptions.cpp b/ksystemlog/src/samba/sambaOptions.cpp
index 6301860..6c01001 100644
--- a/ksystemlog/src/samba/sambaOptions.cpp
+++ b/ksystemlog/src/samba/sambaOptions.cpp
@@ -52,7 +52,7 @@ SambaOptions::SambaOptions(TQWidget *parent) :
 	TQString description= i18n("<qt><p>These files will be analyzed to display <b>Samba log</b>. This list also determines the order in which the files are read.</p></qt>");
 	fileList=new FileList(this, description);
 	
-	connect(fileList, TQT_SIGNAL(fileListChanged(int)), this, TQT_SLOT(slotFileListChanged(int)));
+	connect(fileList, TQ_SIGNAL(fileListChanged(int)), this, TQ_SLOT(slotFileListChanged(int)));
 	
 	readConfig();
 	
diff --git a/ksystemlog/src/specificFileList.cpp b/ksystemlog/src/specificFileList.cpp
index 10ed421..df4915a 100644
--- a/ksystemlog/src/specificFileList.cpp
+++ b/ksystemlog/src/specificFileList.cpp
@@ -46,12 +46,12 @@ SpecificFileList::SpecificFileList(TQWidget* parent, TQString description) :
 
 
 	changeItem=new TQPushButton(SmallIconSet("colorize"), i18n("&Change Status..."), buttons);
-	connect(changeItem, TQT_SIGNAL(clicked()), this, TQT_SLOT(changeItemType()));
+	connect(changeItem, TQ_SIGNAL(clicked()), this, TQ_SLOT(changeItemType()));
 	TQToolTip::add(changeItem, i18n("Change the level of the current file(s)"));
 	TQWhatsThis::add(changeItem, i18n("<qt>Changes the level of the current file(s). See KSystemLog documentation for more information about each log level.</qt>"));
 	
 	fileListMenu->insertSeparator();
-	fileListMenu->insertItem(SmallIcon("colorize"), i18n("&Change Status"), this, TQT_SLOT(changeItemType()));
+	fileListMenu->insertItem(SmallIcon("colorize"), i18n("&Change Status"), this, TQ_SLOT(changeItemType()));
 
 	
 	changeItem->setEnabled(false);
@@ -120,7 +120,7 @@ void SpecificFileList::changeItemType() {
 	TQWhatsThis::add(choiceList.viewport(), i18n("<qt>This is the list of all existing log levels. Please select one of them to be used for the selected files of the list.</qt>"));
 	
 	//TODO Move this code to a specific class
-	//connect(&choiceList, TQT_SIGNAL(doubleClicked(TQListBoxItem*)), &dialog, TQT_SLOT(okClicked()));
+	//connect(&choiceList, TQ_SIGNAL(doubleClicked(TQListBoxItem*)), &dialog, TQ_SLOT(okClicked()));
 	
 	TQPtrListIterator<LogLevel> itLevel(Globals::logLevels);
 	LogLevel* level=itLevel.current();
diff --git a/ksystemlog/src/system/systemOptions.cpp b/ksystemlog/src/system/systemOptions.cpp
index 9aab091..b12ea8a 100644
--- a/ksystemlog/src/system/systemOptions.cpp
+++ b/ksystemlog/src/system/systemOptions.cpp
@@ -52,7 +52,7 @@ SystemOptions::SystemOptions(TQWidget *parent) :
 	TQString description= i18n("<qt><p>These files will be analyzed to display <b>System logs</b>. This list also determines the order in which the files are read.</p></qt>");
 	fileList=new SpecificFileList(this, description);
 	
-	connect(fileList, TQT_SIGNAL(fileListChanged(int)), this, TQT_SLOT(slotFileListChanged(int)));
+	connect(fileList, TQ_SIGNAL(fileListChanged(int)), this, TQ_SLOT(slotFileListChanged(int)));
 
 	layout->addWidget(fileList);
 	
diff --git a/ksystemlog/src/view.cpp b/ksystemlog/src/view.cpp
index e786a9e..4756ad8 100644
--- a/ksystemlog/src/view.cpp
+++ b/ksystemlog/src/view.cpp
@@ -108,7 +108,7 @@ View::View(TQWidget *parent) :
 	search->setListView(table);
 	
 	//Connect the pressed signal of the clear button to the clear slot of "clear"
-	connect(clearSearch, TQT_SIGNAL(pressed()), search, TQT_SLOT(clear()));
+	connect(clearSearch, TQ_SIGNAL(pressed()), search, TQ_SLOT(clear()));
 #endif
 
 }
@@ -372,9 +372,9 @@ void View::initSearchFilter(TQWidget* filterBox) {
 	//TODO 0 is not a very good value... Improve that. and of course, try to find a better solution
 	searchFilter->setMinimumSize(70, 0);
 
-	connect(searchFilter, TQT_SIGNAL(activated(int)), search, TQT_SLOT(setFocus()));
-	connect(searchFilter, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changeColumnFilter(int)));
-	connect(searchFilter, TQT_SIGNAL(activated(int)), search, TQT_SLOT(updateSearch()));
+	connect(searchFilter, TQ_SIGNAL(activated(int)), search, TQ_SLOT(setFocus()));
+	connect(searchFilter, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changeColumnFilter(int)));
+	connect(searchFilter, TQ_SIGNAL(activated(int)), search, TQ_SLOT(updateSearch()));
 #endif
 
 }
diff --git a/ksystemlog/src/xorg/xorgOptions.cpp b/ksystemlog/src/xorg/xorgOptions.cpp
index 2f0dd93..d5a0361 100644
--- a/ksystemlog/src/xorg/xorgOptions.cpp
+++ b/ksystemlog/src/xorg/xorgOptions.cpp
@@ -52,7 +52,7 @@ XorgOptions::XorgOptions(TQWidget *parent) :
 	TQString description= i18n("<qt><p>These files will be analyzed to display <b>X.org log</b>. This list also determines the order in which the files are read.</p></qt>");
 	fileList=new FileList(this, description);
 	
-	connect(fileList, TQT_SIGNAL(fileListChanged(int)), this, TQT_SLOT(slotFileListChanged(int)));
+	connect(fileList, TQ_SIGNAL(fileListChanged(int)), this, TQ_SLOT(slotFileListChanged(int)));
 	
 	readConfig();