rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 13 insertions, 13 deletions

diff --git a/kdevdesigner/designer/pixmapchooser.cpp b/kdevdesigner/designer/pixmapchooser.cpp
index 6992bc77..1da0557b 100644
--- a/kdevdesigner/designer/pixmapchooser.cpp
+++ b/kdevdesigner/designer/pixmapchooser.cpp
@@ -56,8 +56,8 @@
 static ImageIconProvider *imageIconProvider = 0;
 #endif
 
-PixmapView::PixmapView( TQWidget *tqparent )
-    : TQScrollView( tqparent )
+PixmapView::PixmapView( TQWidget *parent )
+    : TQScrollView( parent )
 {
     viewport()->setBackgroundMode( PaletteBase );
 }
@@ -105,7 +105,7 @@ static void buildImageFormatList( TQString &filter, TQString &all )
     filter += tqApp->translate( "qChoosePixmap", "All Files (*)" );
 
 }
-TQStringList qChoosePixmaps( TQWidget *tqparent )
+TQStringList qChoosePixmaps( TQWidget *parent )
 {
 /*    if ( !imageIconProvider && !TQFileDialog::iconProvider() )
 	TQFileDialog::setIconProvider( ( imageIconProvider = new ImageIconProvider ) );
@@ -114,7 +114,7 @@ TQStringList qChoosePixmaps( TQWidget *tqparent )
     TQString all;
     buildImageFormatList( filter, all );
 
-    TQFileDialog fd( TQString(), filter, tqparent, 0, TRUE );
+    TQFileDialog fd( TQString(), filter, parent, 0, TRUE );
     fd.setMode( TQFileDialog::ExistingFiles );
     fd.setContentsPreviewEnabled( TRUE );
     PixmapView *pw = new PixmapView( &fd );
@@ -126,7 +126,7 @@ TQStringList qChoosePixmaps( TQWidget *tqparent )
 	return fd.selectedFiles();
     return TQStringList();*/
     TQStringList mimetypes = KImageIO::mimeTypes( KImageIO::Reading );
-    KFileDialog dlg(TQString(), mimetypes.join(" "), tqparent, "filedialog", true);
+    KFileDialog dlg(TQString(), mimetypes.join(" "), parent, "filedialog", true);
     dlg.setOperationMode( KFileDialog::Opening );
     dlg.setCaption( tqApp->translate( "qChoosePixmap", "Choose Images..." ) );
     dlg.setMode( KFile::Files );
@@ -137,7 +137,7 @@ TQStringList qChoosePixmaps( TQWidget *tqparent )
     return TQStringList();
 }
 
-TQPixmap qChoosePixmap( TQWidget *tqparent, FormWindow *fw, const TQPixmap &old, TQString *fn )
+TQPixmap qChoosePixmap( TQWidget *parent, FormWindow *fw, const TQPixmap &old, TQString *fn )
 {
 #if defined(DESIGNER)
     if ( !fw || fw->savePixmapInline() ) {
@@ -148,7 +148,7 @@ TQPixmap qChoosePixmap( TQWidget *tqparent, FormWindow *fw, const TQPixmap &old,
 	TQString all;
 	buildImageFormatList( filter, all );
 
-	TQFileDialog fd( TQString(), filter, tqparent, 0, TRUE );
+	TQFileDialog fd( TQString(), filter, parent, 0, TRUE );
 	fd.setContentsPreviewEnabled( TRUE );
 	PixmapView *pw = new PixmapView( &fd );
 	fd.setContentsPreview( pw, pw );
@@ -163,7 +163,7 @@ TQPixmap qChoosePixmap( TQWidget *tqparent, FormWindow *fw, const TQPixmap &old,
 	    return pix;
 	}*/
         TQStringList mimetypes = KImageIO::mimeTypes( KImageIO::Reading );
-        KFileDialog dlg(TQString(), mimetypes.join(" "), tqparent, "filedialog", true);
+        KFileDialog dlg(TQString(), mimetypes.join(" "), parent, "filedialog", true);
         dlg.setOperationMode( KFileDialog::Opening );
         dlg.setCaption( tqApp->translate( "qChoosePixmap", "Choose Pixmap" ) );
         dlg.setMode( KFile::File );
@@ -178,7 +178,7 @@ TQPixmap qChoosePixmap( TQWidget *tqparent, FormWindow *fw, const TQPixmap &old,
             return pix;
         }
     } else if ( fw && fw->savePixmapInProject() ) {
-	PixmapCollectionEditor dia( tqparent, 0, TRUE );
+	PixmapCollectionEditor dia( parent, 0, TRUE );
 	dia.setProject( fw->project() );
 	dia.setChooserMode( TRUE );
 	dia.setCurrentItem( MetaDataBase::pixmapKey( TQT_TQOBJECT(fw), old.serialNumber() ) );
@@ -188,7 +188,7 @@ TQPixmap qChoosePixmap( TQWidget *tqparent, FormWindow *fw, const TQPixmap &old,
 	    return pix;
 	}
     } else {
-	PixmapFunction dia( tqparent, 0, TRUE );
+	PixmapFunction dia( parent, 0, TRUE );
 	TQObject::connect( dia.helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) );
 	dia.labelFunction->setText( fw->pixmapLoaderFunction() + "(" );
 	dia.editArguments->setText( MetaDataBase::pixmapArgument( TQT_TQOBJECT(fw), old.serialNumber() ) );
@@ -203,15 +203,15 @@ TQPixmap qChoosePixmap( TQWidget *tqparent, FormWindow *fw, const TQPixmap &old,
 	}
     }
 #else
-    Q_UNUSED( tqparent );
+    Q_UNUSED( parent );
     Q_UNUSED( fw );
     Q_UNUSED( old );
 #endif
     return TQPixmap();
 }
 
-ImageIconProvider::ImageIconProvider( TQWidget *tqparent, const char *name )
-    : TQFileIconProvider( TQT_TQOBJECT(tqparent), name ), imagepm( BarIcon( "designer_image.png", KDevDesignerPartFactory::instance() ) )
+ImageIconProvider::ImageIconProvider( TQWidget *parent, const char *name )
+    : TQFileIconProvider( TQT_TQOBJECT(parent), name ), imagepm( BarIcon( "designer_image.png", KDevDesignerPartFactory::instance() ) )
 {
     fmts = TQImage::inputFormats();
 }