Rename old tq methods that no longer need a unique name

4 files changed, 14 insertions, 14 deletions

diff --git a/kfloppy/floppy.cpp b/kfloppy/floppy.cpp
index 18851bc..a89d18f 100644
--- a/kfloppy/floppy.cpp
+++ b/kfloppy/floppy.cpp
@@ -288,7 +288,7 @@ FloppyData::FloppyData(TQWidget * parent, const char * name)
 
 	frame = new TQLabel( this, "NewsWindow" );
 	frame->setFrameStyle(TQFrame::Panel | TQFrame::Sunken);
-	frame->tqsetAlignment(WordBreak|ExpandTabs);
+	frame->setAlignment(WordBreak|ExpandTabs);
         TQWhatsThis::add( frame,
             i18n("<qt>This is the status window, where error messages are displayed.</qt>") );
 
@@ -539,7 +539,7 @@ void FloppyData::format(){
 	formatActions = new KFActionQueue(TQT_TQOBJECT(this));
 
 	connect(formatActions,TQT_SIGNAL(status(const TQString &,int)),
-		this,TQT_SLOT(formattqStatus(const TQString &,int)));
+		this,TQT_SLOT(formatStatus(const TQString &,int)));
 	connect(formatActions,TQT_SIGNAL(done(KFAction *,bool)),
 		this,TQT_SLOT(reset()));
 
@@ -642,7 +642,7 @@ void FloppyData::format(){
 	formatActions->exec();
 }
 
-void FloppyData::formattqStatus(const TQString &s,int p)
+void FloppyData::formatStatus(const TQString &s,int p)
 {
     kdDebug(2002) << "FloppyData::formatStatus: " << s << " : "  << p << endl;
 	if (!s.isEmpty())
diff --git a/kfloppy/floppy.h b/kfloppy/floppy.h
index 30b0519..ead6b71 100644
--- a/kfloppy/floppy.h
+++ b/kfloppy/floppy.h
@@ -75,7 +75,7 @@ public slots:
       void format();
       void reset();
 
-      void formattqStatus(const TQString &,int);
+      void formatStatus(const TQString &,int);
       
 protected slots:
 
diff --git a/kfloppy/format.cpp b/kfloppy/format.cpp
index 03f6f41..9a972f4 100644
--- a/kfloppy/format.cpp
+++ b/kfloppy/format.cpp
@@ -358,7 +358,7 @@ void FloppyAction::processStdOut(KProcess *, char *b, int l)
 {
 	Q_UNUSED(b);
 	Q_UNUSED(l);
-	kdDebug(KFAREA) << "stdout:" << TQString::tqfromLatin1(b,l) << endl;
+	kdDebug(KFAREA) << "stdout:" << TQString::fromLatin1(b,l) << endl;
 }
 
 void FloppyAction::processStdErr(KProcess *p, char *b, int l)
@@ -390,7 +390,7 @@ FDFormat::FDFormat(TQObject *p) :
 	doVerify(true)
 {
 	DEBUGSETUP;
-	theProcessName = TQString::tqfromLatin1("fdformat");
+	theProcessName = TQString::fromLatin1("fdformat");
 	setName("FDFormat");
 }
 
@@ -482,7 +482,7 @@ void FDFormat::processStdOut(KProcess *, char *b, int l)
 	}
 	else
 	{
-		s = TQString::tqfromLatin1(b,l);
+		s = TQString::fromLatin1(b,l);
 		if (s.contains("ioctl(FD_FORM)"))
 		{
                     emit status (i18n(
@@ -499,7 +499,7 @@ void FDFormat::processStdOut(KProcess *, char *b, int l)
 		DEBUGS(s);
 	}
 #elif defined(ANY_LINUX)
-	s = TQString::tqfromLatin1(b,l);
+	s = TQString::fromLatin1(b,l);
 	DEBUGS(s);
         TQRegExp regexp( "([0-9]+)" );
         if ( s.startsWith( "bad data at cyl" ) || ( s.find( "Problem reading cylinder" ) != -1 ) )
@@ -557,7 +557,7 @@ DDZeroOut::DDZeroOut(TQObject *p) :
     FloppyAction(p)
 {
     kdDebug(KFAREA) << (__PRETTY_FUNCTION__) << endl;
-    theProcessName = TQString::tqfromLatin1("dd");
+    theProcessName = TQString::fromLatin1("dd");
     setName("DD");
 }
 
@@ -720,7 +720,7 @@ void FATFilesystem::processStdOut(KProcess *, char *b, int l)
 #ifdef ANY_BSD
     // ### TODO: do some checks
 #elif defined(ANY_LINUX)
-    TQString s ( TQString::tqfromLatin1( b, l ) );
+    TQString s ( TQString::fromLatin1( b, l ) );
     kdDebug(KFAREA) << s << endl;
     if (s.find("mounted file system")!=-1) // "/dev/fd0 contains a mounted file system
     {
@@ -886,7 +886,7 @@ void Ext2Filesystem::processStdOut(KProcess *, char *b, int l)
 #ifdef ANY_BSD
     // ### TODO: do some checks
 #elif defined(ANY_LINUX)
-    TQString s ( TQString::tqfromLatin1( b, l ) );
+    TQString s ( TQString::fromLatin1( b, l ) );
     kdDebug(KFAREA) << s << endl;
     if (s.find("mounted")!=-1) // "/dev/fd0 is mounted; will not make a filesystem here!"
     {
@@ -977,7 +977,7 @@ void MinixFilesystem::exec()
 
 void MinixFilesystem::processStdOut(KProcess *, char *b, int l)
 {
-    TQString s ( TQString::tqfromLatin1( b, l ) );
+    TQString s ( TQString::fromLatin1( b, l ) );
     kdDebug(KFAREA) << s << endl;
     if (s.find("mounted")!=-1) // "mkfs.minix: /dev/fd0 is mounted; will not make a filesystem here!"
     {
diff --git a/kfloppy/zip.cpp b/kfloppy/zip.cpp
index e774a8f..5dae22e 100644
--- a/kfloppy/zip.cpp
+++ b/kfloppy/zip.cpp
@@ -250,7 +250,7 @@ void ZipFormat::processResult(KProcess *, char *b, int l)
 	DEBUGSETUP;
 
 #ifdef DEBUG
-	TQString o = TQString::tqfromLatin1(b,l);
+	TQString o = TQString::fromLatin1(b,l);
 	DEBUGS(TQString("  %1").tqarg(o).latin1());
 #endif
 
@@ -283,7 +283,7 @@ void ZipFormat::processResult(KProcess *, char *b, int l)
 			//
 			emit setProgress(1);
 
-			// TQString myBuf = TQString::tqfromLatin1(b, l);
+			// TQString myBuf = TQString::fromLatin1(b, l);
 			// DEBUGS(myBuf.latin1());
 		}
 		break;