Rename old tq methods that no longer need a unique name

14 files changed, 25 insertions, 25 deletions

diff --git a/ark/ace.cpp b/ark/ace.cpp
index 4ce0709..6ad5cd0 100644
--- a/ark/ace.cpp
+++ b/ark/ace.cpp
@@ -174,7 +174,7 @@ void AceArch::unarchFileInternal( )
 
 void AceArch::catchMeIfYouCan( KProcess*, char *buffer, int buflen )
 {
-	TQString myBuf = TQString::tqfromLatin1( buffer, buflen );
+	TQString myBuf = TQString::fromLatin1( buffer, buflen );
 	kdDebug(1601) << "	Wololo!:	" << myBuf << endl;
 }
 
diff --git a/ark/addition.ui b/ark/addition.ui
index ac12593..401c146 100644
--- a/ark/addition.ui
+++ b/ark/addition.ui
@@ -66,7 +66,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>51</height>
diff --git a/ark/arch.cpp b/ark/arch.cpp
index 5ff9a61..29bdf63 100644
--- a/ark/arch.cpp
+++ b/ark/arch.cpp
@@ -367,7 +367,7 @@ bool Arch::processLine( const TQCString &line )
                    TQString( "%1" )
                    .tqarg( ArkUtils::getMonth( columns[ m_repairMonth ].ascii() ) )
                    : columns[ m_fixMonth ];
-    TQString timestamp = TQString::tqfromLatin1( "%1-%2-%3 %4" )
+    TQString timestamp = TQString::fromLatin1( "%1-%2-%3 %4" )
                         .tqarg( year )
                         .tqarg( month )
                         .tqarg( columns[ m_fixDay ] )
diff --git a/ark/ark_part.cpp b/ark/ark_part.cpp
index 20ac169..8834e61 100644
--- a/ark/ark_part.cpp
+++ b/ark/ark_part.cpp
@@ -411,12 +411,12 @@ void ArkStatusBarExtension::setupStatusBar()
 
     m_pStatusLabelTotal = new KSqueezedTextLabel( statusBar(), "StatusLabelTotal" );
     m_pStatusLabelTotal->setFrameStyle( TQFrame::NoFrame );
-    m_pStatusLabelTotal->tqsetAlignment( AlignRight );
+    m_pStatusLabelTotal->setAlignment( AlignRight );
     m_pStatusLabelTotal->setText( i18n( "Total: 0 files" ) );
 
     m_pStatusLabelSelect = new TQLabel( statusBar(), "StatusLabelSelect" );
     m_pStatusLabelSelect->setFrameStyle( TQFrame::NoFrame );
-    m_pStatusLabelSelect->tqsetAlignment( AlignLeft );
+    m_pStatusLabelSelect->setAlignment( AlignLeft );
     m_pStatusLabelSelect->setText(i18n( "0 files selected" ) );
 
     m_cancelButton = new KPushButton( SmallIcon( "cancel" ), TQString(), statusBar(), "CancelButton" );
@@ -454,7 +454,7 @@ void ArkStatusBarExtension::slotSetBusy( const TQString & text, bool showCancelB
     {
         m_pBusyText = new TQLabel( statusBar() );
 
-        m_pBusyText->tqsetAlignment( AlignLeft );
+        m_pBusyText->setAlignment( AlignLeft );
         m_pBusyText->setFrameStyle( TQFrame::Panel | TQFrame::Raised );
     }
 
diff --git a/ark/arkviewer.cpp b/ark/arkviewer.cpp
index b2ae335..ce0c18c 100644
--- a/ark/arkviewer.cpp
+++ b/ark/arkviewer.cpp
@@ -76,7 +76,7 @@ bool ArkViewer::view( const KURL& filename )
 
 	TQLabel *iconLabel = new TQLabel( header );
 	iconLabel->setPixmap( mimetype->pixmap( KIcon::Desktop ) );
-	iconLabel->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum );
+	iconLabel->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum );
 
 	TQVBox *headerRight = new TQVBox( header );
 	new TQLabel( TQString( "<qt><b>%1</b></qt>" )
@@ -84,7 +84,7 @@ bool ArkViewer::view( const KURL& filename )
 	          );
 	new TQLabel( mimetype->comment(), headerRight );
 
