summaryrefslogtreecommitdiffstats
path: root/kfloppy
diff options
context:
space:
mode:
Diffstat (limited to 'kfloppy')
-rw-r--r--kfloppy/floppy.cpp38
-rw-r--r--kfloppy/floppy.h2
-rw-r--r--kfloppy/format.cpp26
-rw-r--r--kfloppy/format.h6
-rw-r--r--kfloppy/zip.cpp20
-rw-r--r--kfloppy/zip.h2
6 files changed, 47 insertions, 47 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);
diff --git a/kfloppy/floppy.h b/kfloppy/floppy.h
index 240181c..901494f 100644
--- a/kfloppy/floppy.h
+++ b/kfloppy/floppy.h
@@ -43,7 +43,7 @@ class KFActionQueue;
class FloppyData : public KDialog
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kfloppy/format.cpp b/kfloppy/format.cpp
index 5c3729c..31be451 100644
--- a/kfloppy/format.cpp
+++ b/kfloppy/format.cpp
@@ -28,9 +28,9 @@
#include <tqregexp.h>
#include <tdelocale.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
#include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include "format.h"
@@ -146,12 +146,12 @@ void KFActionQueue::queue(KFAction *p)
else
{
kdDebug(KFAREA) << "Running action " << next->name() << endl;
- TQObject::connect(next,TQT_SIGNAL(done(KFAction *,bool)),
- this,TQT_SLOT(actionDone(KFAction *,bool)));
+ TQObject::connect(next,TQ_SIGNAL(done(KFAction *,bool)),
+ this,TQ_SLOT(actionDone(KFAction *,bool)));
// Propagate signals
- TQObject::connect(next,TQT_SIGNAL(status(const TQString &,int)),
- this,TQT_SIGNAL(status(const TQString &,int)));
- TQTimer::singleShot(0,next,TQT_SLOT(exec()));
+ TQObject::connect(next,TQ_SIGNAL(status(const TQString &,int)),
+ this,TQ_SIGNAL(status(const TQString &,int)));
+ TQTimer::singleShot(0,next,TQ_SLOT(exec()));
}
}
@@ -370,12 +370,12 @@ bool FloppyAction::startProcess()
{
DEBUGSETUP;
- connect(theProcess,TQT_SIGNAL(processExited(TDEProcess *)),
- this,TQT_SLOT(processDone(TDEProcess *)));
- connect(theProcess,TQT_SIGNAL(receivedStdout(TDEProcess *,char *,int)),
- this,TQT_SLOT(processStdOut(TDEProcess *,char *,int)));
- connect(theProcess,TQT_SIGNAL(receivedStderr(TDEProcess *,char *,int)),
- this,TQT_SLOT(processStdErr(TDEProcess *,char *,int)));
+ connect(theProcess,TQ_SIGNAL(processExited(TDEProcess *)),
+ this,TQ_SLOT(processDone(TDEProcess *)));
+ connect(theProcess,TQ_SIGNAL(receivedStdout(TDEProcess *,char *,int)),
+ this,TQ_SLOT(processStdOut(TDEProcess *,char *,int)));
+ connect(theProcess,TQ_SIGNAL(receivedStderr(TDEProcess *,char *,int)),
+ this,TQ_SLOT(processStdErr(TDEProcess *,char *,int)));
theProcess->setEnvironment( "LC_ALL", "C" ); // We need the untranslated output of the tool
return theProcess->start(TDEProcess::NotifyOnExit,
diff --git a/kfloppy/format.h b/kfloppy/format.h
index 2da577c..c0caa15 100644
--- a/kfloppy/format.h
+++ b/kfloppy/format.h
@@ -65,7 +65,7 @@
*/
class KFAction : public TQObject
{
-Q_OBJECT
+TQ_OBJECT
public:
@@ -115,7 +115,7 @@ signals:
*/
class KFActionQueue : public KFAction
{
-Q_OBJECT
+TQ_OBJECT
public:
@@ -175,7 +175,7 @@ class TDEProcess;
class FloppyAction : public KFAction
{
-Q_OBJECT
+TQ_OBJECT
public:
diff --git a/kfloppy/zip.cpp b/kfloppy/zip.cpp
index a35a715..82cbb4a 100644
--- a/kfloppy/zip.cpp
+++ b/kfloppy/zip.cpp
@@ -39,7 +39,7 @@
#include <tqwhatsthis.h>
#include <tdelocale.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
#include <tdeconfig.h>
ZipFormat::ZipFormat(TQWidget *w,const char *n) :
@@ -143,14 +143,14 @@ void ZipFormat::quit()
if (statusTimer) delete statusTimer;
statusTimer = new TQTimer(this);
- connect(p,TQT_SIGNAL(processExited(TDEProcess *)),
- this,TQT_SLOT(transition()));
- connect(p,TQT_SIGNAL(receivedStdout(TDEProcess *,char *,int)),
- this,TQT_SLOT(processResult(TDEProcess *,char *,int)));
- connect(p,TQT_SIGNAL(receivedStderr(TDEProcess *,char *,int)),
- this,TQT_SLOT(processResult(TDEProcess *,char *,int)));
- connect(statusTimer,TQT_SIGNAL(timeout()),
- this,TQT_SLOT(statusRequest()));
+ connect(p,TQ_SIGNAL(processExited(TDEProcess *)),
+ this,TQ_SLOT(transition()));
+ connect(p,TQ_SIGNAL(receivedStdout(TDEProcess *,char *,int)),
+ this,TQ_SLOT(processResult(TDEProcess *,char *,int)));
+ connect(p,TQ_SIGNAL(receivedStderr(TDEProcess *,char *,int)),
+ this,TQ_SLOT(processResult(TDEProcess *,char *,int)));
+ connect(statusTimer,TQ_SIGNAL(timeout()),
+ this,TQ_SLOT(statusRequest()));
transition();
}
@@ -174,7 +174,7 @@ void ZipFormat::transition()
// No point in making a dizzy display of it.
statusTimer->start(10000);
TQTimer::singleShot(1000,this,
- TQT_SLOT(statusRequest()));
+ TQ_SLOT(statusRequest()));
totalBlocks=12288; // 196608 * 512b = 12288 * 8192b ;
}
else
diff --git a/kfloppy/zip.h b/kfloppy/zip.h
index cb02d18..2bf2830 100644
--- a/kfloppy/zip.h
+++ b/kfloppy/zip.h
@@ -46,7 +46,7 @@ class TDEConfig;
class ZipFormat : public DiskFormat
{
-Q_OBJECT
+TQ_OBJECT
public: