Trinity Qt initial conversion

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

1 files changed, 25 insertions, 25 deletions

diff --git a/kdeprint/kdeprintfax/confsystem.cpp b/kdeprint/kdeprintfax/confsystem.cpp
index 02ee7e66d..51ea326c8 100644
--- a/kdeprint/kdeprintfax/confsystem.cpp
+++ b/kdeprint/kdeprintfax/confsystem.cpp
@@ -21,10 +21,10 @@
 #include "confsystem.h" 
 #include "defcmds.h" 
  
-#include <qlineedit.h> 
-#include <qlabel.h> 
-#include <qlayout.h> 
-#include <qcombobox.h>
+#include <tqlineedit.h> 
+#include <tqlabel.h> 
+#include <tqlayout.h> 
+#include <tqcombobox.h>
  
 #include <kglobal.h> 
 #include <kconfig.h> 
@@ -38,43 +38,43 @@
 #define	MGETTY_ID	2
 #define OTHER_ID    3
  
-ConfSystem::ConfSystem(QWidget *parent, const char *name) 
-: QWidget(parent, name) 
+ConfSystem::ConfSystem(TQWidget *parent, const char *name) 
+: TQWidget(parent, name) 
 { 
-	m_system = new QComboBox(this);
+	m_system = new TQComboBox(this);
 	m_system->insertItem("EFax");
 	m_system->insertItem("HylaFax");
 	m_system->insertItem("Mgetty-sendfax");
 	m_system->insertItem( "Other" );
-	m_command = new QLineEdit(this);
-	QLabel	*syslabel = new QLabel(i18n("F&ax system:"), this);
-	QLabel	*cmdlabel = new QLabel(i18n("Co&mmand:"), this);
+	m_command = new TQLineEdit(this);
+	QLabel	*syslabel = new TQLabel(i18n("F&ax system:"), this);
+	QLabel	*cmdlabel = new TQLabel(i18n("Co&mmand:"), this);
 	syslabel->setBuddy(m_system);
 	cmdlabel->setBuddy(m_command);
-	connect(m_system, SIGNAL(activated(int)), SLOT(slotSystemChanged(int)));
+	connect(m_system, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSystemChanged(int)));
 	m_current = 0;
 	m_system->setCurrentItem(m_current);
 
-	QWidget	*m_dummy1 = new QWidget(this), *m_dummy2 = new QWidget(this);
-	m_server = new QLineEdit(m_dummy1);
-	m_device = new QComboBox(m_dummy2);
-	QLabel	*srvlabel = new QLabel(i18n("Fax &server (if any):"), m_dummy1);
-	QLabel	*devlabel = new QLabel(i18n("&Fax/Modem device:"), m_dummy2);
+	QWidget	*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);
 	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( i18n( "Other" ) );
-	connect( m_device, SIGNAL( activated( int ) ), SLOT( slotDeviceChanged( int ) ) );
-	m_device_edit = new QLineEdit( m_dummy2 );
+	connect( m_device, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotDeviceChanged( int ) ) );
+	m_device_edit = new TQLineEdit( m_dummy2 );
 	slotDeviceChanged( 0 );
 
 	KSeparator	*sep = new KSeparator(this);
 	sep->setMinimumHeight(10);
  
-	QVBoxLayout	*l0 = new QVBoxLayout(this, 10, 10);
-	QGridLayout	*l1 = new QGridLayout(0, 2, 2, 0, 10);
+	QVBoxLayout	*l0 = new TQVBoxLayout(this, 10, 10);
+	QGridLayout	*l1 = new TQGridLayout(0, 2, 2, 0, 10);
 	l0->addLayout(l1);
 	l1->setColStretch(1, 1);
 	l1->addWidget(syslabel, 0, 0);
@@ -85,10 +85,10 @@ ConfSystem::ConfSystem(QWidget *parent, const char *name)
 	l0->addWidget(m_dummy1);
 	l0->addWidget(m_dummy2);
 	l0->addStretch(1); 
-	QHBoxLayout	*l4 = new QHBoxLayout(m_dummy1, 0, 10);
+	QHBoxLayout	*l4 = new TQHBoxLayout(m_dummy1, 0, 10);
 	l4->addWidget(srvlabel, 0);
 	l4->addWidget(m_server, 1);
-	QGridLayout	*l5 = new QGridLayout( m_dummy2, 2, 2, 0, 10 );
+	QGridLayout	*l5 = new TQGridLayout( m_dummy2, 2, 2, 0, 10 );
 	l5->setColStretch( 1, 1 );
 	l5->addWidget(devlabel, 0, 0);
 	l5->addWidget(m_device, 0, 1);
@@ -102,7 +102,7 @@ void ConfSystem::load()
 	m_commands << conf->readPathEntry("EFax", defaultCommand(efax_default_cmd)); 
 	m_commands << conf->readPathEntry("HylaFax", defaultCommand(hylafax_default_cmd));
 	m_commands << conf->readPathEntry("Mgetty", defaultCommand(mgetty_default_cmd));
-	m_commands << conf->readPathEntry( "Other", QString::null );
+	m_commands << conf->readPathEntry( "Other", TQString::null );
 	QString	v = conf->readEntry("System", "efax");
 	if (v == "mgetty") m_current = MGETTY_ID;
 	else if (v == "hylafax") m_current = HYLAFAX_ID;
@@ -158,10 +158,10 @@ void ConfSystem::save()
 	}
 	conf->setGroup("Fax");
 	if ( m_device->currentItem() != ( m_device->count()-1 ) )
-		conf->writeEntry("Device", m_device->currentItem() == 0 ? QString("modem") : QString("ttyS%1").arg(m_device->currentItem()-1));
+		conf->writeEntry("Device", m_device->currentItem() == 0 ? TQString("modem") : TQString("ttyS%1").arg(m_device->currentItem()-1));
 	else
 	{
-		QString dev = m_device_edit->text();
+		TQString dev = m_device_edit->text();
 		// strip leading "/dev/"
 		if ( dev.startsWith( "/dev/" ) )
 			dev = dev.mid( 5 );