-	header->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Maximum );
+	header->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Maximum );
 
 	m_part = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( mimetype->name(), TQString(), m_widget, 0, TQT_TQOBJECT(this) );
 
diff --git a/ark/arkwidget.cpp b/ark/arkwidget.cpp
index a83cb14..5091bb3 100644
--- a/ark/arkwidget.cpp
+++ b/ark/arkwidget.cpp
@@ -354,7 +354,7 @@ ArkWidget::convertSlotCreateDone( bool success )
         // addFile( const TQString & baseDir,                 //
         //          const TQStringList & filesToAdd )         //
         //////////////////////////////////////////////////////
-        *it = TQString::tqfromLatin1( "file:" )+ m_convert_tmpDir->name() + *it;
+        *it = TQString::fromLatin1( "file:" )+ m_convert_tmpDir->name() + *it;
     }
     bool bOldRecVal = ArkSettings::rarRecurseSubdirs();
     connect( arch, TQT_SIGNAL( sigAdd( bool ) ), this, TQT_SLOT( convertSlotAddDone( bool ) ) );
diff --git a/ark/compressedfile.cpp b/ark/compressedfile.cpp
index f935eac..862d357 100644
--- a/ark/compressedfile.cpp
+++ b/ark/compressedfile.cpp
@@ -60,7 +60,7 @@ CompressedFile::CompressedFile( ArkWidget *_gui, const TQString & _fileName, con
   m_openAsMimeType = _openAsMimeType;
   kdDebug(1601) << "CompressedFile constructor" << endl;
   m_tempDirectory = new KTempDir( _gui->tmpDir()
-                          + TQString::tqfromLatin1( "compressed_file_temp" ) );
+                          + TQString::fromLatin1( "compressed_file_temp" ) );
   m_tempDirectory->setAutoDelete( true );
   m_tmpdir = m_tempDirectory->name();
   initData();
diff --git a/ark/extraction.ui b/ark/extraction.ui
index b51ebee..1ac60b8 100644
--- a/ark/extraction.ui
+++ b/ark/extraction.ui
@@ -66,7 +66,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/ark/extractiondialog.cpp b/ark/extractiondialog.cpp
index 923f108..905cfcb 100644
--- a/ark/extractiondialog.cpp
+++ b/ark/extractiondialog.cpp
@@ -73,7 +73,7 @@ ExtractionDialog::ExtractionDialog( TQWidget *parent, const char *name,
 
 	TQLabel *icon = new TQLabel( header );
 	icon->setPixmap( DesktopIcon( "ark_extract" ) );
-	icon->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum );
+	icon->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum );
 
 	if ( enableSelected )
 	{
@@ -96,7 +96,7 @@ ExtractionDialog::ExtractionDialog( TQWidget *parent, const char *name,
 	TQHBox *destDirBox = new TQHBox( vbox );
 
 	TQLabel *destFolderLabel = new TQLabel( i18n( "Destination folder: " ), destDirBox );
-	destFolderLabel->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed );
+	destFolderLabel->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed );
 
 	KHistoryCombo *combobox = new KHistoryCombo( true, destDirBox );
 	combobox->setPixmapProvider( new KURLPixmapProvider );
