Enable compilation with TQt for Qt4 3.4.0 TP2

This should not break compatibility with TQt for Qt3; if it does please fix it ASAP!


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

17 files changed, 146 insertions, 146 deletions

diff --git a/kdeprint/kdeprintfax/conffax.cpp b/kdeprint/kdeprintfax/conffax.cpp
index 2351c9c69..ca6b0d180 100644
--- a/kdeprint/kdeprintfax/conffax.cpp
+++ b/kdeprint/kdeprintfax/conffax.cpp
@@ -45,12 +45,12 @@ ConfFax::ConfFax(TQWidget *parent, const char *name)
 	m_pagesize->insertItem(i18n("A4"));
 	m_pagesize->insertItem(i18n("Letter"));
 	m_pagesize->insertItem(i18n("Legal"));
-	QLabel	*m_resolutionlabel = new TQLabel(i18n("&Resolution:"), this);
+	TQLabel	*m_resolutionlabel = new TQLabel(i18n("&Resolution:"), this);
 	m_resolutionlabel->setBuddy(m_resolution);
-	QLabel	*m_pagesizelabel = new TQLabel(i18n("&Paper size:"), this);
+	TQLabel	*m_pagesizelabel = new TQLabel(i18n("&Paper size:"), this);
 	m_pagesizelabel->setBuddy(m_pagesize);
 
-	QGridLayout	*l0 = new TQGridLayout(this, 3, 2, 10, 10);
+	TQGridLayout	*l0 = new TQGridLayout(this, 3, 2, 10, 10);
 	l0->setColStretch(1, 1);
 	l0->setRowStretch(2, 1);
 	l0->addWidget(m_resolutionlabel, 0, 0);
