1 files changed, 19 insertions, 19 deletions

diff --git a/kfloppy/floppy.cpp b/kfloppy/floppy.cpp
index 91593a6..b5356cc 100644
--- a/kfloppy/floppy.cpp
+++ b/kfloppy/floppy.cpp
@@ -184,7 +184,7 @@ FloppyData::FloppyData(TQWidget * parent, const char * name)
 
         v1->addSpacing( 10 );
 
-        buttongroup = new TQButtonGroup( 3, Qt::Vertical, i18n("&Formatting"), this, "ButtonGroup_1" );
+        buttongroup = new TQButtonGroup( 3, TQt::Vertical, i18n("&Formatting"), this, "ButtonGroup_1" );
 
 
         quick = new TQRadioButton( i18n( "Q&uick format" ), buttongroup, "RadioButton_2" );
@@ -255,7 +255,7 @@ FloppyData::FloppyData(TQWidget * parent, const char * name)
             " Due to a limitation of MS-DOS the label can only be 11 characters long."
             " Please note that Minix does not support labels, whatever you enter here.</qt>") );
 
-	connect(labellabel,TQT_SIGNAL(toggled(bool)),lineedit,TQT_SLOT(setEnabled(bool)));
+	connect(labellabel,TQ_SIGNAL(toggled(bool)),lineedit,TQ_SLOT(setEnabled(bool)));
 
 	TQVBoxLayout* v3 = new TQVBoxLayout( h1 );
 
@@ -264,7 +264,7 @@ FloppyData::FloppyData(TQWidget * parent, const char * name)
 	formatbutton->setAutoRepeat( false );
         if (!numFileSystems)
             formatbutton->setDisabled(false); // We have not any helper program for creating any file system
-	connect(formatbutton,TQT_SIGNAL(clicked()),this,TQT_SLOT(format()));
+	connect(formatbutton,TQ_SIGNAL(clicked()),this,TQ_SLOT(format()));
         v3->addWidget( formatbutton );
         TQWhatsThis::add( formatbutton,
             i18n("<qt>Click here to start formatting.</qt>") );
@@ -281,7 +281,7 @@ FloppyData::FloppyData(TQWidget * parent, const char * name)
 
 	quitbutton = new KPushButton( KStdGuiItem::quit(), this );
 	quitbutton->setAutoRepeat( false );
-	connect(quitbutton,TQT_SIGNAL(clicked()),this,TQT_SLOT(quit()));
+	connect(quitbutton,TQ_SIGNAL(clicked()),this,TQ_SLOT(quit()));
 	 v3->addWidget( quitbutton );
 
         ml->addSpacing( 10 );
@@ -335,7 +335,7 @@ void FloppyData::keyPressEvent(TQKeyEvent *e)
 {
 	switch(e->key()) {
 	case TQt::Key_F1:
-		kapp->invokeHelp();
+		tdeApp->invokeHelp();
 		break;
 	default:
 		KDialog::keyPressEvent(e);
@@ -424,7 +424,7 @@ bool FloppyData::setInitialDevice(const TQString& dev)
 void FloppyData::quit(){
   if (formatActions) formatActions->quit();
   writeSettings();
-  kapp->quit();
+  tdeApp->quit();
   delete this;
 }
 
@@ -536,12 +536,12 @@ void FloppyData::format(){
     }
 
 	if (formatActions) delete formatActions;
-	formatActions = new KFActionQueue(TQT_TQOBJECT(this));
+	formatActions = new KFActionQueue(this);
 
-	connect(formatActions,TQT_SIGNAL(status(const TQString &,int)),
-		this,TQT_SLOT(formatStatus(const TQString &,int)));
-	connect(formatActions,TQT_SIGNAL(done(KFAction *,bool)),
-		this,TQT_SLOT(reset()));
+	connect(formatActions,TQ_SIGNAL(status(const TQString &,int)),
+		this,TQ_SLOT(formatStatus(const TQString &,int)));
+	connect(formatActions,TQ_SIGNAL(done(KFAction *,bool)),
+		this,TQ_SLOT(reset()));
 
 	if ( quick->isChecked())
 	{
@@ -550,7 +550,7 @@ void FloppyData::format(){
 	}
         else if ( zerooutformat->isChecked() )
         {
-            DDZeroOut* f = new DDZeroOut( TQT_TQOBJECT(this) );
+            DDZeroOut* f = new DDZeroOut( this );
             if ( userDevice )
             {
                 f->configureDevice( currentComboBoxDevice );
@@ -569,7 +569,7 @@ void FloppyData::format(){
         }
         else
 	{
-		FDFormat *f = new FDFormat(TQT_TQOBJECT(this));
+		FDFormat *f = new FDFormat(this);
 		f->configureDevice(drive,blocks);
 		f->configure(verifylabel->isChecked());
 		formatActions->queue(f);
@@ -577,7 +577,7 @@ void FloppyData::format(){
 
 	if ( filesystemComboBox->currentText() == i18n("DOS") )
 	{
-		FATFilesystem *f = new FATFilesystem(TQT_TQOBJECT(this));
+		FATFilesystem *f = new FATFilesystem(this);
 		f->configure(verifylabel->isChecked(),
 			labellabel->isChecked(),
 			lineedit->text());
@@ -594,7 +594,7 @@ void FloppyData::format(){
 
 	else if ( filesystemComboBox->currentText() == i18n("ext2") )
 	{
-		Ext2Filesystem *f = new Ext2Filesystem(TQT_TQOBJECT(this));
+		Ext2Filesystem *f = new Ext2Filesystem(this);
 		f->configure(verifylabel->isChecked(),
 			labellabel->isChecked(),
 			lineedit->text());
@@ -612,7 +612,7 @@ void FloppyData::format(){
 #ifdef ANY_BSD
 	else if ( filesystemComboBox->currentText() == i18n("UFS") )
 	{
-		FloppyAction *f = new UFSFilesystem(TQT_TQOBJECT(this));
+		FloppyAction *f = new UFSFilesystem(this);
                 f->configureDevice(drive,blocks);
                 formatActions->queue(f);
 	}
@@ -621,7 +621,7 @@ void FloppyData::format(){
 #ifdef ANY_LINUX
 	else if ( filesystemComboBox->currentText() == i18n("Minix") )
 	{
-		MinixFilesystem *f = new MinixFilesystem(TQT_TQOBJECT(this));
+		MinixFilesystem *f = new MinixFilesystem(this);
 		f->configure(verifylabel->isChecked(),
 			labellabel->isChecked(),
 			lineedit->text());
@@ -664,7 +664,7 @@ void FloppyData::formatStatus(const TQString &s,int p)
 
 void FloppyData::writeSettings(){
 
-        config = kapp->config();
+        config = tdeApp->config();
 	config->setGroup("GeneralData");
 
 	densityconfig = densityComboBox->currentText().stripWhiteSpace();
@@ -694,7 +694,7 @@ void FloppyData::writeSettings(){
 
 void FloppyData::readSettings(){
 
-        config = kapp->config();
+        config = tdeApp->config();
 	config->setGroup("GeneralData");
 
 	verifyconfig = config->readNumEntry("Verify", 1);