rename the following methods:

tqparent parent
tqmask mask


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

15 files changed, 41 insertions, 41 deletions

diff --git a/libkipi/libkipi/KDStream.cpp b/libkipi/libkipi/KDStream.cpp
index 3e32545..2f0d4af 100644
--- a/libkipi/libkipi/KDStream.cpp
+++ b/libkipi/libkipi/KDStream.cpp
@@ -673,7 +673,7 @@ KDStream& KDStream::operator<<( const TQPixmap& pixmap )
 {
     _output += TQString("TQPixmap[null=%1,width=%2,heigth=%3,depth=%4,hasMask=%5,hasAlpha=%6]")
                .tqarg(pixmap.isNull()).tqarg(pixmap.width()).tqarg(pixmap.height())
-               .tqarg(pixmap.depth()).tqarg(pixmap.tqmask() != 0).tqarg(pixmap.hasAlpha() );
+               .tqarg(pixmap.depth()).tqarg(pixmap.mask() != 0).tqarg(pixmap.hasAlpha() );
     return *this;
 }
 
diff --git a/libkipi/libkipi/batchprogressdialog.cpp b/libkipi/libkipi/batchprogressdialog.cpp
index 9ad9ad2..24314bf 100644
--- a/libkipi/libkipi/batchprogressdialog.cpp
+++ b/libkipi/libkipi/batchprogressdialog.cpp
@@ -72,8 +72,8 @@ namespace KIPI
 class BatchProgressItem : public KListViewItem
 {
 public:
-   BatchProgressItem(KListView * tqparent, TQListViewItem *after, const TQString &message, int messageType)
-                   : KListViewItem( tqparent, after), m_messagetype(messageType)
+   BatchProgressItem(KListView * parent, TQListViewItem *after, const TQString &message, int messageType)
+                   : KListViewItem( parent, after), m_messagetype(messageType)
    {
    // Set the icon.
 
@@ -135,8 +135,8 @@ struct BatchProgressDialog::Private {
 
 /////////////////////////////////// CONSTRUCTOR ////////////////////////////////////////////
 
-BatchProgressDialog::BatchProgressDialog( TQWidget *tqparent, const TQString &caption )
-                   : KDialogBase( tqparent, "KIPIBatchProgressDialog", true /* modal */,
+BatchProgressDialog::BatchProgressDialog( TQWidget *parent, const TQString &caption )
+                   : KDialogBase( parent, "KIPIBatchProgressDialog", true /* modal */,
                                   caption, Cancel)
 {
     d = new Private;
diff --git a/libkipi/libkipi/batchprogressdialog.h b/libkipi/libkipi/batchprogressdialog.h
index 031e79a..9e9b498 100644
--- a/libkipi/libkipi/batchprogressdialog.h
+++ b/libkipi/libkipi/batchprogressdialog.h
@@ -57,7 +57,7 @@ Q_OBJECT
 
  public:
 
-   BatchProgressDialog( TQWidget *tqparent=0, const TQString &caption=TQString() );
+   BatchProgressDialog( TQWidget *parent=0, const TQString &caption=TQString() );
    ~BatchProgressDialog();
 
    void addedAction(const TQString &text, int type);
diff --git a/libkipi/libkipi/imagecollectionselector.cpp b/libkipi/libkipi/imagecollectionselector.cpp
index e2c6d2b..5defa37 100644
--- a/libkipi/libkipi/imagecollectionselector.cpp
+++ b/libkipi/libkipi/imagecollectionselector.cpp
@@ -53,8 +53,8 @@ class ImageCollectionItem : public TQCheckListItem
 {
 public:
     ImageCollectionItem(ImageCollectionSelector* selector,
-                        TQListView * tqparent, ImageCollection collection)
-    : TQCheckListItem( tqparent, collection.name(), TQCheckListItem::CheckBox),
+                        TQListView * parent, ImageCollection collection)
+    : TQCheckListItem( parent, collection.name(), TQCheckListItem::CheckBox),
       _imageCollection(collection), _selector(selector)
     {}
 
@@ -83,8 +83,8 @@ struct ImageCollectionSelector::Private {
 };
 
 
-ImageCollectionSelector::ImageCollectionSelector(TQWidget* tqparent, Interface* interface, const char* name)
-                       : TQWidget(tqparent, name)
+ImageCollectionSelector::ImageCollectionSelector(TQWidget* parent, Interface* interface, const char* name)
+                       : TQWidget(parent, name)
 {
     d=new Private;
     d->_interface=interface;
diff --git a/libkipi/libkipi/imagecollectionselector.h b/libkipi/libkipi/imagecollectionselector.h
index 95fe29d..91c33b1 100644
--- a/libkipi/libkipi/imagecollectionselector.h
+++ b/libkipi/libkipi/imagecollectionselector.h
@@ -50,7 +50,7 @@ Q_OBJECT
 
 public:
     
-    ImageCollectionSelector(TQWidget* tqparent, Interface*, const char* name=0);
+    ImageCollectionSelector(TQWidget* parent, Interface*, const char* name=0);
     ~ImageCollectionSelector();
     
     TQValueList<ImageCollection> selectedImageCollections() const;
diff --git a/libkipi/libkipi/imagedialog.cpp b/libkipi/libkipi/imagedialog.cpp
index b075e85..e1a8ec9 100644
--- a/libkipi/libkipi/imagedialog.cpp
+++ b/libkipi/libkipi/imagedialog.cpp
@@ -57,8 +57,8 @@ namespace KIPI
 {
 
 struct AlbumLVI : public KListViewItem {
-    AlbumLVI(KListView* tqparent, const KIPI::ImageCollection& album)
-    : KListViewItem(tqparent, album.name())
+    AlbumLVI(KListView* parent, const KIPI::ImageCollection& album)
+    : KListViewItem(parent, album.name())
     , _album(album) {}
 
     const KIPI::ImageCollection& _album;
@@ -66,8 +66,8 @@ struct AlbumLVI : public KListViewItem {
 
 
 struct ImageLVI : public KListViewItem {
-    ImageLVI(KListView* tqparent, const KURL& url)
-    : KListViewItem(tqparent, url.fileName()), _url(url) {}
+    ImageLVI(KListView* parent, const KURL& url)
+    : KListViewItem(parent, url.fileName()), _url(url) {}
 
     KURL _url;
 };
@@ -85,10 +85,10 @@ struct ImageDialog::Private {
 };
 
 
-ImageDialog::ImageDialog(TQWidget* tqparent, KIPI::Interface* interface,
+ImageDialog::ImageDialog(TQWidget* parent, KIPI::Interface* interface,
                          bool singleSelection)
            : KDialogBase(KDialogBase::Plain, i18n("Select Image From Album"), Help|Ok|Cancel,
-                         Ok, tqparent, "album-dialog", true, true)                         
+                         Ok, parent, "album-dialog", true, true)                         
 {
     d = new Private;
     d->_interface=interface;
@@ -198,8 +198,8 @@ KURL::List ImageDialog::urls() const
     return d->_urls;    
 }
 
-KURL ImageDialog::getImageURL(TQWidget* tqparent, KIPI::Interface* interface) {
-    ImageDialog dlg(tqparent, interface, true);
+KURL ImageDialog::getImageURL(TQWidget* parent, KIPI::Interface* interface) {
+    ImageDialog dlg(parent, interface, true);
     if (dlg.exec() == TQDialog::Accepted) {
         return dlg.url();
     } else {
@@ -207,9 +207,9 @@ KURL ImageDialog::getImageURL(TQWidget* tqparent, KIPI::Interface* interface) {
     }
 }
 
-KURL::List ImageDialog::getImageURLs(TQWidget* tqparent, Interface* interface)
+KURL::List ImageDialog::getImageURLs(TQWidget* parent, Interface* interface)
 {
-    ImageDialog dlg(tqparent, interface, false);
+    ImageDialog dlg(parent, interface, false);
     if (dlg.exec() == TQDialog::Accepted)
         return dlg.urls();
     else
diff --git a/libkipi/libkipi/interface.cpp b/libkipi/libkipi/interface.cpp
index bc6a422..e781b23 100644
--- a/libkipi/libkipi/interface.cpp
+++ b/libkipi/libkipi/interface.cpp
@@ -95,8 +95,8 @@
 */
 
 
-KIPI::Interface::Interface(TQObject *tqparent, const char *name )
-    : TQObject(tqparent, name)
+KIPI::Interface::Interface(TQObject *parent, const char *name )
+    : TQObject(parent, name)
 {
 }
 
diff --git a/libkipi/libkipi/interface.h b/libkipi/libkipi/interface.h
index a33f31d..bd1a634 100644
--- a/libkipi/libkipi/interface.h
+++ b/libkipi/libkipi/interface.h
@@ -62,7 +62,7 @@ namespace KIPI
   TQ_OBJECT
 
     public:
-        Interface(TQObject *tqparent, const char *name=0);
+        Interface(TQObject *parent, const char *name=0);
         virtual ~Interface();
 
         virtual ImageCollection currentAlbum() = 0;
diff --git a/libkipi/libkipi/mainpage.cpp b/libkipi/libkipi/mainpage.cpp
index ebe37b8..0347fc7 100644
--- a/libkipi/libkipi/mainpage.cpp
+++ b/libkipi/libkipi/mainpage.cpp
@@ -48,7 +48,7 @@
    application.
 
    The origin of all your communication with the host application is
-   \ref KIPI::Interface. You obtain a pointer to this by casting the tqparent
+   \ref KIPI::Interface. You obtain a pointer to this by casting the parent
    pointer given to your plugin during construction.
 
    Selection of images can be obtained using
diff --git a/libkipi/libkipi/plugin.cpp b/libkipi/libkipi/plugin.cpp
index ac0b11f..2b79c5e 100644
--- a/libkipi/libkipi/plugin.cpp
+++ b/libkipi/libkipi/plugin.cpp
@@ -43,8 +43,8 @@ struct KIPI::Plugin::Private {
 };
 
 
-KIPI::Plugin::Plugin( KInstance* instance, TQObject *tqparent, const char* name)
-            : TQObject( tqparent, name)
+KIPI::Plugin::Plugin( KInstance* instance, TQObject *parent, const char* name)
+            : TQObject( parent, name)
 {
     d=new Private;
     d->m_instance=instance;
diff --git a/libkipi/libkipi/plugin.h b/libkipi/libkipi/plugin.h
index bd9ba68..272ad4c 100644
--- a/libkipi/libkipi/plugin.h
+++ b/libkipi/libkipi/plugin.h
@@ -56,12 +56,12 @@ namespace KIPI
     class LIBKIPI_EXPORT Plugin : public TQObject
     {
     public:
-        Plugin( KInstance* instance, TQObject *tqparent, const char* name);
+        Plugin( KInstance* instance, TQObject *parent, const char* name);
         virtual ~Plugin();
 
         virtual void setup( TQWidget* widget ) = 0;
-        KActionPtrList actions( TQWidget* tqparent = 0 );
-        KActionCollection* actionCollection( TQWidget* tqparent = 0 );
+        KActionPtrList actions( TQWidget* parent = 0 );
+        KActionCollection* actionCollection( TQWidget* parent = 0 );
         virtual Category category( KAction* action ) const = 0;
 
     protected:
diff --git a/libkipi/libkipi/pluginloader.cpp b/libkipi/libkipi/pluginloader.cpp
index ef32b8c..aeda046 100644
--- a/libkipi/libkipi/pluginloader.cpp
+++ b/libkipi/libkipi/pluginloader.cpp
@@ -306,17 +306,17 @@ PluginLoader* PluginLoader::instance()
 // ConfigWidget
 //
 //---------------------------------------------------------------------
-ConfigWidget* PluginLoader::configWidget( TQWidget* tqparent )
+ConfigWidget* PluginLoader::configWidget( TQWidget* parent )
 {
-    return new ConfigWidget( tqparent );
+    return new ConfigWidget( parent );
 }
 
 
 class PluginCheckBox :public TQCheckBox
 {
 public:
-    PluginCheckBox( PluginLoader::Info* info, TQWidget* tqparent )
-        : TQCheckBox( info->comment(), tqparent ), info( info )
+    PluginCheckBox( PluginLoader::Info* info, TQWidget* parent )
+        : TQCheckBox( info->comment(), parent ), info( info )
         {
             setChecked( info->shouldLoad() );
         }
@@ -330,8 +330,8 @@ struct ConfigWidget::Private
 };
 
 
-ConfigWidget::ConfigWidget( TQWidget* tqparent )
-    :TQScrollView( tqparent, "KIPI::PluginLoader::ConfigWidget" )
+ConfigWidget::ConfigWidget( TQWidget* parent )
+    :TQScrollView( parent, "KIPI::PluginLoader::ConfigWidget" )
 {
     d=new Private;
     TQWidget* top = new TQWidget( viewport() );
diff --git a/libkipi/libkipi/pluginloader.h b/libkipi/libkipi/pluginloader.h
index 8f3dd96..69eb3c5 100644
--- a/libkipi/libkipi/pluginloader.h
+++ b/libkipi/libkipi/pluginloader.h
@@ -65,7 +65,7 @@ namespace KIPI
         virtual ~PluginLoader();
         void loadPlugins();
         static PluginLoader* instance();
-        ConfigWidget* configWidget( TQWidget* tqparent );
+        ConfigWidget* configWidget( TQWidget* parent );
 
         typedef TQValueList<Info*> PluginList;
 
@@ -91,7 +91,7 @@ namespace KIPI
         Q_OBJECT
   TQ_OBJECT
     public:
-        ConfigWidget( TQWidget* tqparent );
+        ConfigWidget( TQWidget* parent );
 		~ConfigWidget();
     public slots:
         void apply();
diff --git a/libkipi/libkipi/uploadwidget.cpp b/libkipi/libkipi/uploadwidget.cpp
index c97d5bc..af96501 100644
--- a/libkipi/libkipi/uploadwidget.cpp
+++ b/libkipi/libkipi/uploadwidget.cpp
@@ -61,8 +61,8 @@ struct KIPI::UploadWidget::Private
   This widget is used to specify an upload directory for new images.
 */
 
-KIPI::UploadWidget::UploadWidget( KIPI::Interface* interface, TQWidget* tqparent, const char* name )
-                  : TQWidget( tqparent, name )
+KIPI::UploadWidget::UploadWidget( KIPI::Interface* interface, TQWidget* parent, const char* name )
+                  : TQWidget( parent, name )
 {
     d = new Private;
 
diff --git a/libkipi/libkipi/uploadwidget.h b/libkipi/libkipi/uploadwidget.h
index 283ab7c..dc956d4 100644
--- a/libkipi/libkipi/uploadwidget.h
+++ b/libkipi/libkipi/uploadwidget.h
@@ -48,7 +48,7 @@ namespace KIPI
   TQ_OBJECT
 
     public:
-        UploadWidget( KIPI::Interface* interface, TQWidget* tqparent, const char* name = 0 );
+        UploadWidget( KIPI::Interface* interface, TQWidget* parent, const char* name = 0 );
         ~UploadWidget();
         KURL path() const;