@@ -63,7 +63,7 @@ void ConfFax::load()
 {
 	KConfig	*conf = KGlobal::config();
 	conf->setGroup("Fax");
-	QString	v = conf->readEntry("Page", KGlobal::locale()->pageSize() == TQPrinter::A4 ? "a4" : "letter");
+	TQString	v = conf->readEntry("Page", KGlobal::locale()->pageSize() == TQPrinter::A4 ? "a4" : "letter");
 	if (v == "letter") m_pagesize->setCurrentItem(1);
 	else if (v == "legal") m_pagesize->setCurrentItem(2);
 	else m_pagesize->setCurrentItem(0);
diff --git a/kdeprint/kdeprintfax/conffax.h b/kdeprint/kdeprintfax/conffax.h
index 8429ac40e..bf31c2990 100644
--- a/kdeprint/kdeprintfax/conffax.h
+++ b/kdeprint/kdeprintfax/conffax.h
@@ -25,7 +25,7 @@
 
 class TQComboBox;
 
-class ConfFax : public QWidget
+class ConfFax : public TQWidget
 {
 public:
 	ConfFax(TQWidget *parent = 0, const char *name = 0);
@@ -34,7 +34,7 @@ public:
 	void save();
 
 private:
-	QComboBox	*m_resolution, *m_pagesize;
+	TQComboBox	*m_resolution, *m_pagesize;
 };
 
 #endif
diff --git a/kdeprint/kdeprintfax/conffilters.cpp b/kdeprint/kdeprintfax/conffilters.cpp
index fc33f88b1..388cd1ab2 100644
--- a/kdeprint/kdeprintfax/conffilters.cpp
+++ b/kdeprint/kdeprintfax/conffilters.cpp
@@ -68,8 +68,8 @@ ConfFilters::ConfFilters(TQWidget *parent, const char *name)
 	TQToolTip::add(m_up, i18n("Move filter up"));
 	TQToolTip::add(m_down, i18n("Move filter down"));
 
-	QHBoxLayout	*l0 = new TQHBoxLayout(this, 10, 10);
-	QVBoxLayout	*l1 = new TQVBoxLayout(0, 0, 0);
+	TQHBoxLayout	*l0 = new TQHBoxLayout(this, 10, 10);
+	TQVBoxLayout	*l1 = new TQVBoxLayout(0, 0, 0);
 	l0->addWidget(m_filters, 1);
 	l0->addLayout(l1, 0);
 	l1->addWidget(m_add);
@@ -85,19 +85,19 @@ ConfFilters::ConfFilters(TQWidget *parent, const char *name)
 
 void ConfFilters::load()
 {
-	QFile	f(locate("data","kdeprintfax/faxfilters"));
+	TQFile	f(locate("data","kdeprintfax/faxfilters"));
 	if (f.exists() && f.open(IO_ReadOnly))
 	{
-		QTextStream	t(&f);
-		QString		line;
+		TQTextStream	t(&f);
+		TQString		line;
 		int		p(-1);
-		QListViewItem	*item(0);
+		TQListViewItem	*item(0);
 		while (!t.eof())
 		{
 			line = t.readLine().stripWhiteSpace();
-			if ((p=line.find(TQRegExp("\\s"))) != -1)
+			if ((p=line.tqfind(TQRegExp("\\s"))) != -1)
 			{
-				QString	mime(line.left(p)), cmd(line.right(line.length()-p-1).stripWhiteSpace());
+				TQString	mime(line.left(p)), cmd(line.right(line.length()-p-1).stripWhiteSpace());
 				if (!mime.isEmpty() && !cmd.isEmpty())
 					item = new TQListViewItem(m_filters, item, mime, cmd);
 			}
@@ -107,11 +107,11 @@ void ConfFilters::load()
 
 void ConfFilters::save()
 {
-	QListViewItem	*item = m_filters->firstChild();
-	QFile	f(locateLocal("data","kdeprintfax/faxfilters"));
+	TQListViewItem	*item = m_filters->firstChild();
+	TQFile	f(locateLocal("data","kdeprintfax/faxfilters"));
 	if (f.open(IO_WriteOnly))
 	{
-		QTextStream	t(&f);
+		TQTextStream	t(&f);
 		while (item)
 		{
 			t << item->text(0) << ' ' << item->text(1) << endl;
@@ -122,7 +122,7 @@ void ConfFilters::save()
 
 void ConfFilters::slotAdd()
 {
-	QString	mime, cmd;
+	TQString	mime, cmd;
 	if (FilterDlg::doIt(this, &mime, &cmd))
 		if (!mime.isEmpty() && !cmd.isEmpty())
 		  {
@@ -135,7 +135,7 @@ void ConfFilters::slotAdd()
 
 void ConfFilters::slotRemove()
 {
-	QListViewItem	*item = m_filters->currentItem();
+	TQListViewItem	*item = m_filters->currentItem();
 	if (item)
 		delete item;
 	updateButton();
@@ -143,10 +143,10 @@ void ConfFilters::slotRemove()
 
 void ConfFilters::slotChange()
 {
-	QListViewItem	*item = m_filters->currentItem();
+	TQListViewItem	*item = m_filters->currentItem();
 	if (item)
 	{
-		QString	mime(item->text(0)), cmd(item->text(1));
+		TQString	mime(item->text(0)), cmd(item->text(1));
 		if (FilterDlg::doIt(this, &mime, &cmd))
 		{
 			item->setText(0, mime);
@@ -157,7 +157,7 @@ void ConfFilters::slotChange()
 
 void ConfFilters::slotUp()
 {
-	QListViewItem	*item = m_filters->currentItem();
+	TQListViewItem	*item = m_filters->currentItem();
 	if (item && item->itemAbove())
 	{
 		m_filters->moveItem(item, 0, item->itemAbove()->itemAbove());
@@ -168,7 +168,7 @@ void ConfFilters::slotUp()
 
 void ConfFilters::slotDown()
 {
-	QListViewItem	*item = m_filters->currentItem();
+	TQListViewItem	*item = m_filters->currentItem();
 	if (item && item->itemBelow())
 	{
 		m_filters->moveItem(item, 0, item->itemBelow());
@@ -179,7 +179,7 @@ void ConfFilters::slotDown()
 
 void ConfFilters::updateButton()
 {
-  QListViewItem	*item = m_filters->currentItem();
+  TQListViewItem	*item = m_filters->currentItem();
 
   bool state=item && item->itemBelow();
   m_remove->setEnabled(item);
diff --git a/kdeprint/kdeprintfax/conffilters.h b/kdeprint/kdeprintfax/conffilters.h
index ce3d64156..c4eb1f5c2 100644
--- a/kdeprint/kdeprintfax/conffilters.h
+++ b/kdeprint/kdeprintfax/conffilters.h
@@ -25,7 +25,7 @@
 #include <tqpushbutton.h>
 class KListView;
 
-class ConfFilters : public QWidget
+class ConfFilters : public TQWidget
 {
 	Q_OBJECT
 public:
@@ -42,7 +42,7 @@ protected slots:
 	void updateButton();
 private:
 	KListView	*m_filters;
-	QPushButton	*m_add,*m_remove,*m_up,*m_down,*m_change;
+	TQPushButton	*m_add,*m_remove,*m_up,*m_down,*m_change;
 };
 
 #endif
diff --git a/kdeprint/kdeprintfax/confgeneral.cpp b/kdeprint/kdeprintfax/confgeneral.cpp
index 757c54af7..a7d8ac3e7 100644
--- a/kdeprint/kdeprintfax/confgeneral.cpp
+++ b/kdeprint/kdeprintfax/confgeneral.cpp
@@ -38,11 +38,11 @@ ConfGeneral::ConfGeneral(TQWidget *parent, const char *name)
 	m_name = new TQLineEdit(this);
 	m_company = new TQLineEdit(this);
 	m_number = new TQLineEdit(this);
-	QLabel	*m_namelabel = new TQLabel(i18n("&Name:"), this);
+	TQLabel	*m_namelabel = new TQLabel(i18n("&Name:"), this);
 	m_namelabel->setBuddy(m_name);
-	QLabel	*m_companylabel = new TQLabel(i18n("&Company:"), this);
+	TQLabel	*m_companylabel = new TQLabel(i18n("&Company:"), this);
 	m_companylabel->setBuddy(m_company);
-	QLabel	*m_numberlabel = new TQLabel(i18n("N&umber:"), this);
+	TQLabel	*m_numberlabel = new TQLabel(i18n("N&umber:"), this);
         m_numberlabel->setBuddy(m_number);
 	KSeparator *sep = new KSeparator( this );
 	m_replace_int_char = new TQCheckBox( i18n( "Replace international prefix '+' with:" ), this );
@@ -51,7 +51,7 @@ ConfGeneral::ConfGeneral(TQWidget *parent, const char *name)
 
 	connect( m_replace_int_char, TQT_SIGNAL( toggled( bool ) ), m_replace_int_char_val, TQT_SLOT( setEnabled( bool ) ) );
 
-	QGridLayout	*l0 = new TQGridLayout(this, 6, 2, 10, 10);
+	TQGridLayout	*l0 = new TQGridLayout(this, 6, 2, 10, 10);
 	l0->setColStretch(1, 1);
 	l0->setRowStretch(5, 1);
 	l0->addWidget(m_namelabel, 0, 0);
diff --git a/kdeprint/kdeprintfax/confgeneral.h b/kdeprint/kdeprintfax/confgeneral.h
index 5a3ee6ca9..e94ac7422 100644
--- a/kdeprint/kdeprintfax/confgeneral.h
+++ b/kdeprint/kdeprintfax/confgeneral.h
@@ -26,7 +26,7 @@
 class TQLineEdit;
 class TQCheckBox;
 
-class ConfGeneral : public QWidget
+class ConfGeneral : public TQWidget
 {
 public:
 	ConfGeneral(TQWidget *parent = 0, const char *name = 0);
@@ -35,7 +35,7 @@ public:
 	void save();
 
 private:
-	QLineEdit	*m_name, *m_company, *m_number;
+	TQLineEdit	*m_name, *m_company, *m_number;
 	TQCheckBox   *m_replace_int_char;
 	TQLineEdit   *m_replace_int_char_val;
 };
diff --git a/kdeprint/kdeprintfax/configdlg.cpp b/kdeprint/kdeprintfax/configdlg.cpp
index 3ede8cab7..a3616cf54 100644
--- a/kdeprint/kdeprintfax/configdlg.cpp
+++ b/kdeprint/kdeprintfax/configdlg.cpp
@@ -31,16 +31,16 @@
 ConfigDlg::ConfigDlg(TQWidget *parent, const char *name)
 : KDialogBase(IconList, i18n("Configuration"), Ok|Cancel, Ok, parent, name, true)
 {
-	QVBox	*page1 = addVBoxPage(i18n("Personal"), i18n("Personal Settings"), DesktopIcon("kdmconfig"));
+	TQVBox	*page1 = addVBoxPage(i18n("Personal"), i18n("Personal Settings"), DesktopIcon("kdmconfig"));
 	m_general = new ConfGeneral(page1, "Personal");
 
-	QVBox	*page2 = addVBoxPage(i18n("Page setup"), i18n("Page Setup"), DesktopIcon("editcopy"));
+	TQVBox	*page2 = addVBoxPage(i18n("Page setup"), i18n("Page Setup"), DesktopIcon("editcopy"));
 	m_fax = new ConfFax(page2, "Fax");
 
-	QVBox	*page3 = addVBoxPage(i18n("System"), i18n("Fax System Selection"), DesktopIcon("kdeprintfax"));
+	TQVBox	*page3 = addVBoxPage(i18n("System"), i18n("Fax System Selection"), DesktopIcon("kdeprintfax"));
 	m_system = new ConfSystem(page3, "System");
 
-	QVBox	*page4 = addVBoxPage(i18n("Filters"), i18n("Filters Configuration"), DesktopIcon("filter"));
+	TQVBox	*page4 = addVBoxPage(i18n("Filters"), i18n("Filters Configuration"), DesktopIcon("filter"));
 	m_filters = new ConfFilters(page4, "Filters");
 
 	resize(450, 300);
diff --git a/kdeprint/kdeprintfax/confsystem.cpp b/kdeprint/kdeprintfax/confsystem.cpp
index 51ea326c8..e67a6b1e9 100644
--- a/kdeprint/kdeprintfax/confsystem.cpp
+++ b/kdeprint/kdeprintfax/confsystem.cpp
@@ -47,24 +47,24 @@ ConfSystem::ConfSystem(TQWidget *parent, const char *name)
 	m_system->insertItem("Mgetty-sendfax");
 	m_system->insertItem( "Other" );
 	m_command = new TQLineEdit(this);
-	QLabel	*syslabel = new TQLabel(i18n("F&ax system:"), this);
-	QLabel	*cmdlabel = new TQLabel(i18n("Co&mmand:"), this);
+	TQLabel	*syslabel = new TQLabel(i18n("F&ax system:"), this);
+	TQLabel	*cmdlabel = new TQLabel(i18n("Co&mmand:"), this);
 	syslabel->setBuddy(m_system);
 	cmdlabel->setBuddy(m_command);
 	connect(m_system, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSystemChanged(int)));
 	m_current = 0;
 	m_system->setCurrentItem(m_current);
 
-	QWidget	*m_dummy1 = new TQWidget(this), *m_dummy2 = new TQWidget(this);
+	TQWidget	*m_dummy1 = new TQWidget(this), *m_dummy2 = new TQWidget(this);
 	m_server = new TQLineEdit(m_dummy1);
 	m_device = new TQComboBox(m_dummy2);
-	QLabel	*srvlabel = new TQLabel(i18n("Fax &server (if any):"), m_dummy1);
-	QLabel	*devlabel = new TQLabel(i18n("&Fax/Modem device:"), m_dummy2);
+	TQLabel	*srvlabel = new TQLabel(i18n("Fax &server (if any):"), m_dummy1);
+	TQLabel	*devlabel = new TQLabel(i18n("&Fax/Modem device:"), m_dummy2);
 	srvlabel->setBuddy(m_server);
 	devlabel->setBuddy(m_device);
 	m_device->insertItem(i18n("Standard Modem Port"));
 	for (int i=0; i<10; i++)
-		m_device->insertItem(i18n("Serial Port #%1").arg(i));
+		m_device->insertItem(TQString(i18n("Serial Port #%1").arg(i)));
 	m_device->insertItem( i18n( "Other" ) );
 	connect( m_device, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotDeviceChanged( int ) ) );
 	m_device_edit = new TQLineEdit( m_dummy2 );
@@ -73,9 +73,9 @@ ConfSystem::ConfSystem(TQWidget *parent, const char *name)
 	KSeparator	*sep = new KSeparator(this);
 	sep->setMinimumHeight(10);
  
-	QVBoxLayout	*l0 = new TQVBoxLayout(this, 10, 10);
-	QGridLayout	*l1 = new TQGridLayout(0, 2, 2, 0, 10);
-	l0->addLayout(l1);
+	TQVBoxLayout	*l0 = new TQVBoxLayout(this, 10, 10);
+	TQGridLayout	*l1 = new TQGridLayout(0, 2, 2, 0, 10);
+	l0->addLayout(TQT_TQLAYOUT(l1));
 	l1->setColStretch(1, 1);
 	l1->addWidget(syslabel, 0, 0);
 	l1->addWidget(cmdlabel, 1, 0);
@@ -85,10 +85,10 @@ ConfSystem::ConfSystem(TQWidget *parent, const char *name)
 	l0->addWidget(m_dummy1);
 	l0->addWidget(m_dummy2);
 	l0->addStretch(1); 
-	QHBoxLayout	*l4 = new TQHBoxLayout(m_dummy1, 0, 10);
+	TQHBoxLayout	*l4 = new TQHBoxLayout(m_dummy1, 0, 10);
 	l4->addWidget(srvlabel, 0);
 	l4->addWidget(m_server, 1);
-	QGridLayout	*l5 = new TQGridLayout( m_dummy2, 2, 2, 0, 10 );
+	TQGridLayout	*l5 = new TQGridLayout( m_dummy2, 2, 2, 0, 10 );
 	l5->setColStretch( 1, 1 );
 	l5->addWidget(devlabel, 0, 0);
 	l5->addWidget(m_device, 0, 1);
@@ -103,7 +103,7 @@ void ConfSystem::load()
 	m_commands << conf->readPathEntry("HylaFax", defaultCommand(hylafax_default_cmd));
 	m_commands << conf->readPathEntry("Mgetty", defaultCommand(mgetty_default_cmd));
 	m_commands << conf->readPathEntry( "Other", TQString::null );
-	QString	v = conf->readEntry("System", "efax");
+	TQString	v = conf->readEntry("System", "efax");
 	if (v == "mgetty") m_current = MGETTY_ID;
 	else if (v == "hylafax") m_current = HYLAFAX_ID;
 	else if ( v == "other" ) m_current = OTHER_ID;
@@ -158,7 +158,7 @@ void ConfSystem::save()
 	}
 	conf->setGroup("Fax");
 	if ( m_device->currentItem() != ( m_device->count()-1 ) )
-		conf->writeEntry("Device", m_device->currentItem() == 0 ? TQString("modem") : TQString("ttyS%1").arg(m_device->currentItem()-1));
+		conf->writeEntry("Device", m_device->currentItem() == 0 ? TQString("modem") : TQString(TQString("ttyS%1").arg(m_device->currentItem()-1)));
 	else
 	{
 		TQString dev = m_device_edit->text();
@@ -178,13 +178,13 @@ void ConfSystem::slotSystemChanged(int ID)
 	m_commands[m_current] = m_command->text();
 	m_current = ID;
 	if (ID == EFAX_ID)
-		m_device->parentWidget()->show();
+		m_device->tqparentWidget()->show();
 	else
-		m_device->parentWidget()->hide();
+		m_device->tqparentWidget()->hide();
 	if (ID == HYLAFAX_ID)
-		m_server->parentWidget()->show();
+		m_server->tqparentWidget()->show();
 	else
-		m_server->parentWidget()->hide();
+		m_server->tqparentWidget()->hide();
 	m_command->setText(m_commands[m_current]);
 }
 
diff --git a/kdeprint/kdeprintfax/confsystem.h b/kdeprint/kdeprintfax/confsystem.h
index 6a2d00c12..9306df9f3 100644
--- a/kdeprint/kdeprintfax/confsystem.h
+++ b/kdeprint/kdeprintfax/confsystem.h
@@ -27,7 +27,7 @@
 class TQLineEdit;
 class TQComboBox;
 
-class ConfSystem : public QWidget
+class ConfSystem : public TQWidget
 {
 	Q_OBJECT
 public:
@@ -41,9 +41,9 @@ protected slots:
 	void slotDeviceChanged(int);
 
 private:
-	QComboBox	*m_system, *m_device;
-	QLineEdit	*m_command, *m_server, *m_device_edit;
-	QStringList	m_commands;
+	TQComboBox	*m_system, *m_device;
+	TQLineEdit	*m_command, *m_server, *m_device_edit;
+	TQStringList	m_commands;
 	int		m_current;
 };
 
diff --git a/kdeprint/kdeprintfax/defcmds.cpp b/kdeprint/kdeprintfax/defcmds.cpp
index 09631b51d..7dacc787a 100644
--- a/kdeprint/kdeprintfax/defcmds.cpp
+++ b/kdeprint/kdeprintfax/defcmds.cpp
@@ -24,15 +24,15 @@
 
 TQString defaultCommand(const TQString& cmd)
 {
-	QString	str(cmd);
-	QRegExp	r("%exe_(\\w+)");
+	TQString	str(cmd);
+	TQRegExp	r("%exe_(\\w+)");
 	int	p(-1);
 	if ((p=r.search(str)) != -1)
 	{
-		QString	exe = KStandardDirs::findExe(r.cap(1));
+		TQString	exe = KStandardDirs::findExe(r.cap(1));
 		if (exe.isEmpty())
 			exe = "/usr/bin/"+r.cap(1);
-		str.replace(p, r.matchedLength(), exe);
+		str.tqreplace(p, r.matchedLength(), exe);
 	}
 	return str;
 }
diff --git a/kdeprint/kdeprintfax/faxab.cpp b/kdeprint/kdeprintfax/faxab.cpp
index ebd6b9cb2..403caee04 100644
--- a/kdeprint/kdeprintfax/faxab.cpp
+++ b/kdeprint/kdeprintfax/faxab.cpp
@@ -41,19 +41,19 @@ FaxAB::FaxAB(TQWidget *parent, const char *name)
 	m_list->addColumn( i18n( "Name" ) );
 	m_list->addColumn( i18n( "Fax Number" ) );
 	m_list->header()->setStretchEnabled( true, 0 );
-	QLabel	*m_listlabel = new TQLabel(i18n("Entries:"), this);
+	TQLabel	*m_listlabel = new TQLabel(i18n("Entries:"), this);
 	m_ok = new KPushButton(KStdGuiItem::ok(), this);
-	QPushButton	*m_cancel = new KPushButton(KStdGuiItem::cancel(), this);
-	QPushButton	*m_ab = new KPushButton(KGuiItem(i18n("&Edit Addressbook"), "contents"), this);
+	TQPushButton	*m_cancel = new KPushButton(KStdGuiItem::cancel(), this);
+	TQPushButton	*m_ab = new KPushButton(KGuiItem(i18n("&Edit Addressbook"), "contents"), this);
 	connect(m_ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept()));
 	connect(m_cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()));
 	connect(m_ab, TQT_SIGNAL(clicked()), TQT_SLOT(slotEditAb()));
 	m_ok->setDefault(true);
 
-	QVBoxLayout	*l0 = new TQVBoxLayout(this, 10, 10);
+	TQVBoxLayout	*l0 = new TQVBoxLayout(this, 10, 10);
 	l0->addWidget( m_listlabel );
 	l0->addWidget( m_list );
-	QHBoxLayout	*l2 = new TQHBoxLayout(0, 0, 10);
+	TQHBoxLayout	*l2 = new TQHBoxLayout(0, 0, 10);
 	l0->addLayout(l2, 0);
 	l2->addWidget(m_ab, 0);
 	l2->addStretch(1);
@@ -163,7 +163,7 @@ bool FaxAB::getEntry(TQStringList& number, TQStringList& name, TQStringList& ent
 		/*
 		number = kab.m_fax->currentText();
 		name = kab.m_name->currentText();
-		if (kab.m_entries.contains(name))
+		if (kab.m_entries.tqcontains(name))
 		{
 			enterprise = kab.m_entries[name][0];
 		}
@@ -180,7 +180,7 @@ bool FaxAB::getEntryByNumber(const TQString& number, TQString& name, TQString& e
 	for (KABC::AddressBook::Iterator it=bk->begin(); it!=bk->end(); ++it)
 	{
 		KABC::PhoneNumber::List	numbers = (*it).phoneNumbers();
-		QStringList	filteredNumbers;
+		TQStringList	filteredNumbers;
 		for (TQValueList<KABC::PhoneNumber>::Iterator nit=numbers.begin(); nit!=numbers.end(); ++nit)
 		{
 			if (((*nit).type() & KABC::PhoneNumber::Fax) )
diff --git a/kdeprint/kdeprintfax/faxctrl.cpp b/kdeprint/kdeprintfax/faxctrl.cpp
index 1d1cd1fa5..f88d7ace5 100644
--- a/kdeprint/kdeprintfax/faxctrl.cpp
+++ b/kdeprint/kdeprintfax/faxctrl.cpp
@@ -87,9 +87,9 @@ static TQString stripNumber( const TQString& s )
 
 	// removes any non-numeric character, except ('+','*','#') (hope it's supported by faxing tools)
 	TQString strip_s = s;
-	strip_s.replace( TQRegExp( "[^\\d+*#]" ), "" );
-	if ( strip_s.find( '+' ) != -1 && conf->readBoolEntry( "ReplaceIntChar", false ) )
-		strip_s.replace( "+", conf->readEntry( "ReplaceIntCharVal" ) );
+	strip_s.tqreplace( TQRegExp( "[^\\d+*#]" ), "" );
+	if ( strip_s.tqfind( '+' ) != -1 && conf->readBoolEntry( "ReplaceIntChar", false ) )
+		strip_s.tqreplace( "+", conf->readEntry( "ReplaceIntCharVal" ) );
 	return strip_s;
 }
 
@@ -133,11 +133,11 @@ static TQString tagList( int n, ... )
 static TQString processTag( const TQString& match, bool value)
 {
 	TQString v;
-	int p = match.find( '_' );
+	int p = match.tqfind( '_' );
 	if ( p != -1 && match[ p+1 ] == '{' )
 	{
 		// Find the ?? that separates the iftrue from the iffalse parts.
-		int q = match.find( "?\?", p+2 );
+		int q = match.tqfind( "?\?", p+2 );
 		if ( q == -1 )
 		{
 			// No iffalse part
@@ -162,7 +162,7 @@ static TQString processTag( const TQString& match, bool value)
 static TQString processTag( const TQString& match, const TQString& value )
 {
 	TQString v;
-	int p = match.find( '_' );
+	int p = match.tqfind( '_' );
 	if ( p != -1 )
 	{
 		if ( value.isEmpty() )
@@ -172,7 +172,7 @@ static TQString processTag( const TQString& match, const TQString& value )
 			if ( match[ p+1 ] == '{' )
 			{
 				v = match.mid( p+2, match.length()-p-3 );
-				v.replace( "@@", quote( value ) );
+				v.tqreplace( "@@", quote( value ) );
 			}
 			else
 				v = ( "-" + match.mid( p+1 ) + " " + quote( value ) );
@@ -291,7 +291,7 @@ static TQString replaceTags( const TQString& s, const TQString& tags, KdeprintFa
 				if (v.isEmpty())
 					v = getenv("FAXSERVER");
 				if (v.isEmpty())
-					v = TQString::fromLatin1("localhost");
+					v = TQString::tqfromLatin1("localhost");
 				v = processTag( match, v );
 			}
 			else if (isTag( match, "%page" ))
@@ -392,7 +392,7 @@ bool FaxCtrl::send(KdeprintFax *f)
 
 void FaxCtrl::slotReceivedStdout(KProcess*, char *buffer, int len)
 {
-	QCString	str(buffer, len);
+	TQCString	str(buffer, len);
 	kdDebug() << "Received stdout: " << str << endl;
 	addLog(TQString(str));
 }
@@ -428,7 +428,7 @@ TQString FaxCtrl::faxCommand()
 {
 	KConfig	*conf = KGlobal::config();
 	conf->setGroup("System");
-	QString	sys = conf->readPathEntry("System", "efax");
+	TQString	sys = conf->readPathEntry("System", "efax");
 	TQString cmd;
 	if (sys == "hylafax")
 		cmd = conf->readPathEntry("HylaFax", hylafax_default_cmd);
@@ -445,13 +445,13 @@ TQString FaxCtrl::faxCommand()
 
 void FaxCtrl::sendFax()
 {
-	if ( m_command.find( "%files" ) != -1 )
+	if ( m_command.tqfind( "%files" ) != -1 )
 	{
 		// replace %files tag
-		QString	filestr;
+		TQString	filestr;
 		for (TQStringList::ConstIterator it=m_filteredfiles.begin(); it!=m_filteredfiles.end(); ++it)
 			filestr += (quote(*it)+" ");
-		m_command.replace("%files", filestr);
+		m_command.tqreplace("%files", filestr);
 	}
 
 	if ( !m_faxlist.isEmpty() )
@@ -476,7 +476,7 @@ void FaxCtrl::filter()
 {
 	if (m_files.count() > 0)
 	{
-		QString	mimeType = KMimeType::findByURL(KURL(m_files[0]), 0, true)->name();
+		TQString	mimeType = KMimeType::findByURL(KURL(m_files[0]), 0, true)->name();
 		if (mimeType == "application/postscript" || mimeType == "image/tiff")
 		{
 			emit message(i18n("Skipping %1...").arg(m_files[0]));
@@ -486,12 +486,12 @@ void FaxCtrl::filter()
 		}
 		else
 		{
-			QString	tmp = locateLocal("tmp","kdeprintfax_") + kapp->randomString(8);
+			TQString	tmp = locateLocal("tmp","kdeprintfax_") + kapp->randomString(8);
 			m_filteredfiles.prepend(tmp);
 			m_tempfiles.append(tmp);
 			m_process->clearArguments();
 			*m_process << locate("data","kdeprintfax/anytops") << "-m" << KProcess::quote(locate("data","kdeprintfax/faxfilters"))
-				<< TQString::fromLatin1("--mime=%1").arg(mimeType)
+				<< TQString::tqfromLatin1("--mime=%1").arg(mimeType)
 				<< "-p" << pageSize()
 				<<  KProcess::quote(m_files[0]) << KProcess::quote(tmp);
 			if (!m_process->start(KProcess::NotifyOnExit, KProcess::AllOutput))
@@ -518,15 +518,15 @@ void FaxCtrl::viewLog(TQWidget *)
 {
 	if (!m_logview)
 	{
-		QWidget	*topView = new TQWidget(0, "LogView", WType_TopLevel|WStyle_DialogBorder|WDestructiveClose);
+		TQWidget	*topView = new TQWidget(0, "LogView", (WFlags)(WType_TopLevel|WStyle_DialogBorder|WDestructiveClose));
 		m_logview = new KTextEdit(topView);
-		m_logview->setTextFormat( Qt::LogText );
+		m_logview->setTextFormat( TQt::LogText );
 		m_logview->setWordWrap( TQTextEdit::WidgetWidth );
 		m_logview->setPaper( Qt::white );
 		//m_logview->setReadOnly(true);
 		//m_logview->setWordWrap(TQTextEdit::NoWrap);
-		QPushButton	*m_clear = new KPushButton(KStdGuiItem::clear(), topView);
-		QPushButton	*m_close = new KPushButton(KStdGuiItem::close(), topView);
+		TQPushButton	*m_clear = new KPushButton(KStdGuiItem::clear(), topView);
+		TQPushButton	*m_close = new KPushButton(KStdGuiItem::close(), topView);
 		TQPushButton *m_print = new KPushButton( KStdGuiItem::print(), topView );
 		TQPushButton *m_save = new KPushButton( KStdGuiItem::saveAs(), topView );
 		m_close->setDefault(true);
@@ -536,9 +536,9 @@ void FaxCtrl::viewLog(TQWidget *)
 		connect( m_print, TQT_SIGNAL( clicked() ), TQT_SLOT( slotPrintLog() ) );
 		connect( m_save, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSaveLog() ) );
 
-		QVBoxLayout	*l0 = new TQVBoxLayout(topView, 10, 10);
+		TQVBoxLayout	*l0 = new TQVBoxLayout(topView, 10, 10);
 		l0->addWidget(m_logview);
-		QHBoxLayout	*l1 = new TQHBoxLayout(0, 0, 10);
+		TQHBoxLayout	*l1 = new TQHBoxLayout(0, 0, 10);
 		l0->addLayout(l1);
 		l1->addStretch(1);
 		l1->addWidget( m_save );
@@ -553,7 +553,7 @@ void FaxCtrl::viewLog(TQWidget *)
 	}
 	else
 	{
-		KWin::activateWindow(m_logview->parentWidget()->winId());
+		KWin::activateWindow(m_logview->tqparentWidget()->winId());
 	}
 }
 
@@ -578,7 +578,7 @@ TQString FaxCtrl::faxSystem()
 {
 	KConfig	*conf = KGlobal::config();
 	conf->setGroup("System");
-	QString	s = conf->readEntry("System", "efax");
+	TQString	s = conf->readEntry("System", "efax");
 	s[0] = s[0].upper();
 	return s;
 }
@@ -599,13 +599,13 @@ void FaxCtrl::slotClearLog()
 
 void FaxCtrl::slotCloseLog()
 {
-	const QObject	*obj = sender();
+	const TQObject	*obj = TQT_TQOBJECT_CONST(sender());
 	if (m_logview)
 	{
-		QTextEdit	*view = m_logview;
+		TQTextEdit	*view = m_logview;
 		m_logview = 0;
 		if (obj && obj->inherits("QPushButton"))
-			delete view->parentWidget();
+			delete view->tqparentWidget();
 kdDebug() << "slotClose()" << endl;
 	}
 }
@@ -617,7 +617,7 @@ void FaxCtrl::slotPrintLog()
 		KPrinter printer;
 		printer.setDocName( i18n( "Fax log" ) );
 		printer.setDocFileName( "faxlog" );
-		if ( printer.setup( m_logview->topLevelWidget(), i18n( "Fax Log" ) ) )
+		if ( printer.setup( m_logview->tqtopLevelWidget(), i18n( "Fax Log" ) ) )
 		{
 			TQPainter painter( &printer );
 			TQPaintDeviceMetrics metric( &printer );
@@ -625,7 +625,7 @@ void FaxCtrl::slotPrintLog()
 			//TQString txt = m_logview->text();
 			TQString txt = m_log;
 
-			txt.replace( '\n', "<br>" );
+			txt.tqreplace( '\n', "<br>" );
 			txt.prepend( "<h2>" + i18n( "KDEPrint Fax Tool Log" ) + "</h2>" );
 
 			kdDebug() << "Log: " << txt << endl;
@@ -634,7 +634,7 @@ void FaxCtrl::slotPrintLog()
 			richText.setWidth( &painter, body.width() );
 			do
 			{
-				richText.draw( &painter, body.left(), body.top(), view, m_logview->colorGroup() );
+				richText.draw( &painter, body.left(), body.top(), view, m_logview->tqcolorGroup() );
 				view.moveBy( 0, body.height() );
 				painter.translate( 0, -body.height() );
 				if ( view.top() >= richText.height() )
diff --git a/kdeprint/kdeprintfax/faxctrl.h b/kdeprint/kdeprintfax/faxctrl.h
index 04ad8ecc2..accbd6556 100644
--- a/kdeprint/kdeprintfax/faxctrl.h
+++ b/kdeprint/kdeprintfax/faxctrl.h
@@ -30,7 +30,7 @@
 class KProcess;
 class TQTextEdit;
 
-class FaxCtrl : public QObject
+class FaxCtrl : public TQObject
 {
 	Q_OBJECT
 public:
@@ -64,9 +64,9 @@ protected:
 
 private:
 	KProcess	*m_process;
-	QString		m_log, m_command;
-	QStringList	m_files, m_filteredfiles, m_tempfiles;
-	QTextEdit	*m_logview;
+	TQString		m_log, m_command;
+	TQStringList	m_files, m_filteredfiles, m_tempfiles;
+	TQTextEdit	*m_logview;
 	KdeprintFax::FaxItemList m_faxlist;
 };
 
diff --git a/kdeprint/kdeprintfax/filterdlg.cpp b/kdeprint/kdeprintfax/filterdlg.cpp
index ea9a88ce9..5e6f018a1 100644
--- a/kdeprint/kdeprintfax/filterdlg.cpp
+++ b/kdeprint/kdeprintfax/filterdlg.cpp
@@ -30,14 +30,14 @@
 FilterDlg::FilterDlg(TQWidget *parent, const char *name)
 : KDialogBase(parent, name, true, i18n("Filter Parameters"), Ok|Cancel, Ok)
 {
-	QWidget	*w = new TQWidget(this);
+	TQWidget	*w = new TQWidget(this);
 
 	m_mime = new TQLineEdit(w);
 	m_cmd = new TQLineEdit(w);
-	QLabel	*m_mimelabel = new TQLabel(i18n("MIME type:"), w);
-	QLabel	*m_cmdlabel = new TQLabel(i18n("Command:"), w);
+	TQLabel	*m_mimelabel = new TQLabel(i18n("MIME type:"), w);
+	TQLabel	*m_cmdlabel = new TQLabel(i18n("Command:"), w);
 
-	QGridLayout	*l0 = new TQGridLayout(w, 2, 2, 10, 5);
+	TQGridLayout	*l0 = new TQGridLayout(w, 2, 2, 10, 5);
 	l0->setColStretch(1, 1);
 	l0->addWidget(m_mimelabel, 0, 0);
 	l0->addWidget(m_cmdlabel, 1, 0);
diff --git a/kdeprint/kdeprintfax/filterdlg.h b/kdeprint/kdeprintfax/filterdlg.h
index 859815607..f0736bc88 100644
--- a/kdeprint/kdeprintfax/filterdlg.h
+++ b/kdeprint/kdeprintfax/filterdlg.h
@@ -35,7 +35,7 @@ public:
 protected slots:
     void slotTextFilterChanged();
 private:
-	QLineEdit	*m_mime, *m_cmd;
+	TQLineEdit	*m_mime, *m_cmd;
 };
 
 #endif
diff --git a/kdeprint/kdeprintfax/kdeprintfax.cpp b/kdeprint/kdeprintfax/kdeprintfax.cpp
index a5f66992b..e8daf8c89 100644
--- a/kdeprint/kdeprintfax/kdeprintfax.cpp
+++ b/kdeprint/kdeprintfax/kdeprintfax.cpp
@@ -65,7 +65,7 @@ KdeprintFax::KdeprintFax(TQWidget *parent, const char *name)
 	connect(m_faxctrl, TQT_SIGNAL(message(const TQString&)), TQT_SLOT(slotMessage(const TQString&)));
 	connect(m_faxctrl, TQT_SIGNAL(faxSent(bool)), TQT_SLOT(slotFaxSent(bool)));
 
-	QWidget	*mainw = new TQWidget(this);
+	TQWidget	*mainw = new TQWidget(this);
 	setCentralWidget(mainw);
 	m_files = new KListBox(mainw);
 	connect( m_files, TQT_SIGNAL( currentChanged( TQListBoxItem* ) ), TQT_SLOT( slotCurrentChanged() ) );
@@ -79,7 +79,7 @@ KdeprintFax::KdeprintFax(TQWidget *parent, const char *name)
 	TQToolTip::add( m_downbtn, i18n( "Move down" ) );
 	connect( m_downbtn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotMoveDown() ) );
 	m_downbtn->setEnabled( false );
-	QLabel	*m_filelabel = new TQLabel(i18n("F&iles:"), mainw);
+	TQLabel	*m_filelabel = new TQLabel(i18n("F&iles:"), mainw);
         m_filelabel->setBuddy(m_files);
         KSeparator*m_line = new KSeparator( KSeparator::HLine, mainw);
 		KSeparator *m_line2 = new KSeparator( KSeparator::HLine, mainw );
@@ -104,7 +104,7 @@ KdeprintFax::KdeprintFax(TQWidget *parent, const char *name)
 	TQToolTip::add( m_delbtn, i18n( "Remove fax number" ) );
 	m_delbtn->setEnabled( false );
 	connect( m_delbtn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotFaxRemove() ) );
-	QLabel	*m_commentlabel = new TQLabel(i18n("&Comment:"), mainw);
+	TQLabel	*m_commentlabel = new TQLabel(i18n("&Comment:"), mainw);
 	KSystemTray	*m_tray = new KSystemTray(this);
 	m_tray->setPixmap(SmallIcon("kdeprintfax"));
 	m_tray->show();
@@ -115,13 +115,13 @@ KdeprintFax::KdeprintFax(TQWidget *parent, const char *name)
 //	m_comment->setWordWrap(TQTextEdit::NoWrap);
 	m_comment->setLineWidth(1);
 	m_commentlabel->setBuddy(m_comment);
-	QLabel	*m_timelabel = new TQLabel(i18n("Sched&ule:"), mainw);
+	TQLabel	*m_timelabel = new TQLabel(i18n("Sched&ule:"), mainw);
 	m_timecombo = new TQComboBox(mainw);
 	m_timecombo->insertItem(i18n("Now"));
 	m_timecombo->insertItem(i18n("At Specified Time"));
 	m_timecombo->setCurrentItem(0);
 	m_timelabel->setBuddy(m_timecombo);
-	m_time = new QTimeEdit(mainw);
+	m_time = new TQTimeEdit(mainw);
 	m_time->setTime(TQTime::currentTime());
 	m_time->setEnabled(false);
 	connect(m_timecombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTimeComboActivated(int)));
@@ -131,7 +131,7 @@ KdeprintFax::KdeprintFax(TQWidget *parent, const char *name)
 	TQLabel *m_subjectlabel = new TQLabel( i18n( "Su&bject:" ), mainw );
 	m_subjectlabel->setBuddy( m_subject );
 
-	QGridLayout	*l0 = new TQGridLayout(mainw, 10, 2, 10, 5);
+	TQGridLayout	*l0 = new TQGridLayout(mainw, 10, 2, 10, 5);
 	l0->setColStretch(1,1);
 	l0->addWidget(m_filelabel, 0, 0, Qt::AlignLeft|Qt::AlignTop);
 	TQHBoxLayout *l2 = new TQHBoxLayout( 0, 0, 10 );
@@ -162,7 +162,7 @@ KdeprintFax::KdeprintFax(TQWidget *parent, const char *name)
 	l0->addWidget(m_commentlabel, 8, 0, Qt::AlignTop|Qt::AlignLeft);
 	l0->addWidget(m_comment, 8, 1);
 	l0->addWidget(m_timelabel, 9, 0);
-	QHBoxLayout	*l1 = new TQHBoxLayout(0, 0, 5);
+	TQHBoxLayout	*l1 = new TQHBoxLayout(0, 0, 5);
 	l0->addLayout(l1, 9, 1);
 	l1->addWidget(m_timecombo, 1);
 	l1->addWidget(m_time, 0);
@@ -178,7 +178,7 @@ KdeprintFax::KdeprintFax(TQWidget *parent, const char *name)
 	updateState();
 
 	resize(550,500);
-	QWidget	*d = kapp->desktop();
+	TQWidget	*d = TQT_TQWIDGET(kapp->desktop());
 	move((d->width()-width())/2, (d->height()-height())/2);
 }
 
@@ -188,19 +188,19 @@ KdeprintFax::~KdeprintFax()
 
 void KdeprintFax::initActions()
 {
-	new KAction(i18n("&Add File..."), "filenew", Qt::Key_Insert, this, TQT_SLOT(slotAdd()), actionCollection(), "file_add");
-	new KAction(i18n("&Remove File"), "remove", Qt::Key_Delete, this, TQT_SLOT(slotRemove()), actionCollection(), "file_remove");
-	new KAction(i18n("&Send Fax"), "connect_established", Qt::Key_Return, this, TQT_SLOT(slotFax()), actionCollection(), "fax_send");
-	new KAction(i18n("A&bort"), "stop", Qt::Key_Escape, this, TQT_SLOT(slotAbort()), actionCollection(), "fax_stop");
-	new KAction(i18n("A&ddress Book"), "kaddressbook", Qt::CTRL+Qt::Key_A, this, TQT_SLOT(slotKab()), actionCollection(), "fax_ab");
-	new KAction(i18n("V&iew Log"), "contents", Qt::CTRL+Qt::Key_L, this, TQT_SLOT(slotViewLog()), actionCollection(), "fax_log");
-	new KAction(i18n("Vi&ew File"), "filefind", Qt::CTRL+Qt::Key_O, this, TQT_SLOT(slotView()), actionCollection(), "file_view");
-	new KAction( i18n( "&New Fax Recipient..." ), "edit", Qt::CTRL+Qt::Key_N, this, TQT_SLOT( slotFaxAdd() ), actionCollection(), "fax_add" );
+	new KAction(i18n("&Add File..."), "filenew", Qt::Key_Insert, TQT_TQOBJECT(this), TQT_SLOT(slotAdd()), actionCollection(), "file_add");
+	new KAction(i18n("&Remove File"), "remove", Qt::Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemove()), actionCollection(), "file_remove");
+	new KAction(i18n("&Send Fax"), "connect_established", Qt::Key_Return, TQT_TQOBJECT(this), TQT_SLOT(slotFax()), actionCollection(), "fax_send");
+	new KAction(i18n("A&bort"), "stop", Qt::Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(slotAbort()), actionCollection(), "fax_stop");
+	new KAction(i18n("A&ddress Book"), "kaddressbook", Qt::CTRL+Qt::Key_A, TQT_TQOBJECT(this), TQT_SLOT(slotKab()), actionCollection(), "fax_ab");
+	new KAction(i18n("V&iew Log"), "contents", Qt::CTRL+Qt::Key_L, TQT_TQOBJECT(this), TQT_SLOT(slotViewLog()), actionCollection(), "fax_log");
+	new KAction(i18n("Vi&ew File"), "filefind", Qt::CTRL+Qt::Key_O, TQT_TQOBJECT(this), TQT_SLOT(slotView()), actionCollection(), "file_view");
+	new KAction( i18n( "&New Fax Recipient..." ), "edit", Qt::CTRL+Qt::Key_N, TQT_TQOBJECT(this), TQT_SLOT( slotFaxAdd() ), actionCollection(), "fax_add" );
 
-	KStdAction::quit(this, TQT_SLOT(slotQuit()), actionCollection());
+	KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection());
 	setStandardToolBarMenuEnabled(true);
-	KStdAction::showMenubar(this, TQT_SLOT(slotToggleMenuBar()), actionCollection());
-	KStdAction::preferences(this, TQT_SLOT(slotConfigure()), actionCollection());
+	KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(slotToggleMenuBar()), actionCollection());
+	KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actionCollection());
         KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), 
 actionCollection());
 	actionCollection()->action("fax_stop")->setEnabled(false);
@@ -263,7 +263,7 @@ void KdeprintFax::slotAbort()
 
 void KdeprintFax::slotKab()
 {
-	QStringList	number, name, enterprise;
+	TQStringList	number, name, enterprise;
 	if (FaxAB::getEntry(number, name, enterprise, this))
 	{
 		for ( unsigned int i = 0; i<number.count(); i++ )
@@ -273,7 +273,7 @@ void KdeprintFax::slotKab()
 
 void KdeprintFax::addURL(KURL url)
 {
-	QString	target;
+	TQString	target;
 	if (KIO::NetAccess::download(url,target,this))
 	{
 		m_files->insertItem(KMimeType::pixmapForURL(url,0,KIcon::Small),target);
@@ -314,7 +314,7 @@ void KdeprintFax::dropEvent(TQDropEvent *e)
 
 TQStringList KdeprintFax::files()
 {
-	QStringList	l;
+	TQStringList	l;
 	for (uint i=0; i<m_files->count(); i++)
 		l.append(m_files->text(i));
 	return l;
@@ -424,25 +424,25 @@ void KdeprintFax::slotConfigure()
 
 void KdeprintFax::updateState()
 {
-	QString	cmd = m_faxctrl->faxCommand();
-	m_cover->setEnabled(cmd.find("%cover") != -1);
+	TQString	cmd = m_faxctrl->faxCommand();
+	m_cover->setEnabled(cmd.tqfind("%cover") != -1);
 	if ( !m_cover->isEnabled() )
 		m_cover->setChecked(false);
-	m_comment->setEnabled(cmd.find("%comment") != -1 && m_cover->isChecked());
-	//m_comment->setPaper(m_comment->isEnabled() ? colorGroup().brush(TQColorGroup::Base) : colorGroup().brush(TQColorGroup::Background));
+	m_comment->setEnabled(cmd.tqfind("%comment") != -1 && m_cover->isChecked());
+	//m_comment->setPaper(m_comment->isEnabled() ? tqcolorGroup().brush(TQColorGroup::Base) : tqcolorGroup().brush(TQColorGroup::Background));
 	if (!m_comment->isEnabled())
 	{
 		m_comment->setText("");
-		m_comment->setPaper( colorGroup().background() );
+		m_comment->setPaper( tqcolorGroup().background() );
 	}
 	else
-		m_comment->setPaper( colorGroup().base() );
+		m_comment->setPaper( tqcolorGroup().base() );
 	/*
-	m_enterprise->setEnabled(cmd.find("%enterprise") != -1);
+	m_enterprise->setEnabled(cmd.tqfind("%enterprise") != -1);
 	if (!m_enterprise->isEnabled())
 		m_enterprise->setText("");
 	*/
-	if (cmd.find("%time") == -1)
+	if (cmd.tqfind("%time") == -1)
 	{
 		m_timecombo->setCurrentItem(0);
 		m_timecombo->setEnabled(false);
@@ -450,8 +450,8 @@ void KdeprintFax::updateState()
 	}
 	else
 		m_timecombo->setEnabled( true );
-	/*m_name->setEnabled( cmd.find( "%name" ) != -1 );*/
-	m_subject->setEnabled( cmd.find( "%subject" ) != -1 && m_cover->isChecked() );
+	/*m_name->setEnabled( cmd.tqfind( "%name" ) != -1 );*/
+	m_subject->setEnabled( cmd.tqfind( "%subject" ) != -1 && m_cover->isChecked() );
 	statusBar()->changeItem(m_faxctrl->faxSystem(), 2);
 }
 
diff --git a/kdeprint/kdeprintfax/kdeprintfax.h b/kdeprint/kdeprintfax/kdeprintfax.h
index e68ddfa67..ac54d8b61 100644
--- a/kdeprint/kdeprintfax/kdeprintfax.h
+++ b/kdeprint/kdeprintfax/kdeprintfax.h
@@ -31,7 +31,7 @@ class TQTextEdit;
 class FaxCtrl;
 class TQCheckBox;
 class TQLabel;
-class QTimeEdit;
+class TQTimeEdit;
 class TQComboBox;
 class TQPushButton;
 class TQListViewItem;
@@ -100,13 +100,13 @@ protected:
 private:
 	KListBox	*m_files;
 	KListView   *m_numbers;
-	QLineEdit	*m_subject;
-	QTextEdit	*m_comment;
+	TQLineEdit	*m_subject;
+	TQTextEdit	*m_comment;
 	FaxCtrl		*m_faxctrl;
-	QCheckBox	*m_cover;
-	QLabel		*m_msglabel;
-	QTimeEdit	*m_time;
-	QComboBox	*m_timecombo;
+	TQCheckBox	*m_cover;
+	TQLabel		*m_msglabel;
+	TQTimeEdit	*m_time;
+	TQComboBox	*m_timecombo;
 	TQPushButton *m_upbtn, *m_downbtn;
 	TQPushButton *m_newbtn, *m_abbtn, *m_delbtn;
 	bool m_quitAfterSend;