Replaced various '#define' with actual strings - part 5

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 44e712a770ad0ab59d33790a80b5f6235cff6921)

8 files changed, 16 insertions, 16 deletions

diff --git a/tdeio/tdefile/kpropertiesdialog.cpp b/tdeio/tdefile/kpropertiesdialog.cpp
index 57e794d27..c478058b7 100644
--- a/tdeio/tdefile/kpropertiesdialog.cpp
+++ b/tdeio/tdefile/kpropertiesdialog.cpp
@@ -754,7 +754,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
   grid->setColStretch(1, 0);
   grid->setColStretch(2, 1);
   grid->addColSpacing(1, KDialog::spacingHint());
-  vbl->addLayout(TQT_TQLAYOUT(grid));
+  vbl->addLayout(grid);
   int curRow = 0;
 
   if ( !d->bMultiple )
@@ -1733,7 +1733,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr
 			   "sense for programs and scripts. It is required when you want to "
 			   "execute them."));
 
-    TQLayoutItem *spacer = TQT_TQLAYOUTITEM(new TQSpacerItem(0, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
+    TQLayoutItem *spacer = new TQSpacerItem(0, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding);
     gl->addMultiCell(spacer, 5, 5, 0, 1);
 
     pbAdvancedPerm = new TQPushButton(i18n("A&dvanced Permissions"), gb);
@@ -4002,7 +4002,7 @@ TDEApplicationPropsPlugin::TDEApplicationPropsPlugin( KPropertiesDialog *_props
 
   TQGridLayout *grid = new TQGridLayout(2, 2);
   grid->setColStretch(1, 1);
-  toplayout->addLayout(TQT_TQLAYOUT(grid));
+  toplayout->addLayout(grid);
 
   if ( d->m_kdesktopMode )
   {
@@ -4038,7 +4038,7 @@ TDEApplicationPropsPlugin::TDEApplicationPropsPlugin( KPropertiesDialog *_props
   grid->setColStretch(2, 1);
   grid->setRowStretch( 0, 1 );
   grid->setRowStretch( 3, 1 );
-  toplayout->addLayout(TQT_TQLAYOUT(grid), 2);
+  toplayout->addLayout(grid, 2);
 
   extensionsList = new TQListBox( d->m_frame );
   extensionsList->setSelectionMode( TQListBox::Extended );
diff --git a/tdeio/tdefile/tdefiledialog.cpp b/tdeio/tdefile/tdefiledialog.cpp
index bfe73cb5c..5150d18c1 100644
--- a/tdeio/tdefile/tdefiledialog.cpp
+++ b/tdeio/tdefile/tdefiledialog.cpp
@@ -1093,7 +1093,7 @@ void KFileDialog::initGUI()
 
     lafBox->setColStretch(1, 4);
 
-    vbox->addLayout(TQT_TQLAYOUT(lafBox), 0);
+    vbox->addLayout(lafBox, 0);
     vbox->addSpacing(3);
 
     // add the Automatically Select Extension checkbox
diff --git a/tdeio/tdeio/defaultprogress.cpp b/tdeio/tdeio/defaultprogress.cpp
index 7198a3fd5..77b1fc996 100644
--- a/tdeio/tdeio/defaultprogress.cpp
+++ b/tdeio/tdeio/defaultprogress.cpp
@@ -98,7 +98,7 @@ void DefaultProgress::init()
   topLayout->addStrut( 360 );   // makes dlg at least that wide
 
   TQGridLayout *grid = new TQGridLayout( 2, 3 );
-  topLayout->addLayout(TQT_TQLAYOUT(grid));
+  topLayout->addLayout(grid);
   grid->addColSpacing(1, KDialog::spacingHint());
   // filenames or action name
   grid->addWidget(new TQLabel(i18n("Source:"), this), 0, 0);
diff --git a/tdeio/tdeio/kar.cpp b/tdeio/tdeio/kar.cpp
index 07072d0c6..dd8716c5b 100644
--- a/tdeio/tdeio/kar.cpp
+++ b/tdeio/tdeio/kar.cpp
@@ -45,7 +45,7 @@ KAr::KAr( const TQString& filename )
     //kdDebug(7042) << "KAr(filename) reached." << endl;
     m_filename = filename;
     d = new KArPrivate;
-    setDevice( TQT_TQIODEVICE(new TQFile( filename )) );
+    setDevice( new TQFile( filename ) );
 }
 
 KAr::KAr( TQIODevice * dev )
diff --git a/tdeio/tdeio/kfilterdev.cpp b/tdeio/tdeio/kfilterdev.cpp
index bb9e90af1..4df335090 100644
--- a/tdeio/tdeio/kfilterdev.cpp
+++ b/tdeio/tdeio/kfilterdev.cpp
@@ -70,9 +70,9 @@ TQIODevice* KFilterDev::createFilterDevice(KFilterBase* base, TQFile* file)
 
    //we don't need a filter
    if (base==0)
-       return TQT_TQIODEVICE(new TQFile(file->name())); // A bit strange IMHO. We ask for a TQFile but we create another one !?! (DF)
+       return new TQFile(file->name()); // A bit strange IMHO. We ask for a TQFile but we create another one !?! (DF)
 
-   base->setDevice(TQT_TQIODEVICE(file));
+   base->setDevice(file);
    return new KFilterDev(base);
 }
 #endif
@@ -86,11 +86,11 @@ TQIODevice * KFilterDev::deviceForFile( const TQString & fileName, const TQStrin
                          : KFilterBase::findFilterByMimeType( mimetype );
     if ( base )
     {
-        base->setDevice(TQT_TQIODEVICE(f), true);
+        base->setDevice(f, true);
         return new KFilterDev(base, true);
     }
     if(!forceFilter)
-        return TQT_TQIODEVICE(f);
+        return f;
     else
     {
         delete f;
diff --git a/tdeio/tdeio/ktar.cpp b/tdeio/tdeio/ktar.cpp
index 058d328b7..74b47e69b 100644
--- a/tdeio/tdeio/ktar.cpp
+++ b/tdeio/tdeio/ktar.cpp
@@ -129,7 +129,7 @@ void KTar::prepareDevice( const TQString & filename,
                             const TQString & mimetype, bool /*forced*/ )
 {
   if( "application/x-tar" == mimetype )
-      setDevice( TQT_TQIODEVICE(new TQFile( filename )) );
+      setDevice( new TQFile( filename ) );
   else
   {
     // The compression filters are very slow with random access.
@@ -149,7 +149,7 @@ void KTar::prepareDevice( const TQString & filename,
     // the device must be closed, however, for KArchive.setDevice()
     TQFile* file = d->tmpFile->file();
     file->close();
-    setDevice(TQT_TQIODEVICE(file));
+    setDevice(file);
   }
 }
 
diff --git a/tdeio/tdeio/kzip.cpp b/tdeio/tdeio/kzip.cpp
index 91f36a085..159d5c20a 100644
--- a/tdeio/tdeio/kzip.cpp
+++ b/tdeio/tdeio/kzip.cpp
@@ -385,7 +385,7 @@ bool KZip::openArchive( int mode )
                 return false;
             }
             Q_ASSERT( d->m_saveFile->file() );
-            setDevice( TQT_TQIODEVICE(d->m_saveFile->file()) );
+            setDevice( d->m_saveFile->file() );
         }
         return true;
     case IO_ReadOnly:
@@ -393,7 +393,7 @@ bool KZip::openArchive( int mode )
     {
         // ReadWrite mode still uses TQFile for now; we'd need to copy to the tempfile, in fact.
         if ( !m_filename.isEmpty() ) {
-            setDevice( TQT_TQIODEVICE(new TQFile( m_filename )) );
+            setDevice( new TQFile( m_filename ) );
             if ( !device()->open( mode ) )
                 return false;
         }
diff --git a/tdeio/tdeio/renamedlg.cpp b/tdeio/tdeio/renamedlg.cpp
index 41d8851d9..9b1959110 100644
--- a/tdeio/tdeio/renamedlg.cpp
+++ b/tdeio/tdeio/renamedlg.cpp
@@ -223,7 +223,7 @@ RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption,
             // No plugin found, build default dialog
             TQGridLayout * gridLayout = new TQGridLayout( 0L, 9, 2, KDialog::marginHint(),
                                                         KDialog::spacingHint() );
-            pLayout->addLayout(TQT_TQLAYOUT(gridLayout));
+            pLayout->addLayout(gridLayout);
             gridLayout->setColStretch(0,0);
             gridLayout->setColStretch(1,10);