@@ -111,7 +111,7 @@ ExtractionDialog::ExtractionDialog( TQWidget *parent, const char *name,
 	combobox->setInsertionPolicy( TQComboBox::AtTop );
 
 	m_urlRequester = new KURLRequester( combobox, destDirBox );
-	m_urlRequester->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
+	m_urlRequester->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
 	m_urlRequester->setMode( KFile::Directory );
 
 	if (!defaultExtractionDir.prettyURL().isEmpty() )
diff --git a/ark/general.ui b/ark/general.ui
index 150e1e4..d849cfc 100644
--- a/ark/general.ui
+++ b/ark/general.ui
@@ -53,7 +53,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>15</width>
                             <height>31</height>
@@ -80,7 +80,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>90</height>
diff --git a/ark/mainwindow.cpp b/ark/mainwindow.cpp
index 8541e1a..005aa92 100644
--- a/ark/mainwindow.cpp
+++ b/ark/mainwindow.cpp
@@ -177,7 +177,7 @@ MainWindow::file_reload()
 void
 MainWindow::editToolbars()
 {
-    saveMainWindowSettings( KGlobal::config(), TQString::tqfromLatin1("MainWindow") );
+    saveMainWindowSettings( KGlobal::config(), TQString::fromLatin1("MainWindow") );
     KEditToolbar dlg( factory(), this );
     connect(&dlg, TQT_SIGNAL( newToolbarConfig() ), this, TQT_SLOT( slotNewToolbarConfig() ));
     dlg.exec();
@@ -187,7 +187,7 @@ void
 MainWindow::slotNewToolbarConfig()
 {
     createGUI( m_part );
-    applyMainWindowSettings( KGlobal::config(), TQString::tqfromLatin1("MainWindow") );
+    applyMainWindowSettings( KGlobal::config(), TQString::fromLatin1("MainWindow") );
 }
 
 void
diff --git a/ark/sevenzip.cpp b/ark/sevenzip.cpp
index 0673f6c..a85d127 100644
--- a/ark/sevenzip.cpp
+++ b/ark/sevenzip.cpp
@@ -285,7 +285,7 @@ bool SevenZipArch::processLine( const TQCString& _line )
                    TQString( "%1" )
                    .tqarg( ArkUtils::getMonth( columns[ m_repairMonth ].ascii() ) )
                    : columns[ m_fixMonth ];
-    TQString timestamp = TQString::tqfromLatin1( "%1-%2-%3 %4" )
+    TQString timestamp = TQString::fromLatin1( "%1-%2-%3 %4" )
                         .tqarg( year )
                         .tqarg( month )
                         .tqarg( columns[ m_fixDay ] )
diff --git a/ark/tar.cpp b/ark/tar.cpp
index e91f5ca..0a87d4e 100644
--- a/ark/tar.cpp
+++ b/ark/tar.cpp
@@ -106,12 +106,12 @@ TarArch::TarArch( ArkWidget *_gui,
     {
         compressed = true;
         m_tmpDir = new KTempDir( _gui->tmpDir()
-                                 + TQString::tqfromLatin1( "temp_tar" ) );
+                                 + TQString::fromLatin1( "temp_tar" ) );
         m_tmpDir->setAutoDelete( true );
         m_tmpDir->qDir()->cd( m_tmpDir->name() );
         // build the temp file name
         KTempFile *pTempFile = new KTempFile( m_tmpDir->name(),
-                TQString::tqfromLatin1(".tar") );
+                TQString::fromLatin1(".tar") );
 
         tmpfile = pTempFile->name();
         delete pTempFile;
diff --git a/ark/tarlistingthread.h b/ark/tarlistingthread.h
index 6dcdbe5..070b483 100644
--- a/ark/tarlistingthread.h
+++ b/ark/tarlistingthread.h
@@ -32,16 +32,16 @@ class KArchive;
 class ListingEvent: public TQCustomEvent
 {
 	public:
-		enum tqStatus { Normal, Error, ListingFinished };
-		ListingEvent( const TQStringList& data, tqStatus st = Normal )
+		enum Status { Normal, Error, ListingFinished };
+		ListingEvent( const TQStringList& data, Status st = Normal )
 			: TQCustomEvent( 65442 ), m_data( data ), m_status( st ) {}
 		
 		const TQStringList& columns() const { return m_data; }
-		tqStatus status() const { return m_status; }
+		Status status() const { return m_status; }
 		
 	private:
 		TQStringList m_data;
-		tqStatus      m_status;
+		Status      m_status;
 };
 
 class TarListingThread: public TQThread