diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
| commit | ea3848d71d9559414d14d0a8b8bb1ebb684f46c2 (patch) | |
| tree | 859d20a007be94df4bf0b78cdf3720bfee903892 | |
| parent | 94ec53c96c3d5dc4a427e7dc4bbaa863add5cfa4 (diff) | |
| download | kipi-plugins-ea3848d71d9559414d14d0a8b8bb1ebb684f46c2.tar.gz kipi-plugins-ea3848d71d9559414d14d0a8b8bb1ebb684f46c2.zip | |
rename the following methods:
tqparent parent
tqmask mask
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/libraries/kipi-plugins@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
306 files changed, 790 insertions, 790 deletions
diff --git a/kipi-plugins/acquireimages/acquireimagedialog.cpp b/kipi-plugins/acquireimages/acquireimagedialog.cpp index a8529e6..eff0872 100644 --- a/kipi-plugins/acquireimages/acquireimagedialog.cpp +++ b/kipi-plugins/acquireimages/acquireimagedialog.cpp @@ -101,9 +101,9 @@ namespace KIPIAcquireImagesPlugin #define NETACCESS_WIDGET #endif -AcquireImageDialog::AcquireImageDialog( KIPI::Interface* interface, TQWidget *tqparent, const TQImage &img) +AcquireImageDialog::AcquireImageDialog( KIPI::Interface* interface, TQWidget *parent, const TQImage &img) : KDialogBase( IconList, i18n("Save Target Image Options"), Help|Ok|Cancel, - Ok, tqparent, "AcquireImageDialog", true, false ), m_interface( interface ) + Ok, parent, "AcquireImageDialog", true, false ), m_interface( interface ) { KImageIO::registerFormats(); m_qimageScanned = img; diff --git a/kipi-plugins/acquireimages/acquireimagedialog.h b/kipi-plugins/acquireimages/acquireimagedialog.h index dce0c49..3f64d37 100644 --- a/kipi-plugins/acquireimages/acquireimagedialog.h +++ b/kipi-plugins/acquireimages/acquireimagedialog.h @@ -68,7 +68,7 @@ class AcquireImageDialog : public KDialogBase public: - AcquireImageDialog( KIPI::Interface* interface, TQWidget *tqparent=0, const TQImage &img=0); + AcquireImageDialog( KIPI::Interface* interface, TQWidget *parent=0, const TQImage &img=0); ~AcquireImageDialog(); private slots: diff --git a/kipi-plugins/acquireimages/plugin_acquireimages.cpp b/kipi-plugins/acquireimages/plugin_acquireimages.cpp index 015367b..1157965 100644 --- a/kipi-plugins/acquireimages/plugin_acquireimages.cpp +++ b/kipi-plugins/acquireimages/plugin_acquireimages.cpp @@ -52,8 +52,8 @@ typedef KGenericFactory<Plugin_AcquireImages> Factory; K_EXPORT_COMPONENT_FACTORY( kipiplugin_acquireimages, Factory("kipiplugin_acquireimages")) -Plugin_AcquireImages::Plugin_AcquireImages(TQObject *tqparent, const char*, const TQStringList&) - : KIPI::Plugin( Factory::instance(), tqparent, "AcquireImages") +Plugin_AcquireImages::Plugin_AcquireImages(TQObject *parent, const char*, const TQStringList&) + : KIPI::Plugin( Factory::instance(), parent, "AcquireImages") { kdDebug( 51001 ) << "Plugin_AcquireImages plugin loaded" << endl; } @@ -88,7 +88,7 @@ Plugin_AcquireImages::~Plugin_AcquireImages() void Plugin_AcquireImages::slotActivate() { - KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>( tqparent() ); + KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>( parent() ); if ( !interface ) { @@ -144,7 +144,7 @@ void Plugin_AcquireImages::slotAcquireImageDone(const TQImage &img) return; } - KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>( tqparent() ); + KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>( parent() ); if ( !interface ) { diff --git a/kipi-plugins/acquireimages/plugin_acquireimages.h b/kipi-plugins/acquireimages/plugin_acquireimages.h index 23be39d..5d84545 100644 --- a/kipi-plugins/acquireimages/plugin_acquireimages.h +++ b/kipi-plugins/acquireimages/plugin_acquireimages.h @@ -40,7 +40,7 @@ class Plugin_AcquireImages : public KIPI::Plugin public: - Plugin_AcquireImages(TQObject *tqparent, const char* name, const TQStringList &args); + Plugin_AcquireImages(TQObject *parent, const char* name, const TQStringList &args); virtual ~Plugin_AcquireImages(); virtual KIPI::Category category( KAction* action ) const; virtual void setup( TQWidget* widget ); diff --git a/kipi-plugins/acquireimages/screenshotdialog.cpp b/kipi-plugins/acquireimages/screenshotdialog.cpp index 780d17b..4e47f1a 100644 --- a/kipi-plugins/acquireimages/screenshotdialog.cpp +++ b/kipi-plugins/acquireimages/screenshotdialog.cpp @@ -67,8 +67,8 @@ extern "C" namespace KIPIAcquireImagesPlugin { -ScreenGrabDialog::ScreenGrabDialog( KIPI::Interface* interface, TQWidget *tqparent, const char *name) - : KDialogBase(tqparent, name, false, i18n("Screenshot"), +ScreenGrabDialog::ScreenGrabDialog( KIPI::Interface* interface, TQWidget *parent, const char *name) + : KDialogBase(parent, name, false, i18n("Screenshot"), Help|User1|Close, Close, false, i18n("&New Snapshot")), m_interface( interface ) { @@ -238,11 +238,11 @@ void ScreenGrabDialog::slotPerformGrab() { Window root; Window child; - uint tqmask; + uint mask; int rootX, rootY, winX, winY; XQueryPointer( qt_xdisplay(), qt_xrootwin(), &root, &child, &rootX, &rootY, &winX, &winY, - &tqmask); + &mask); int x, y; unsigned int w, h; diff --git a/kipi-plugins/acquireimages/screenshotdialog.h b/kipi-plugins/acquireimages/screenshotdialog.h index 1045ad6..0a2858e 100644 --- a/kipi-plugins/acquireimages/screenshotdialog.h +++ b/kipi-plugins/acquireimages/screenshotdialog.h @@ -68,7 +68,7 @@ class ScreenGrabDialog : public KDialogBase public: ScreenGrabDialog( KIPI::Interface* interface, - TQWidget *tqparent=0, const char *name=0); + TQWidget *parent=0, const char *name=0); ~ScreenGrabDialog(); private slots: diff --git a/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp b/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp index e47f85b..cadcbf2 100644 --- a/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp +++ b/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp @@ -97,9 +97,9 @@ namespace KIPIBatchProcessImagesPlugin { BatchProcessImagesDialog::BatchProcessImagesDialog( KURL::List urlList, KIPI::Interface* interface, - TQString caption, TQWidget *tqparent ) + TQString caption, TQWidget *parent ) : KDialogBase( KDialogBase::Plain, caption, Help|User1|Cancel, - Cancel, tqparent, "BatchProcessImagesDialog", false, false, i18n("&Start")), + Cancel, parent, "BatchProcessImagesDialog", false, false, i18n("&Start")), m_selectedImageFiles( urlList), m_interface( interface ) { // Init. Tmp folder diff --git a/kipi-plugins/batchprocessimages/batchprocessimagesdialog.h b/kipi-plugins/batchprocessimages/batchprocessimagesdialog.h index 3ae68e1..a606d1b 100644 --- a/kipi-plugins/batchprocessimages/batchprocessimagesdialog.h +++ b/kipi-plugins/batchprocessimages/batchprocessimagesdialog.h @@ -83,7 +83,7 @@ Q_OBJECT // Don't forget to add the 'm_Type' and 'm_labelType' implementation in the constructor of // tqchildren dialog class. - BatchProcessImagesDialog( KURL::List urlList, KIPI::Interface* interface, TQString caption, TQWidget *tqparent=0 ); + BatchProcessImagesDialog( KURL::List urlList, KIPI::Interface* interface, TQString caption, TQWidget *parent=0 ); ~BatchProcessImagesDialog(); protected slots: diff --git a/kipi-plugins/batchprocessimages/batchprocessimagesitem.cpp b/kipi-plugins/batchprocessimages/batchprocessimagesitem.cpp index 4adea96..6d69155 100644 --- a/kipi-plugins/batchprocessimages/batchprocessimagesitem.cpp +++ b/kipi-plugins/batchprocessimages/batchprocessimagesitem.cpp @@ -36,9 +36,9 @@ namespace KIPIBatchProcessImagesPlugin { -BatchProcessImagesItem::BatchProcessImagesItem(TQListView * tqparent, TQString const & pathSrc, +BatchProcessImagesItem::BatchProcessImagesItem(TQListView * parent, TQString const & pathSrc, TQString const & nameSrc, TQString const & nameDest, TQString const & result) - : KListViewItem( tqparent, "", nameSrc, nameDest, result), + : KListViewItem( parent, "", nameSrc, nameDest, result), _pathSrc(pathSrc), _nameSrc(nameSrc), _nameDest(nameDest), _result(result), _overwrote( false ), _reverseSort( false ) diff --git a/kipi-plugins/batchprocessimages/batchprocessimagesitem.h b/kipi-plugins/batchprocessimages/batchprocessimagesitem.h index d9b6de7..60b12c4 100644 --- a/kipi-plugins/batchprocessimages/batchprocessimagesitem.h +++ b/kipi-plugins/batchprocessimages/batchprocessimagesitem.h @@ -42,7 +42,7 @@ class BatchProcessImagesItem : public KListViewItem { public: - BatchProcessImagesItem(TQListView * tqparent, TQString const & pathSrc, TQString const & nameSrc, + BatchProcessImagesItem(TQListView * parent, TQString const & pathSrc, TQString const & nameSrc, TQString const & nameDest, TQString const & result); ~BatchProcessImagesItem(); diff --git a/kipi-plugins/batchprocessimages/batchprocessimageslist.cpp b/kipi-plugins/batchprocessimages/batchprocessimageslist.cpp index aa2ad34..c187b45 100644 --- a/kipi-plugins/batchprocessimages/batchprocessimageslist.cpp +++ b/kipi-plugins/batchprocessimages/batchprocessimageslist.cpp @@ -41,8 +41,8 @@ namespace KIPIBatchProcessImagesPlugin { -BatchProcessImagesList::BatchProcessImagesList(TQWidget *tqparent, const char *name) - : KListView(tqparent, name) +BatchProcessImagesList::BatchProcessImagesList(TQWidget *parent, const char *name) + : KListView(parent, name) { setAcceptDrops(true); setDropVisualizer(false); diff --git a/kipi-plugins/batchprocessimages/batchprocessimageslist.h b/kipi-plugins/batchprocessimages/batchprocessimageslist.h index 95359e2..6c4cab8 100644 --- a/kipi-plugins/batchprocessimages/batchprocessimageslist.h +++ b/kipi-plugins/batchprocessimages/batchprocessimageslist.h @@ -40,7 +40,7 @@ Q_OBJECT TQ_OBJECT public: - BatchProcessImagesList(TQWidget *tqparent=0, const char *name=0); + BatchProcessImagesList(TQWidget *parent=0, const char *name=0); signals: void addedDropItems(TQStringList filesPath); diff --git a/kipi-plugins/batchprocessimages/borderimagesdialog.cpp b/kipi-plugins/batchprocessimages/borderimagesdialog.cpp index 94c7063..0cc6625 100644 --- a/kipi-plugins/batchprocessimages/borderimagesdialog.cpp +++ b/kipi-plugins/batchprocessimages/borderimagesdialog.cpp @@ -55,8 +55,8 @@ namespace KIPIBatchProcessImagesPlugin { -BorderImagesDialog::BorderImagesDialog( KURL::List urlList, KIPI::Interface* interface, TQWidget *tqparent ) - : BatchProcessImagesDialog( urlList, interface, i18n("Batch-Bordering Images"), tqparent ) +BorderImagesDialog::BorderImagesDialog( KURL::List urlList, KIPI::Interface* interface, TQWidget *parent ) + : BatchProcessImagesDialog( urlList, interface, i18n("Batch-Bordering Images"), parent ) { // About data and help button. diff --git a/kipi-plugins/batchprocessimages/borderimagesdialog.h b/kipi-plugins/batchprocessimages/borderimagesdialog.h index a73cbeb..4dacfc7 100644 --- a/kipi-plugins/batchprocessimages/borderimagesdialog.h +++ b/kipi-plugins/batchprocessimages/borderimagesdialog.h @@ -40,7 +40,7 @@ Q_OBJECT public: - BorderImagesDialog( KURL::List images, KIPI::Interface* interface, TQWidget *tqparent=0 ); + BorderImagesDialog( KURL::List images, KIPI::Interface* interface, TQWidget *parent=0 ); ~BorderImagesDialog(); private slots: diff --git a/kipi-plugins/batchprocessimages/borderoptionsdialog.cpp b/kipi-plugins/batchprocessimages/borderoptionsdialog.cpp index 70dcfbd..f9d4f19 100644 --- a/kipi-plugins/batchprocessimages/borderoptionsdialog.cpp +++ b/kipi-plugins/batchprocessimages/borderoptionsdialog.cpp @@ -47,8 +47,8 @@ namespace KIPIBatchProcessImagesPlugin { -BorderOptionsDialog::BorderOptionsDialog(TQWidget *tqparent, int BorderType) - : KDialogBase( tqparent, "BorderOptionsDialog", true, +BorderOptionsDialog::BorderOptionsDialog(TQWidget *parent, int BorderType) + : KDialogBase( parent, "BorderOptionsDialog", true, i18n("Border Options"), Ok|Cancel, Ok, false) { TQWidget* box = new TQWidget( this ); diff --git a/kipi-plugins/batchprocessimages/borderoptionsdialog.h b/kipi-plugins/batchprocessimages/borderoptionsdialog.h index 68b1d49..a1d17af 100644 --- a/kipi-plugins/batchprocessimages/borderoptionsdialog.h +++ b/kipi-plugins/batchprocessimages/borderoptionsdialog.h @@ -39,7 +39,7 @@ Q_OBJECT TQ_OBJECT public: - BorderOptionsDialog(TQWidget *tqparent=0, int BorderType = 0); + BorderOptionsDialog(TQWidget *parent=0, int BorderType = 0); ~BorderOptionsDialog(); KIntNumInput *m_solidBorderWidth; diff --git a/kipi-plugins/batchprocessimages/colorimagesdialog.cpp b/kipi-plugins/batchprocessimages/colorimagesdialog.cpp index 18821b9..3b3ad6a 100644 --- a/kipi-plugins/batchprocessimages/colorimagesdialog.cpp +++ b/kipi-plugins/batchprocessimages/colorimagesdialog.cpp @@ -54,8 +54,8 @@ namespace KIPIBatchProcessImagesPlugin { -ColorImagesDialog::ColorImagesDialog( KURL::List urlList, KIPI::Interface* interface, TQWidget *tqparent ) - : BatchProcessImagesDialog( urlList, interface, i18n("Batch Image-Color Processing"), tqparent ) +ColorImagesDialog::ColorImagesDialog( KURL::List urlList, KIPI::Interface* interface, TQWidget *parent ) + : BatchProcessImagesDialog( urlList, interface, i18n("Batch Image-Color Processing"), parent ) { // About data and help button. diff --git a/kipi-plugins/batchprocessimages/colorimagesdialog.h b/kipi-plugins/batchprocessimages/colorimagesdialog.h index 132d8b4..8925782 100644 --- a/kipi-plugins/batchprocessimages/colorimagesdialog.h +++ b/kipi-plugins/batchprocessimages/colorimagesdialog.h @@ -41,7 +41,7 @@ Q_OBJECT public: - ColorImagesDialog( KURL::List images, KIPI::Interface* interface, TQWidget *tqparent=0 ); + ColorImagesDialog( KURL::List images, KIPI::Interface* interface, TQWidget *parent=0 ); ~ColorImagesDialog(); private slots: diff --git a/kipi-plugins/batchprocessimages/coloroptionsdialog.cpp b/kipi-plugins/batchprocessimages/coloroptionsdialog.cpp index 6014b76..832b1b8 100644 --- a/kipi-plugins/batchprocessimages/coloroptionsdialog.cpp +++ b/kipi-plugins/batchprocessimages/coloroptionsdialog.cpp @@ -47,8 +47,8 @@ namespace KIPIBatchProcessImagesPlugin { -ColorOptionsDialog::ColorOptionsDialog(TQWidget *tqparent, int ColorType) - : KDialogBase( tqparent, "ColorOptionsDialog", true, +ColorOptionsDialog::ColorOptionsDialog(TQWidget *parent, int ColorType) + : KDialogBase( parent, "ColorOptionsDialog", true, i18n("Color Options"), Ok|Cancel, Ok, false) { TQWidget* box = new TQWidget( this ); diff --git a/kipi-plugins/batchprocessimages/coloroptionsdialog.h b/kipi-plugins/batchprocessimages/coloroptionsdialog.h index a8b3f20..14dba45 100644 --- a/kipi-plugins/batchprocessimages/coloroptionsdialog.h +++ b/kipi-plugins/batchprocessimages/coloroptionsdialog.h @@ -44,7 +44,7 @@ Q_OBJECT TQ_OBJECT public: - ColorOptionsDialog(TQWidget *tqparent=0, int ColorType = 0); + ColorOptionsDialog(TQWidget *parent=0, int ColorType = 0); ~ColorOptionsDialog(); TQComboBox *m_depthValue; diff --git a/kipi-plugins/batchprocessimages/convertimagesdialog.cpp b/kipi-plugins/batchprocessimages/convertimagesdialog.cpp index a4be7b6..4b953c6 100644 --- a/kipi-plugins/batchprocessimages/convertimagesdialog.cpp +++ b/kipi-plugins/batchprocessimages/convertimagesdialog.cpp @@ -60,8 +60,8 @@ namespace KIPIBatchProcessImagesPlugin { -ConvertImagesDialog::ConvertImagesDialog( KURL::List urlList, KIPI::Interface* interface, TQWidget *tqparent ) - : BatchProcessImagesDialog( urlList, interface, i18n("Batch Convert Images"), tqparent ) +ConvertImagesDialog::ConvertImagesDialog( KURL::List urlList, KIPI::Interface* interface, TQWidget *parent ) + : BatchProcessImagesDialog( urlList, interface, i18n("Batch Convert Images"), parent ) { // About data and help button. diff --git a/kipi-plugins/batchprocessimages/convertimagesdialog.h b/kipi-plugins/batchprocessimages/convertimagesdialog.h index 9907680..042b307 100644 --- a/kipi-plugins/batchprocessimages/convertimagesdialog.h +++ b/kipi-plugins/batchprocessimages/convertimagesdialog.h @@ -41,7 +41,7 @@ Q_OBJECT public: - ConvertImagesDialog( KURL::List images, KIPI::Interface* interface, TQWidget *tqparent=0 ); + ConvertImagesDialog( KURL::List images, KIPI::Interface* interface, TQWidget *parent=0 ); ~ConvertImagesDialog(); private slots: diff --git a/kipi-plugins/batchprocessimages/convertoptionsdialog.cpp b/kipi-plugins/batchprocessimages/convertoptionsdialog.cpp index 33eae6a..395bba2 100644 --- a/kipi-plugins/batchprocessimages/convertoptionsdialog.cpp +++ b/kipi-plugins/batchprocessimages/convertoptionsdialog.cpp @@ -45,8 +45,8 @@ namespace KIPIBatchProcessImagesPlugin { -ConvertOptionsDialog::ConvertOptionsDialog(TQWidget *tqparent, int ImageFormatType) - : KDialogBase( tqparent, "ConvertOptionsDialog", true, +ConvertOptionsDialog::ConvertOptionsDialog(TQWidget *parent, int ImageFormatType) + : KDialogBase( parent, "ConvertOptionsDialog", true, i18n("Image File Format Options"), Ok|Cancel, Ok, false) { TQWidget* box = new TQWidget( this ); diff --git a/kipi-plugins/batchprocessimages/convertoptionsdialog.h b/kipi-plugins/batchprocessimages/convertoptionsdialog.h index c6d9f57..59827e2 100644 --- a/kipi-plugins/batchprocessimages/convertoptionsdialog.h +++ b/kipi-plugins/batchprocessimages/convertoptionsdialog.h @@ -46,7 +46,7 @@ Q_OBJECT TQ_OBJECT public: - ConvertOptionsDialog(TQWidget *tqparent=0, int ImageFormatType = 0); + ConvertOptionsDialog(TQWidget *parent=0, int ImageFormatType = 0); ~ConvertOptionsDialog(); TQLabel *m_label_imageCompression; diff --git a/kipi-plugins/batchprocessimages/effectimagesdialog.cpp b/kipi-plugins/batchprocessimages/effectimagesdialog.cpp index f75f7e7..b4efb34 100644 --- a/kipi-plugins/batchprocessimages/effectimagesdialog.cpp +++ b/kipi-plugins/batchprocessimages/effectimagesdialog.cpp @@ -54,8 +54,8 @@ namespace KIPIBatchProcessImagesPlugin { -EffectImagesDialog::EffectImagesDialog( KURL::List urlList, KIPI::Interface* interface, TQWidget *tqparent ) - : BatchProcessImagesDialog( urlList, interface, i18n("Batch Image Effects"), tqparent ) +EffectImagesDialog::EffectImagesDialog( KURL::List urlList, KIPI::Interface* interface, TQWidget *parent ) + : BatchProcessImagesDialog( urlList, interface, i18n("Batch Image Effects"), parent ) { // About data and help button. diff --git a/kipi-plugins/batchprocessimages/effectimagesdialog.h b/kipi-plugins/batchprocessimages/effectimagesdialog.h index 51e6da9..fe3729b 100644 --- a/kipi-plugins/batchprocessimages/effectimagesdialog.h +++ b/kipi-plugins/batchprocessimages/effectimagesdialog.h @@ -40,7 +40,7 @@ Q_OBJECT public: - EffectImagesDialog( KURL::List images, KIPI::Interface* interface, TQWidget *tqparent=0 ); + EffectImagesDialog( KURL::List images, KIPI::Interface* interface, TQWidget *parent=0 ); ~EffectImagesDialog(); private slots: diff --git a/kipi-plugins/batchprocessimages/effectoptionsdialog.cpp b/kipi-plugins/batchprocessimages/effectoptionsdialog.cpp index b50d08e..745d3f8 100644 --- a/kipi-plugins/batchprocessimages/effectoptionsdialog.cpp +++ b/kipi-plugins/batchprocessimages/effectoptionsdialog.cpp @@ -46,8 +46,8 @@ namespace KIPIBatchProcessImagesPlugin { -EffectOptionsDialog::EffectOptionsDialog(TQWidget *tqparent, int EffectType) - : KDialogBase( tqparent, "EffectOptionsDialog", true, +EffectOptionsDialog::EffectOptionsDialog(TQWidget *parent, int EffectType) + : KDialogBase( parent, "EffectOptionsDialog", true, i18n("Effect Options"), Ok|Cancel, Ok, false) { TQWidget* box = new TQWidget( this ); diff --git a/kipi-plugins/batchprocessimages/effectoptionsdialog.h b/kipi-plugins/batchprocessimages/effectoptionsdialog.h index ece7b16..6435ea1 100644 --- a/kipi-plugins/batchprocessimages/effectoptionsdialog.h +++ b/kipi-plugins/batchprocessimages/effectoptionsdialog.h @@ -42,7 +42,7 @@ Q_OBJECT TQ_OBJECT public: - EffectOptionsDialog(TQWidget *tqparent=0, int EffectType = 0); + EffectOptionsDialog(TQWidget *parent=0, int EffectType = 0); ~EffectOptionsDialog(); KIntNumInput *m_latWidth; diff --git a/kipi-plugins/batchprocessimages/filterimagesdialog.cpp b/kipi-plugins/batchprocessimages/filterimagesdialog.cpp index 993d158..fa7100b 100644 --- a/kipi-plugins/batchprocessimages/filterimagesdialog.cpp +++ b/kipi-plugins/batchprocessimages/filterimagesdialog.cpp @@ -54,8 +54,8 @@ namespace KIPIBatchProcessImagesPlugin { -FilterImagesDialog::FilterImagesDialog( KURL::List urlList, KIPI::Interface* interface, TQWidget *tqparent ) - : BatchProcessImagesDialog( urlList, interface, i18n("Batch Image Filtering"), tqparent ) +FilterImagesDialog::FilterImagesDialog( KURL::List urlList, KIPI::Interface* interface, TQWidget *parent ) + : BatchProcessImagesDialog( urlList, interface, i18n("Batch Image Filtering"), parent ) { // About data and help button. @@ -105,7 +105,7 @@ FilterImagesDialog::FilterImagesDialog( KURL::List urlList, KIPI::Interface* int "<b>Median</b>: apply a median filter to an image.<p>" "<b>Noise reduction</b>: reduce noise in an image. <p>" "<b>Sharpen</b>: sharpen the image with a Gaussian operator.<p>" - "<b>Unsharp</b>: sharpen the image with an unsharp tqmask operator.<p>"); + "<b>Unsharp</b>: sharpen the image with an unsharp mask operator.<p>"); TQWhatsThis::add( m_Type, whatsThis ); diff --git a/kipi-plugins/batchprocessimages/filterimagesdialog.h b/kipi-plugins/batchprocessimages/filterimagesdialog.h index af92fd4..5705324 100644 --- a/kipi-plugins/batchprocessimages/filterimagesdialog.h +++ b/kipi-plugins/batchprocessimages/filterimagesdialog.h @@ -40,7 +40,7 @@ Q_OBJECT public: - FilterImagesDialog( KURL::List images, KIPI::Interface* interface, TQWidget *tqparent=0 ); + FilterImagesDialog( KURL::List images, KIPI::Interface* interface, TQWidget *parent=0 ); ~FilterImagesDialog(); private slots: diff --git a/kipi-plugins/batchprocessimages/filteroptionsdialog.cpp b/kipi-plugins/batchprocessimages/filteroptionsdialog.cpp index 084510a..d22c43a 100644 --- a/kipi-plugins/batchprocessimages/filteroptionsdialog.cpp +++ b/kipi-plugins/batchprocessimages/filteroptionsdialog.cpp @@ -46,8 +46,8 @@ namespace KIPIBatchProcessImagesPlugin { -FilterOptionsDialog::FilterOptionsDialog(TQWidget *tqparent, int FilterType) - : KDialogBase( tqparent, "FilterOptionsDialog", true, +FilterOptionsDialog::FilterOptionsDialog(TQWidget *parent, int FilterType) + : KDialogBase( parent, "FilterOptionsDialog", true, i18n("Filter Options"), Ok|Cancel, Ok, false) { TQWidget* box = new TQWidget( this ); diff --git a/kipi-plugins/batchprocessimages/filteroptionsdialog.h b/kipi-plugins/batchprocessimages/filteroptionsdialog.h index c8766fd..333a190 100644 --- a/kipi-plugins/batchprocessimages/filteroptionsdialog.h +++ b/kipi-plugins/batchprocessimages/filteroptionsdialog.h @@ -44,7 +44,7 @@ Q_OBJECT TQ_OBJECT public: - FilterOptionsDialog(TQWidget *tqparent=0, int FilterType = 0); + FilterOptionsDialog(TQWidget *parent=0, int FilterType = 0); ~FilterOptionsDialog(); TQComboBox *m_noiseType; diff --git a/kipi-plugins/batchprocessimages/imagepreview.cpp b/kipi-plugins/batchprocessimages/imagepreview.cpp index edb3b5b..0e8f62c 100644 --- a/kipi-plugins/batchprocessimages/imagepreview.cpp +++ b/kipi-plugins/batchprocessimages/imagepreview.cpp @@ -79,8 +79,8 @@ int INIT_ZOOM_FACTOR; ImagePreview::ImagePreview(const TQString &fileOrig, const TQString &fileDest, const TQString &tmpPath, bool cropActionOrig, bool cropActionDest, const TQString &EffectName, - const TQString &FileName, TQWidget *tqparent) - : KDialogBase( tqparent, "PreviewDialog", true, i18n("Batch Process Preview (%1 - %2)").tqarg(EffectName) + const TQString &FileName, TQWidget *parent) + : KDialogBase( parent, "PreviewDialog", true, i18n("Batch Process Preview (%1 - %2)").tqarg(EffectName) .tqarg(FileName), Help|Ok, Ok, true) { // About data and help button. @@ -194,8 +194,8 @@ void ImagePreview::slotZoomFactorValueChanged( int ZoomFactorValue ) m_previewDest->resizeImage( ZoomFactorValue * 5 ); } -PixmapView::PixmapView(bool cropAction, TQWidget *tqparent, const char *name) - : TQScrollView(tqparent, name) +PixmapView::PixmapView(bool cropAction, TQWidget *parent, const char *name) + : TQScrollView(parent, name) { m_cropAction = cropAction; m_pix = NULL; diff --git a/kipi-plugins/batchprocessimages/imagepreview.h b/kipi-plugins/batchprocessimages/imagepreview.h index 82b4ba1..4b21299 100644 --- a/kipi-plugins/batchprocessimages/imagepreview.h +++ b/kipi-plugins/batchprocessimages/imagepreview.h @@ -57,7 +57,7 @@ Q_OBJECT public: - PixmapView(bool cropAction, TQWidget *tqparent=0, const char *name=0); + PixmapView(bool cropAction, TQWidget *parent=0, const char *name=0); ~PixmapView(); void setImage(const TQString &ImagePath, const TQString &tmpPath); @@ -113,7 +113,7 @@ public: ImagePreview(const TQString &fileOrig, const TQString &fileDest, const TQString &tmpPath, bool cropActionOrig, bool cropActionDest, const TQString &EffectName, - const TQString &FileName, TQWidget *tqparent=0); + const TQString &FileName, TQWidget *parent=0); ~ImagePreview(); private slots: diff --git a/kipi-plugins/batchprocessimages/outputdialog.cpp b/kipi-plugins/batchprocessimages/outputdialog.cpp index 7f56456..2f12cbe 100644 --- a/kipi-plugins/batchprocessimages/outputdialog.cpp +++ b/kipi-plugins/batchprocessimages/outputdialog.cpp @@ -46,8 +46,8 @@ namespace KIPIBatchProcessImagesPlugin { -OutputDialog::OutputDialog(TQWidget* tqparent, TQString caption, TQString Messages, TQString Header ) - : KDialogBase( tqparent, "OutputDialog", true, caption, Help|User1|Ok, Ok, false, +OutputDialog::OutputDialog(TQWidget* parent, TQString caption, TQString Messages, TQString Header ) + : KDialogBase( parent, "OutputDialog", true, caption, Help|User1|Ok, Ok, false, i18n("Copy to Clip&board")) { // About data and help button. diff --git a/kipi-plugins/batchprocessimages/outputdialog.h b/kipi-plugins/batchprocessimages/outputdialog.h index c77d131..8fb17b8 100644 --- a/kipi-plugins/batchprocessimages/outputdialog.h +++ b/kipi-plugins/batchprocessimages/outputdialog.h @@ -48,7 +48,7 @@ Q_OBJECT public: - OutputDialog( TQWidget* tqparent=0, TQString caption=TQString(), + OutputDialog( TQWidget* parent=0, TQString caption=TQString(), TQString Messages=TQString(), TQString Header=TQString() ); ~OutputDialog(); diff --git a/kipi-plugins/batchprocessimages/plugin_batchprocessimages.cpp b/kipi-plugins/batchprocessimages/plugin_batchprocessimages.cpp index f1f4ee3..8e3c330 100644 --- a/kipi-plugins/batchprocessimages/plugin_batchprocessimages.cpp +++ b/kipi-plugins/batchprocessimages/plugin_batchprocessimages.cpp @@ -69,8 +69,8 @@ typedef KGenericFactory<Plugin_BatchProcessImages> Factory; K_EXPORT_COMPONENT_FACTORY( kipiplugin_batchprocessimages, Factory("kipiplugin_batchprocessimages")) -Plugin_BatchProcessImages::Plugin_BatchProcessImages(TQObject *tqparent, const char*, const TQStringList&) - : KIPI::Plugin( Factory::instance(), tqparent, "BatchProcessImages") +Plugin_BatchProcessImages::Plugin_BatchProcessImages(TQObject *parent, const char*, const TQStringList&) + : KIPI::Plugin( Factory::instance(), parent, "BatchProcessImages") { kdDebug( 51001 ) << "Plugin_BatchProcessImages plugin loaded" << endl; @@ -153,7 +153,7 @@ void Plugin_BatchProcessImages::setup( TQWidget* widget ) addAction( m_action_recompressimages ); addAction( m_action_resizeimages ); - KIPI::Interface* interface = dynamic_cast< KIPI::Interface* >( tqparent() ); + KIPI::Interface* interface = dynamic_cast< KIPI::Interface* >( parent() ); if ( !interface ) { @@ -204,7 +204,7 @@ Plugin_BatchProcessImages::~Plugin_BatchProcessImages() void Plugin_BatchProcessImages::slotActivate() { - KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>( tqparent() ); + KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>( parent() ); if ( !interface ) { diff --git a/kipi-plugins/batchprocessimages/plugin_batchprocessimages.h b/kipi-plugins/batchprocessimages/plugin_batchprocessimages.h index 3600c55..cf36df9 100644 --- a/kipi-plugins/batchprocessimages/plugin_batchprocessimages.h +++ b/kipi-plugins/batchprocessimages/plugin_batchprocessimages.h @@ -48,7 +48,7 @@ Q_OBJECT TQ_OBJECT public: - Plugin_BatchProcessImages(TQObject *tqparent, const char* name, const TQStringList &args); + Plugin_BatchProcessImages(TQObject *parent, const char* name, const TQStringList &args); virtual ~Plugin_BatchProcessImages(); virtual KIPI::Category category( KAction* action ) const; virtual void setup( TQWidget* ); diff --git a/kipi-plugins/batchprocessimages/recompressimagesdialog.cpp b/kipi-plugins/batchprocessimages/recompressimagesdialog.cpp index 7f2da05..93208ef 100644 --- a/kipi-plugins/batchprocessimages/recompressimagesdialog.cpp +++ b/kipi-plugins/batchprocessimages/recompressimagesdialog.cpp @@ -53,8 +53,8 @@ namespace KIPIBatchProcessImagesPlugin { -RecompressImagesDialog::RecompressImagesDialog( KURL::List urlList, KIPI::Interface* interface, TQWidget *tqparent ) - : BatchProcessImagesDialog( urlList, interface, i18n("Batch Recompress Images"), tqparent ) +RecompressImagesDialog::RecompressImagesDialog( KURL::List urlList, KIPI::Interface* interface, TQWidget *parent ) + : BatchProcessImagesDialog( urlList, interface, i18n("Batch Recompress Images"), parent ) { // About data and help button. diff --git a/kipi-plugins/batchprocessimages/recompressimagesdialog.h b/kipi-plugins/batchprocessimages/recompressimagesdialog.h index 4e32135..827f1d4 100644 --- a/kipi-plugins/batchprocessimages/recompressimagesdialog.h +++ b/kipi-plugins/batchprocessimages/recompressimagesdialog.h @@ -40,7 +40,7 @@ Q_OBJECT public: - RecompressImagesDialog( KURL::List images, KIPI::Interface* interface, TQWidget *tqparent=0 ); + RecompressImagesDialog( KURL::List images, KIPI::Interface* interface, TQWidget *parent=0 ); ~RecompressImagesDialog(); private slots: diff --git a/kipi-plugins/batchprocessimages/recompressoptionsdialog.cpp b/kipi-plugins/batchprocessimages/recompressoptionsdialog.cpp index ec437a7..21975da 100644 --- a/kipi-plugins/batchprocessimages/recompressoptionsdialog.cpp +++ b/kipi-plugins/batchprocessimages/recompressoptionsdialog.cpp @@ -45,8 +45,8 @@ namespace KIPIBatchProcessImagesPlugin { -RecompressOptionsDialog::RecompressOptionsDialog(TQWidget *tqparent) - : KDialogBase( tqparent, "RecompressOptionsDialog", true, +RecompressOptionsDialog::RecompressOptionsDialog(TQWidget *parent) + : KDialogBase( parent, "RecompressOptionsDialog", true, i18n("Recompression Options"), Ok|Cancel, Ok, false) { TQWidget* box = new TQWidget( this ); diff --git a/kipi-plugins/batchprocessimages/recompressoptionsdialog.h b/kipi-plugins/batchprocessimages/recompressoptionsdialog.h index 8fefb87..9808832 100644 --- a/kipi-plugins/batchprocessimages/recompressoptionsdialog.h +++ b/kipi-plugins/batchprocessimages/recompressoptionsdialog.h @@ -46,7 +46,7 @@ Q_OBJECT TQ_OBJECT public: - RecompressOptionsDialog(TQWidget *tqparent=0); + RecompressOptionsDialog(TQWidget *parent=0); ~RecompressOptionsDialog(); TQLabel *m_label_JPEGimageCompression; diff --git a/kipi-plugins/batchprocessimages/renameimagesdialog.cpp b/kipi-plugins/batchprocessimages/renameimagesdialog.cpp index 543e434..6fc88cf 100644 --- a/kipi-plugins/batchprocessimages/renameimagesdialog.cpp +++ b/kipi-plugins/batchprocessimages/renameimagesdialog.cpp @@ -46,9 +46,9 @@ namespace KIPIBatchProcessImagesPlugin RenameImagesDialog::RenameImagesDialog(const KURL::List& images, KIPI::Interface* interface, - TQWidget* tqparent) + TQWidget* parent) : KDialogBase( KDialogBase::Plain, "Rename Images", Help|User1|Close, - Close, tqparent, "RenameImages", + Close, parent, "RenameImages", false, false, i18n("&Start")) { // About data and help button. diff --git a/kipi-plugins/batchprocessimages/renameimagesdialog.h b/kipi-plugins/batchprocessimages/renameimagesdialog.h index f02ce56..d4f39ee 100644 --- a/kipi-plugins/batchprocessimages/renameimagesdialog.h +++ b/kipi-plugins/batchprocessimages/renameimagesdialog.h @@ -52,7 +52,7 @@ public: RenameImagesDialog(const KURL::List& images, KIPI::Interface* interface, - TQWidget* tqparent); + TQWidget* parent); ~RenameImagesDialog(); private: diff --git a/kipi-plugins/batchprocessimages/renameimageswidget.cpp b/kipi-plugins/batchprocessimages/renameimageswidget.cpp index 630e4dd..67958ab 100644 --- a/kipi-plugins/batchprocessimages/renameimageswidget.cpp +++ b/kipi-plugins/batchprocessimages/renameimageswidget.cpp @@ -75,10 +75,10 @@ extern "C" namespace KIPIBatchProcessImagesPlugin { -RenameImagesWidget::RenameImagesWidget(TQWidget *tqparent, +RenameImagesWidget::RenameImagesWidget(TQWidget *parent, KIPI::Interface* interface, const KURL::List& urlList) - : RenameImagesBase(tqparent), + : RenameImagesBase(parent), m_interface(interface), m_urlList(urlList) { diff --git a/kipi-plugins/batchprocessimages/renameimageswidget.h b/kipi-plugins/batchprocessimages/renameimageswidget.h index fb86055..176571a 100644 --- a/kipi-plugins/batchprocessimages/renameimageswidget.h +++ b/kipi-plugins/batchprocessimages/renameimageswidget.h @@ -60,7 +60,7 @@ public: BYDATE }; - RenameImagesWidget(TQWidget *tqparent, KIPI::Interface* interface, + RenameImagesWidget(TQWidget *parent, KIPI::Interface* interface, const KURL::List& urlList); ~RenameImagesWidget(); diff --git a/kipi-plugins/batchprocessimages/resizeimagesdialog.cpp b/kipi-plugins/batchprocessimages/resizeimagesdialog.cpp index 6c2f16a..6b29169 100644 --- a/kipi-plugins/batchprocessimages/resizeimagesdialog.cpp +++ b/kipi-plugins/batchprocessimages/resizeimagesdialog.cpp @@ -55,8 +55,8 @@ namespace KIPIBatchProcessImagesPlugin { -ResizeImagesDialog::ResizeImagesDialog( KURL::List urlList, KIPI::Interface* interface, TQWidget *tqparent ) - : BatchProcessImagesDialog( urlList, interface, i18n("Batch Resize Images"), tqparent ) +ResizeImagesDialog::ResizeImagesDialog( KURL::List urlList, KIPI::Interface* interface, TQWidget *parent ) + : BatchProcessImagesDialog( urlList, interface, i18n("Batch Resize Images"), parent ) { // About data and help button. diff --git a/kipi-plugins/batchprocessimages/resizeimagesdialog.h b/kipi-plugins/batchprocessimages/resizeimagesdialog.h index 2b5e50f..a42f93d 100644 --- a/kipi-plugins/batchprocessimages/resizeimagesdialog.h +++ b/kipi-plugins/batchprocessimages/resizeimagesdialog.h @@ -40,7 +40,7 @@ Q_OBJECT public: - ResizeImagesDialog( KURL::List images, KIPI::Interface* interface, TQWidget *tqparent=0 ); + ResizeImagesDialog( KURL::List images, KIPI::Interface* interface, TQWidget *parent=0 ); ~ResizeImagesDialog(); private slots: diff --git a/kipi-plugins/batchprocessimages/resizeoptionsdialog.cpp b/kipi-plugins/batchprocessimages/resizeoptionsdialog.cpp index ad26646..bc063dc 100644 --- a/kipi-plugins/batchprocessimages/resizeoptionsdialog.cpp +++ b/kipi-plugins/batchprocessimages/resizeoptionsdialog.cpp @@ -48,8 +48,8 @@ namespace KIPIBatchProcessImagesPlugin { -ResizeOptionsDialog::ResizeOptionsDialog(TQWidget *tqparent, int ResizeType) - : KDialogBase( tqparent, "ResizeOptionsDialog", true, +ResizeOptionsDialog::ResizeOptionsDialog(TQWidget *parent, int ResizeType) + : KDialogBase( parent, "ResizeOptionsDialog", true, i18n("Image-Resize Options"), Ok|Cancel, Ok, false) { m_Type = ResizeType; diff --git a/kipi-plugins/batchprocessimages/resizeoptionsdialog.h b/kipi-plugins/batchprocessimages/resizeoptionsdialog.h index 4a8d5a2..7c4afdf 100644 --- a/kipi-plugins/batchprocessimages/resizeoptionsdialog.h +++ b/kipi-plugins/batchprocessimages/resizeoptionsdialog.h @@ -48,7 +48,7 @@ Q_OBJECT public: - ResizeOptionsDialog(TQWidget *tqparent=0, int ResizeType = 0); + ResizeOptionsDialog(TQWidget *parent=0, int ResizeType = 0); ~ResizeOptionsDialog(); TQLabel *m_label_size; diff --git a/kipi-plugins/calendar/calevents.cpp b/kipi-plugins/calendar/calevents.cpp index 7792acb..cf6e847 100644 --- a/kipi-plugins/calendar/calevents.cpp +++ b/kipi-plugins/calendar/calevents.cpp @@ -32,8 +32,8 @@ namespace KIPICalendarPlugin { -CalEvents::CalEvents(TQWidget *tqparent, const char *name) - : CalEventsBase(tqparent, name) +CalEvents::CalEvents(TQWidget *parent, const char *name) + : CalEventsBase(parent, name) { KIconLoader * icons = new KIconLoader( TQString( "MenuDlg" ) ); ohBtn->setPixmap( icons->loadIcon( TQString( "fileopen" ), KIcon::Toolbar ) ); diff --git a/kipi-plugins/calendar/calevents.h b/kipi-plugins/calendar/calevents.h index 92230d3..c370f05 100644 --- a/kipi-plugins/calendar/calevents.h +++ b/kipi-plugins/calendar/calevents.h @@ -37,7 +37,7 @@ class CalEvents : public CalEventsBase Q_OBJECT TQ_OBJECT public: - CalEvents(TQWidget *tqparent = 0, const char *name = 0); + CalEvents(TQWidget *parent = 0, const char *name = 0); ~CalEvents(); diff --git a/kipi-plugins/calendar/calpainter.cpp b/kipi-plugins/calendar/calpainter.cpp index d481b96..4c94d5c 100644 --- a/kipi-plugins/calendar/calpainter.cpp +++ b/kipi-plugins/calendar/calpainter.cpp @@ -299,9 +299,9 @@ void CalPainter::paint(bool useDeviceMetrics) delete painter; } -CalBlockPainter::CalBlockPainter(TQObject *tqparent, int year, int month, +CalBlockPainter::CalBlockPainter(TQObject *parent, int year, int month, const KURL& imagePath, int angle, CalFormatter *formatter, TQPainter *painter) - : TQObject(tqparent), painter_(painter) + : TQObject(parent), painter_(painter) { int width = 0; int height = 0; diff --git a/kipi-plugins/calendar/calpainter.h b/kipi-plugins/calendar/calpainter.h index 7a4a4e4..8f827fc 100644 --- a/kipi-plugins/calendar/calpainter.h +++ b/kipi-plugins/calendar/calpainter.h @@ -69,7 +69,7 @@ class CalBlockPainter : public TQObject public: - CalBlockPainter(TQObject *tqparent, int year, int month, + CalBlockPainter(TQObject *parent, int year, int month, const KURL& imagePath, int angle, CalFormatter* formatter, TQPainter *painter); ~CalBlockPainter(); diff --git a/kipi-plugins/calendar/calselect.cpp b/kipi-plugins/calendar/calselect.cpp index 20058d4..c29809a 100644 --- a/kipi-plugins/calendar/calselect.cpp +++ b/kipi-plugins/calendar/calselect.cpp @@ -47,8 +47,8 @@ namespace KIPICalendarPlugin { -CalSelect::CalSelect(KIPI::Interface* interface, TQWidget *tqparent, const char* name) - : TQWidget(tqparent, name) +CalSelect::CalSelect(KIPI::Interface* interface, TQWidget *parent, const char* name) + : TQWidget(parent, name) { mwVector_ = new TQPtrVector<MonthWidget>(MAX_MONTHS); monthBoxLayout_ = NULL; diff --git a/kipi-plugins/calendar/calselect.h b/kipi-plugins/calendar/calselect.h index d0636b9..4c31576 100644 --- a/kipi-plugins/calendar/calselect.h +++ b/kipi-plugins/calendar/calselect.h @@ -45,7 +45,7 @@ class CalSelect : public TQWidget public: - CalSelect( KIPI::Interface* interface, TQWidget *tqparent, const char* name=0); + CalSelect( KIPI::Interface* interface, TQWidget *parent, const char* name=0); ~CalSelect(); private: diff --git a/kipi-plugins/calendar/caltemplate.cpp b/kipi-plugins/calendar/caltemplate.cpp index 6f54541..21ccf88 100644 --- a/kipi-plugins/calendar/caltemplate.cpp +++ b/kipi-plugins/calendar/caltemplate.cpp @@ -54,8 +54,8 @@ namespace KIPICalendarPlugin { -CalTemplate::CalTemplate(TQWidget* tqparent, const char* name) - : TQWidget(tqparent, name) +CalTemplate::CalTemplate(TQWidget* parent, const char* name) + : TQWidget(parent, name) { TQGridLayout *mainLayout = new TQGridLayout(this, 1, 1, 5, 5); diff --git a/kipi-plugins/calendar/caltemplate.h b/kipi-plugins/calendar/caltemplate.h index 8208580..3a0876d 100644 --- a/kipi-plugins/calendar/caltemplate.h +++ b/kipi-plugins/calendar/caltemplate.h @@ -48,7 +48,7 @@ class CalTemplate : public TQWidget public: - CalTemplate(TQWidget* tqparent, const char* name=0); + CalTemplate(TQWidget* parent, const char* name=0); ~CalTemplate(); private: diff --git a/kipi-plugins/calendar/calwidget.cpp b/kipi-plugins/calendar/calwidget.cpp index 10bf19c..235fb0f 100644 --- a/kipi-plugins/calendar/calwidget.cpp +++ b/kipi-plugins/calendar/calwidget.cpp @@ -45,8 +45,8 @@ namespace KIPICalendarPlugin { -CalWidget::CalWidget(TQWidget *tqparent) - : TQWidget(tqparent,0,TQt::WRepaintNoErase|TQt::WResizeNoErase) +CalWidget::CalWidget(TQWidget *parent) + : TQWidget(parent,0,TQt::WRepaintNoErase|TQt::WResizeNoErase) { tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); calPainter_ = 0; diff --git a/kipi-plugins/calendar/calwidget.h b/kipi-plugins/calendar/calwidget.h index 54cb0fe..6f4a9de 100644 --- a/kipi-plugins/calendar/calwidget.h +++ b/kipi-plugins/calendar/calwidget.h @@ -38,7 +38,7 @@ class CalWidget : public TQWidget { public: - CalWidget(TQWidget *tqparent); + CalWidget(TQWidget *parent); ~CalWidget(); void recreate(); diff --git a/kipi-plugins/calendar/calwizard.cpp b/kipi-plugins/calendar/calwizard.cpp index d0b20c7..749183c 100644 --- a/kipi-plugins/calendar/calwizard.cpp +++ b/kipi-plugins/calendar/calwizard.cpp @@ -68,8 +68,8 @@ namespace KIPICalendarPlugin { -CalWizard::CalWizard( KIPI::Interface* interface, TQWidget *tqparent ) - : KWizard(tqparent, 0, false, TQt::WDestructiveClose), +CalWizard::CalWizard( KIPI::Interface* interface, TQWidget *parent ) + : KWizard(parent, 0, false, TQt::WDestructiveClose), interface_( interface ) { cSettings_ = new CalSettings(); diff --git a/kipi-plugins/calendar/calwizard.h b/kipi-plugins/calendar/calwizard.h index 5de9bca..93b6b2f 100644 --- a/kipi-plugins/calendar/calwizard.h +++ b/kipi-plugins/calendar/calwizard.h @@ -64,7 +64,7 @@ class CalWizard : public KWizard public: - CalWizard( KIPI::Interface* interface, TQWidget *tqparent=0L ); + CalWizard( KIPI::Interface* interface, TQWidget *parent=0L ); ~CalWizard(); private: diff --git a/kipi-plugins/calendar/monthwidget.cpp b/kipi-plugins/calendar/monthwidget.cpp index f93e5e4..ce9205b 100644 --- a/kipi-plugins/calendar/monthwidget.cpp +++ b/kipi-plugins/calendar/monthwidget.cpp @@ -59,8 +59,8 @@ namespace KIPICalendarPlugin { -MonthWidget::MonthWidget( KIPI::Interface* interface, TQWidget *tqparent, int month) - : TQFrame(tqparent), interface_( interface ) +MonthWidget::MonthWidget( KIPI::Interface* interface, TQWidget *parent, int month) + : TQFrame(parent), interface_( interface ) { setAcceptDrops(true); month_ = month; diff --git a/kipi-plugins/calendar/monthwidget.h b/kipi-plugins/calendar/monthwidget.h index 5a6d475..1d48446 100644 --- a/kipi-plugins/calendar/monthwidget.h +++ b/kipi-plugins/calendar/monthwidget.h @@ -49,7 +49,7 @@ class MonthWidget : public TQFrame public: - MonthWidget( KIPI::Interface* interface, TQWidget *tqparent, int month); + MonthWidget( KIPI::Interface* interface, TQWidget *parent, int month); ~MonthWidget(); KURL imagePath(); diff --git a/kipi-plugins/calendar/plugin_calendar.cpp b/kipi-plugins/calendar/plugin_calendar.cpp index 30311c7..66b32f4 100644 --- a/kipi-plugins/calendar/plugin_calendar.cpp +++ b/kipi-plugins/calendar/plugin_calendar.cpp @@ -45,10 +45,10 @@ typedef KGenericFactory<Plugin_Calendar> Factory; K_EXPORT_COMPONENT_FACTORY( kipiplugin_calendar, Factory("kipiplugin_calendar")) -Plugin_Calendar::Plugin_Calendar(TQObject *tqparent, +Plugin_Calendar::Plugin_Calendar(TQObject *parent, const char*, const TQStringList &) - : KIPI::Plugin(Factory::instance(), tqparent, "Calendar") + : KIPI::Plugin(Factory::instance(), parent, "Calendar") { kdDebug( 51001 ) << "Loaded Plugin_Calendar" << endl; } @@ -74,7 +74,7 @@ Plugin_Calendar::~Plugin_Calendar() void Plugin_Calendar::slotActivate() { - KIPI::Interface* interface = dynamic_cast< KIPI::Interface* >( tqparent() ); + KIPI::Interface* interface = dynamic_cast< KIPI::Interface* >( parent() ); if ( !interface ) { diff --git a/kipi-plugins/calendar/plugin_calendar.h b/kipi-plugins/calendar/plugin_calendar.h index d70f7aa..64c1198 100644 --- a/kipi-plugins/calendar/plugin_calendar.h +++ b/kipi-plugins/calendar/plugin_calendar.h @@ -38,7 +38,7 @@ class Plugin_Calendar : public KIPI::Plugin public: - Plugin_Calendar(TQObject *tqparent, + Plugin_Calendar(TQObject *parent, const char* name, const TQStringList &args); ~Plugin_Calendar(); diff --git a/kipi-plugins/cdarchiving/cdarchiving.cpp b/kipi-plugins/cdarchiving/cdarchiving.cpp index aae1706..6019187 100644 --- a/kipi-plugins/cdarchiving/cdarchiving.cpp +++ b/kipi-plugins/cdarchiving/cdarchiving.cpp @@ -69,8 +69,8 @@ extern "C" namespace KIPICDArchivingPlugin { -CDArchiving::CDArchiving( KIPI::Interface* interface, TQObject *tqparent, KAction *action_cdarchiving ) - : TQObject(tqparent) +CDArchiving::CDArchiving( KIPI::Interface* interface, TQObject *parent, KAction *action_cdarchiving ) + : TQObject(parent) { KImageIO::registerFormats(); const KAboutData *data = KApplication::kApplication()->aboutData(); @@ -86,7 +86,7 @@ CDArchiving::CDArchiving( KIPI::Interface* interface, TQObject *tqparent, KActio m_actionCDArchiving = action_cdarchiving; m_interface = interface; - m_parent = tqparent; + m_parent = parent; } diff --git a/kipi-plugins/cdarchiving/cdarchiving.h b/kipi-plugins/cdarchiving/cdarchiving.h index 0da9e0a..515485c 100644 --- a/kipi-plugins/cdarchiving/cdarchiving.h +++ b/kipi-plugins/cdarchiving/cdarchiving.h @@ -70,7 +70,7 @@ class CDArchiving : public TQObject public: - CDArchiving( KIPI::Interface* interface, TQObject *tqparent=0, + CDArchiving( KIPI::Interface* interface, TQObject *parent=0, KAction *action_cdarchiving=0 ); ~CDArchiving(); diff --git a/kipi-plugins/cdarchiving/cdarchivingdialog.cpp b/kipi-plugins/cdarchiving/cdarchivingdialog.cpp index 540c82f..5121432 100644 --- a/kipi-plugins/cdarchiving/cdarchivingdialog.cpp +++ b/kipi-plugins/cdarchiving/cdarchivingdialog.cpp @@ -84,9 +84,9 @@ namespace KIPICDArchivingPlugin KIO::filesize_t TargetMediaSize; -CDArchivingDialog::CDArchivingDialog( KIPI::Interface* interface, TQWidget *tqparent) +CDArchivingDialog::CDArchivingDialog( KIPI::Interface* interface, TQWidget *parent) : KDialogBase( IconList, i18n("Configure Archive to CD"), Help|Ok|Cancel, Ok, - tqparent, "CDArchivingDialog", true, false ), m_interface( interface ) + parent, "CDArchivingDialog", true, false ), m_interface( interface ) { setCaption(i18n("Create CD/DVD Archive")); setupSelection(); diff --git a/kipi-plugins/cdarchiving/cdarchivingdialog.h b/kipi-plugins/cdarchiving/cdarchivingdialog.h index 3aca798..14295f4 100644 --- a/kipi-plugins/cdarchiving/cdarchivingdialog.h +++ b/kipi-plugins/cdarchiving/cdarchivingdialog.h @@ -74,7 +74,7 @@ class CDArchivingDialog : public KDialogBase public: - CDArchivingDialog( KIPI::Interface* interface, TQWidget *tqparent=0); + CDArchivingDialog( KIPI::Interface* interface, TQWidget *parent=0); ~CDArchivingDialog(); TQString getK3bBinPathName() const; diff --git a/kipi-plugins/cdarchiving/plugin_cdarchiving.cpp b/kipi-plugins/cdarchiving/plugin_cdarchiving.cpp index f179070..04244ce 100644 --- a/kipi-plugins/cdarchiving/plugin_cdarchiving.cpp +++ b/kipi-plugins/cdarchiving/plugin_cdarchiving.cpp @@ -48,8 +48,8 @@ K_EXPORT_COMPONENT_FACTORY( kipiplugin_cdarchiving, Factory("kipiplugin_cdarchiving")) // ----------------------------------------------------------- -Plugin_CDArchiving::Plugin_CDArchiving(TQObject *tqparent, const char*, const TQStringList&) - : KIPI::Plugin( Factory::instance(), tqparent, "CDArchiving") +Plugin_CDArchiving::Plugin_CDArchiving(TQObject *parent, const char*, const TQStringList&) + : KIPI::Plugin( Factory::instance(), parent, "CDArchiving") { kdDebug( 51001 ) << "Plugin_CDArchiving plugin loaded" << endl; } @@ -86,7 +86,7 @@ void Plugin_CDArchiving::slotActivate() { m_progressDlg = 0; - KIPI::Interface* interface = dynamic_cast< KIPI::Interface* >( tqparent() ); + KIPI::Interface* interface = dynamic_cast< KIPI::Interface* >( parent() ); if ( !interface ) { diff --git a/kipi-plugins/cdarchiving/plugin_cdarchiving.h b/kipi-plugins/cdarchiving/plugin_cdarchiving.h index ab73bba..ea291dd 100644 --- a/kipi-plugins/cdarchiving/plugin_cdarchiving.h +++ b/kipi-plugins/cdarchiving/plugin_cdarchiving.h @@ -48,7 +48,7 @@ class Plugin_CDArchiving : public KIPI::Plugin TQ_OBJECT public: - Plugin_CDArchiving(TQObject *tqparent, const char* name, const TQStringList &args); + Plugin_CDArchiving(TQObject *parent, const char* name, const TQStringList &args); virtual ~Plugin_CDArchiving(); virtual KIPI::Category category( KAction* action ) const; virtual void setup( TQWidget* widget ); diff --git a/kipi-plugins/findimages/displaycompare.cpp b/kipi-plugins/findimages/displaycompare.cpp index 1f46888..2dd7ca2 100644 --- a/kipi-plugins/findimages/displaycompare.cpp +++ b/kipi-plugins/findimages/displaycompare.cpp @@ -77,9 +77,9 @@ namespace KIPIFindDupplicateImagesPlugin class FindOriginalItem : public TQCheckListItem { public: - FindOriginalItem(TQListView * tqparent, TQString const & name, TQString const & fullpath, + FindOriginalItem(TQListView * parent, TQString const & name, TQString const & fullpath, TQString const & album, TQString const & comments) - : TQCheckListItem( tqparent, name, TQCheckListItem::CheckBox), _name(name), + : TQCheckListItem( parent, name, TQCheckListItem::CheckBox), _name(name), _fullpath(fullpath), _album (album), _comments (comments) {} @@ -101,9 +101,9 @@ private: class FindDuplicateItem : public TQCheckListItem { public: - FindDuplicateItem(TQListView * tqparent, TQString const & name, TQString const & fullpath, + FindDuplicateItem(TQListView * parent, TQString const & name, TQString const & fullpath, TQString const & album, TQString const & comments) - : TQCheckListItem( tqparent, name, TQCheckListItem::CheckBox), _name(name), + : TQCheckListItem( parent, name, TQCheckListItem::CheckBox), _name(name), _fullpath(fullpath), _album (album), _comments (comments) {} @@ -122,9 +122,9 @@ private: //////////////////////////////////// CONSTRUCTOR //////////////////////////////////////////// -DisplayCompare::DisplayCompare(TQWidget* tqparent, KIPI::Interface* interface, +DisplayCompare::DisplayCompare(TQWidget* parent, KIPI::Interface* interface, const TQDict < TQPtrVector < TQFile > >& cmp ) - : KDialogBase( tqparent, "DisplayCompare", true, 0, + : KDialogBase( parent, "DisplayCompare", true, 0, Help|User1|Close, Close, false, i18n("Delete")), m_cmp(cmp), m_interface( interface ) { diff --git a/kipi-plugins/findimages/displaycompare.h b/kipi-plugins/findimages/displaycompare.h index 8edcba8..6d38188 100644 --- a/kipi-plugins/findimages/displaycompare.h +++ b/kipi-plugins/findimages/displaycompare.h @@ -66,7 +66,7 @@ Q_OBJECT public: - DisplayCompare(TQWidget* tqparent, KIPI::Interface* interface, const TQDict < TQPtrVector < TQFile > >& cmp); + DisplayCompare(TQWidget* parent, KIPI::Interface* interface, const TQDict < TQPtrVector < TQFile > >& cmp); ~DisplayCompare(); private slots : diff --git a/kipi-plugins/findimages/fastcompare.cpp b/kipi-plugins/findimages/fastcompare.cpp index 8b82877..28a2878 100644 --- a/kipi-plugins/findimages/fastcompare.cpp +++ b/kipi-plugins/findimages/fastcompare.cpp @@ -29,8 +29,8 @@ #include <kdebug.h> #include <tqfileinfo.h> -KIPIFindDupplicateImagesPlugin::FastCompare::FastCompare( TQObject* tqparent ) - :m_parent( tqparent ) +KIPIFindDupplicateImagesPlugin::FastCompare::FastCompare( TQObject* parent ) + :m_parent( parent ) { } diff --git a/kipi-plugins/findimages/fastcompare.h b/kipi-plugins/findimages/fastcompare.h index f939799..8fdaa2c 100644 --- a/kipi-plugins/findimages/fastcompare.h +++ b/kipi-plugins/findimages/fastcompare.h @@ -39,7 +39,7 @@ namespace KIPIFindDupplicateImagesPlugin class FastCompare :public CompareOperation { public: - FastCompare( TQObject* tqparent ); + FastCompare( TQObject* parent ); virtual TQDict < TQPtrVector < TQFile > > compare( const TQStringList& filesList ); protected: diff --git a/kipi-plugins/findimages/finddupplicatedialog.cpp b/kipi-plugins/findimages/finddupplicatedialog.cpp index c1c0d76..32e7d4b 100644 --- a/kipi-plugins/findimages/finddupplicatedialog.cpp +++ b/kipi-plugins/findimages/finddupplicatedialog.cpp @@ -73,9 +73,9 @@ namespace KIPIFindDupplicateImagesPlugin { -FindDuplicateDialog::FindDuplicateDialog( KIPI::Interface* interface, TQWidget *tqparent) +FindDuplicateDialog::FindDuplicateDialog( KIPI::Interface* interface, TQWidget *parent) : KDialogBase( IconList, i18n("Configure"), Help|Ok|Cancel, - Ok, tqparent, "FindDuplicateDialog", true, false ), + Ok, parent, "FindDuplicateDialog", true, false ), m_interface( interface ) { setCaption(i18n("Find Duplicate Images")); diff --git a/kipi-plugins/findimages/finddupplicatedialog.h b/kipi-plugins/findimages/finddupplicatedialog.h index 64c5422..f86a0fc 100644 --- a/kipi-plugins/findimages/finddupplicatedialog.h +++ b/kipi-plugins/findimages/finddupplicatedialog.h @@ -63,7 +63,7 @@ class FindDuplicateDialog : public KDialogBase public: - FindDuplicateDialog( KIPI::Interface* interface, TQWidget *tqparent=0); + FindDuplicateDialog( KIPI::Interface* interface, TQWidget *parent=0); ~FindDuplicateDialog(); int getFindMethod() const; diff --git a/kipi-plugins/findimages/finddupplicateimages.cpp b/kipi-plugins/findimages/finddupplicateimages.cpp index dac9d1b..ec51a60 100644 --- a/kipi-plugins/findimages/finddupplicateimages.cpp +++ b/kipi-plugins/findimages/finddupplicateimages.cpp @@ -74,13 +74,13 @@ namespace KIPIFindDupplicateImagesPlugin //////////////////////////////////// CONSTRUCTOR //////////////////////////////////////////// -FindDuplicateImages::FindDuplicateImages( KIPI::Interface* interface, TQObject *tqparent) - : TQObject(tqparent), TQThread(), m_interface( interface ), +FindDuplicateImages::FindDuplicateImages( KIPI::Interface* interface, TQObject *parent) + : TQObject(parent), TQThread(), m_interface( interface ), m_cacheDir(KGlobal::dirs()->saveLocation("cache", "kipi-findduplicate/")), m_compareOp( 0 ) { KImageIO::registerFormats(); - parent_ = tqparent; + parent_ = parent; } diff --git a/kipi-plugins/findimages/finddupplicateimages.h b/kipi-plugins/findimages/finddupplicateimages.h index d3bc868..8034206 100644 --- a/kipi-plugins/findimages/finddupplicateimages.h +++ b/kipi-plugins/findimages/finddupplicateimages.h @@ -59,7 +59,7 @@ class FindDuplicateImages : public TQObject, public TQThread TQ_OBJECT public: - FindDuplicateImages( KIPI::Interface* interface, TQObject *tqparent=0); + FindDuplicateImages( KIPI::Interface* interface, TQObject *parent=0); ~FindDuplicateImages(); virtual void run(); diff --git a/kipi-plugins/findimages/fuzzycompare.cpp b/kipi-plugins/findimages/fuzzycompare.cpp index f9f9d91..299b09c 100644 --- a/kipi-plugins/findimages/fuzzycompare.cpp +++ b/kipi-plugins/findimages/fuzzycompare.cpp @@ -37,8 +37,8 @@ #include <kstandarddirs.h> #include <math.h> -KIPIFindDupplicateImagesPlugin::FuzzyCompare::FuzzyCompare( TQObject* tqparent, const TQString& cacheDir ) - :m_parent( tqparent ), m_cacheDir( cacheDir ) +KIPIFindDupplicateImagesPlugin::FuzzyCompare::FuzzyCompare( TQObject* parent, const TQString& cacheDir ) + :m_parent( parent ), m_cacheDir( cacheDir ) { } diff --git a/kipi-plugins/findimages/fuzzycompare.h b/kipi-plugins/findimages/fuzzycompare.h index 104a1ac..090482b 100644 --- a/kipi-plugins/findimages/fuzzycompare.h +++ b/kipi-plugins/findimages/fuzzycompare.h @@ -41,7 +41,7 @@ class ImageSimilarityData; class FuzzyCompare :public CompareOperation { public: - FuzzyCompare( TQObject* tqparent, const TQString& cacheDir ); + FuzzyCompare( TQObject* parent, const TQString& cacheDir ); void setApproximateThreeshold( float approximateLevel ) { m_approximateLevel = approximateLevel; } TQDict < TQPtrVector < TQFile > > compare(const TQStringList& filesList ); diff --git a/kipi-plugins/findimages/plugin_findimages.cpp b/kipi-plugins/findimages/plugin_findimages.cpp index 7141161..c7a38c2 100644 --- a/kipi-plugins/findimages/plugin_findimages.cpp +++ b/kipi-plugins/findimages/plugin_findimages.cpp @@ -56,8 +56,8 @@ typedef KGenericFactory<Plugin_FindImages> Factory; K_EXPORT_COMPONENT_FACTORY( kipiplugin_findimages, Factory("kipiplugin_findimages")) - Plugin_FindImages::Plugin_FindImages(TQObject *tqparent, const char*, const TQStringList&) - : KIPI::Plugin( Factory::instance(), tqparent, "FindImages") + Plugin_FindImages::Plugin_FindImages(TQObject *parent, const char*, const TQStringList&) + : KIPI::Plugin( Factory::instance(), parent, "FindImages") { kdDebug( 51001 ) << "Plugin_FindImages plugin loaded" << endl; } @@ -89,7 +89,7 @@ Plugin_FindImages::~Plugin_FindImages() void Plugin_FindImages::slotFindDuplicateImages() { - KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>( tqparent() ); + KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>( parent() ); if ( !interface ) { diff --git a/kipi-plugins/findimages/plugin_findimages.h b/kipi-plugins/findimages/plugin_findimages.h index 35f5fda..2fc64ee 100644 --- a/kipi-plugins/findimages/plugin_findimages.h +++ b/kipi-plugins/findimages/plugin_findimages.h @@ -47,7 +47,7 @@ Q_OBJECT public: - Plugin_FindImages(TQObject *tqparent, const char* name, const TQStringList &args); + Plugin_FindImages(TQObject *parent, const char* name, const TQStringList &args); ~Plugin_FindImages(); virtual KIPI::Category category( KAction* action ) const; diff --git a/kipi-plugins/flickrexport/flickrtalker.cpp b/kipi-plugins/flickrexport/flickrtalker.cpp index 1f13257..0a317ec 100644 --- a/kipi-plugins/flickrexport/flickrtalker.cpp +++ b/kipi-plugins/flickrexport/flickrtalker.cpp @@ -77,9 +77,9 @@ namespace KIPIFlickrExportPlugin { -FlickrTalker::FlickrTalker(TQWidget* tqparent) +FlickrTalker::FlickrTalker(TQWidget* parent) { - m_parent = tqparent; + m_parent = parent; m_job = 0; m_apikey = "49d585bafa0758cb5c58ab67198bf632"; m_secret = "34b39925e6273ffd"; diff --git a/kipi-plugins/flickrexport/flickrtalker.h b/kipi-plugins/flickrexport/flickrtalker.h index 3482030..5093b78 100644 --- a/kipi-plugins/flickrexport/flickrtalker.h +++ b/kipi-plugins/flickrexport/flickrtalker.h @@ -68,7 +68,7 @@ public: public: - FlickrTalker(TQWidget* tqparent); + FlickrTalker(TQWidget* parent); ~FlickrTalker(); TQString getUserName(); diff --git a/kipi-plugins/flickrexport/flickrviewitem.cpp b/kipi-plugins/flickrexport/flickrviewitem.cpp index cc7d00f..be6179e 100644 --- a/kipi-plugins/flickrexport/flickrviewitem.cpp +++ b/kipi-plugins/flickrexport/flickrviewitem.cpp @@ -33,14 +33,14 @@ namespace KIPIFlickrExportPlugin { -GAlbumViewItem::GAlbumViewItem(TQListView* tqparent, const TQString& name, const GAlbum& album) - : TQListViewItem(tqparent, name) +GAlbumViewItem::GAlbumViewItem(TQListView* parent, const TQString& name, const GAlbum& album) + : TQListViewItem(parent, name) { m_album = album; } -GAlbumViewItem::GAlbumViewItem(TQListViewItem* tqparent, const TQString& name, const GAlbum& album) - : TQListViewItem(tqparent, name) +GAlbumViewItem::GAlbumViewItem(TQListViewItem* parent, const TQString& name, const GAlbum& album) + : TQListViewItem(parent, name) { m_album = album; } diff --git a/kipi-plugins/flickrexport/flickrviewitem.h b/kipi-plugins/flickrexport/flickrviewitem.h index 65c58f1..8d1016f 100644 --- a/kipi-plugins/flickrexport/flickrviewitem.h +++ b/kipi-plugins/flickrexport/flickrviewitem.h @@ -40,8 +40,8 @@ class GAlbumViewItem : public TQListViewItem public: - GAlbumViewItem(TQListView* tqparent, const TQString& name, const GAlbum& album); - GAlbumViewItem(TQListViewItem* tqparent, const TQString& name, const GAlbum& album); + GAlbumViewItem(TQListView* parent, const TQString& name, const GAlbum& album); + GAlbumViewItem(TQListViewItem* parent, const TQString& name, const GAlbum& album); ~GAlbumViewItem(); protected: diff --git a/kipi-plugins/flickrexport/flickrwidget.cpp b/kipi-plugins/flickrexport/flickrwidget.cpp index 52d4dd6..f7279c1 100644 --- a/kipi-plugins/flickrexport/flickrwidget.cpp +++ b/kipi-plugins/flickrexport/flickrwidget.cpp @@ -62,8 +62,8 @@ namespace KIPIFlickrExportPlugin { -FlickrWidget::FlickrWidget(TQWidget* tqparent, KIPI::Interface *iface) - : TQWidget(tqparent) +FlickrWidget::FlickrWidget(TQWidget* parent, KIPI::Interface *iface) + : TQWidget(parent) { setName("FlickrWidget"); diff --git a/kipi-plugins/flickrexport/flickrwidget.h b/kipi-plugins/flickrexport/flickrwidget.h index 7643a9a..59b1e61 100644 --- a/kipi-plugins/flickrexport/flickrwidget.h +++ b/kipi-plugins/flickrexport/flickrwidget.h @@ -62,7 +62,7 @@ public: public: - FlickrWidget(TQWidget* tqparent, KIPI::Interface *iface); + FlickrWidget(TQWidget* parent, KIPI::Interface *iface); ~FlickrWidget(); private slots: diff --git a/kipi-plugins/flickrexport/flickrwindow.cpp b/kipi-plugins/flickrexport/flickrwindow.cpp index 609a5cd..e1e7061 100644 --- a/kipi-plugins/flickrexport/flickrwindow.cpp +++ b/kipi-plugins/flickrexport/flickrwindow.cpp @@ -75,8 +75,8 @@ namespace KIPIFlickrExportPlugin { -FlickrWindow::FlickrWindow(KIPI::Interface* interface, const TQString &tmpFolder, TQWidget *tqparent) - : KDialogBase(tqparent, 0, false, i18n("Export to Flickr Web Service"), +FlickrWindow::FlickrWindow(KIPI::Interface* interface, const TQString &tmpFolder, TQWidget *parent) + : KDialogBase(parent, 0, false, i18n("Export to Flickr Web Service"), Help|User1|Close, Close, false) { m_tmp = tmpFolder; @@ -352,17 +352,17 @@ void FlickrWindow::slotAlbums( const TQValueList<GAlbum>& albumList ) } else { - TQListViewItem* tqparent = m_albumDict.find( album.parent_ref_num ); - if ( tqparent ) + TQListViewItem* parent = m_albumDict.find( album.parent_ref_num ); + if ( parent ) { - GAlbumViewItem* item = new GAlbumViewItem( tqparent, album.name, + GAlbumViewItem* item = new GAlbumViewItem( parent, album.name, album); item->setPixmap( 0, pix ); m_albumDict.insert( album.ref_num, item ); } else { - kdWarning() << "Failed to find tqparent for album " + kdWarning() << "Failed to find parent for album " << album.name << "with id " << album.ref_num; } diff --git a/kipi-plugins/flickrexport/flickrwindow.h b/kipi-plugins/flickrexport/flickrwindow.h index ac01db8..8bd419e 100644 --- a/kipi-plugins/flickrexport/flickrwindow.h +++ b/kipi-plugins/flickrexport/flickrwindow.h @@ -81,7 +81,7 @@ class FlickrWindow : public KDialogBase public: - FlickrWindow(KIPI::Interface *interface, const TQString &tmpFolder, TQWidget *tqparent); + FlickrWindow(KIPI::Interface *interface, const TQString &tmpFolder, TQWidget *parent); ~FlickrWindow(); private slots: diff --git a/kipi-plugins/flickrexport/imageslist.cpp b/kipi-plugins/flickrexport/imageslist.cpp index bb402a0..fee6062 100644 --- a/kipi-plugins/flickrexport/imageslist.cpp +++ b/kipi-plugins/flickrexport/imageslist.cpp @@ -88,8 +88,8 @@ void ImagesListViewItem::setThumb(const TQPixmap& pix) // --------------------------------------------------------------------------- -ImagesListView::ImagesListView(TQWidget *tqparent) - : TQListView(tqparent) +ImagesListView::ImagesListView(TQWidget *parent) + : TQListView(parent) { addColumn(i18n("Thumbnail")); addColumn(i18n("File Name")); @@ -160,8 +160,8 @@ public: KIPI::Interface *iface; }; -ImagesList::ImagesList(TQWidget* tqparent, KIPI::Interface *iface) - : TQWidget(tqparent) +ImagesList::ImagesList(TQWidget* parent, KIPI::Interface *iface) + : TQWidget(parent) { d = new ImagesPagePriv; d->iface = iface; diff --git a/kipi-plugins/flickrexport/imageslist.h b/kipi-plugins/flickrexport/imageslist.h index 8192969..7021b72 100644 --- a/kipi-plugins/flickrexport/imageslist.h +++ b/kipi-plugins/flickrexport/imageslist.h @@ -72,7 +72,7 @@ class ImagesListView : public TQListView public: - ImagesListView(TQWidget *tqparent); + ImagesListView(TQWidget *parent); ~ImagesListView(); signals: @@ -94,7 +94,7 @@ class ImagesList : public TQWidget public: - ImagesList(TQWidget* tqparent, KIPI::Interface *iface); + ImagesList(TQWidget* parent, KIPI::Interface *iface); ~ImagesList(); KURL::List imageUrls() const; diff --git a/kipi-plugins/flickrexport/login.cpp b/kipi-plugins/flickrexport/login.cpp index 7e3c2e2..0686a09 100644 --- a/kipi-plugins/flickrexport/login.cpp +++ b/kipi-plugins/flickrexport/login.cpp @@ -40,9 +40,9 @@ namespace KIPIFlickrExportPlugin { -FlickrLogin::FlickrLogin(TQWidget* tqparent, const TQString& header, +FlickrLogin::FlickrLogin(TQWidget* parent, const TQString& header, const TQString& _name, const TQString& _passwd) - : TQDialog(tqparent) + : TQDialog(parent) { setSizeGripEnabled(false); diff --git a/kipi-plugins/flickrexport/login.h b/kipi-plugins/flickrexport/login.h index 67ae748..372f0b6 100644 --- a/kipi-plugins/flickrexport/login.h +++ b/kipi-plugins/flickrexport/login.h @@ -40,7 +40,7 @@ class FlickrLogin : public TQDialog public: - FlickrLogin(TQWidget* tqparent, const TQString& header, + FlickrLogin(TQWidget* parent, const TQString& header, const TQString& _name=TQString(), const TQString& _passwd=TQString()); ~FlickrLogin(); diff --git a/kipi-plugins/flickrexport/plugin_flickrexport.cpp b/kipi-plugins/flickrexport/plugin_flickrexport.cpp index f6d5dc5..269875d 100644 --- a/kipi-plugins/flickrexport/plugin_flickrexport.cpp +++ b/kipi-plugins/flickrexport/plugin_flickrexport.cpp @@ -52,8 +52,8 @@ typedef KGenericFactory<Plugin_FlickrExport> Factory; K_EXPORT_COMPONENT_FACTORY(kipiplugin_flickrexport, Factory("kipiplugin_flickrexport")) -Plugin_FlickrExport::Plugin_FlickrExport(TQObject *tqparent, const char*, const TQStringList&) - : KIPI::Plugin(Factory::instance(), tqparent, "FlickrExport") +Plugin_FlickrExport::Plugin_FlickrExport(TQObject *parent, const char*, const TQStringList&) + : KIPI::Plugin(Factory::instance(), parent, "FlickrExport") { kdDebug(51001) << "Plugin_FlickrExport plugin loaded" << endl; } @@ -70,7 +70,7 @@ void Plugin_FlickrExport::setup(TQWidget* widget) actionCollection(), "flickrexport"); - KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>(tqparent()); + KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>(parent()); if (!interface) { @@ -89,7 +89,7 @@ Plugin_FlickrExport::~Plugin_FlickrExport() void Plugin_FlickrExport::slotActivate() { - KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>(tqparent()); + KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>(parent()); if (!interface) { kdError( 51000 ) << "Kipi interface is null!" << endl; diff --git a/kipi-plugins/flickrexport/plugin_flickrexport.h b/kipi-plugins/flickrexport/plugin_flickrexport.h index 0bbeb99..af617f9 100644 --- a/kipi-plugins/flickrexport/plugin_flickrexport.h +++ b/kipi-plugins/flickrexport/plugin_flickrexport.h @@ -38,7 +38,7 @@ class Plugin_FlickrExport : public KIPI::Plugin public: - Plugin_FlickrExport(TQObject *tqparent, const char* name, const TQStringList &args); + Plugin_FlickrExport(TQObject *parent, const char* name, const TQStringList &args); ~Plugin_FlickrExport(); virtual KIPI::Category category(KAction* action) const; diff --git a/kipi-plugins/galleryexport/gallerylist.h b/kipi-plugins/galleryexport/gallerylist.h index 9216dda..2697ff8 100644 --- a/kipi-plugins/galleryexport/gallerylist.h +++ b/kipi-plugins/galleryexport/gallerylist.h @@ -36,7 +36,7 @@ class GalleryList : public KDialogBase public: - GalleryList(TQWidget *tqparent, Galleries* pGalleries, bool blnShowOpen = true); + GalleryList(TQWidget *parent, Galleries* pGalleries, bool blnShowOpen = true); ~GalleryList(); Gallery* GetGallery(void); diff --git a/kipi-plugins/galleryexport/gallerytalker.cpp b/kipi-plugins/galleryexport/gallerytalker.cpp index 8a36c19..3d7a03c 100644 --- a/kipi-plugins/galleryexport/gallerytalker.cpp +++ b/kipi-plugins/galleryexport/gallerytalker.cpp @@ -45,8 +45,8 @@ namespace KIPIGalleryExportPlugin { -GalleryTalker::GalleryTalker( TQWidget* tqparent ) - : m_parent( tqparent ), m_job( 0 ), m_loggedIn( false ) +GalleryTalker::GalleryTalker( TQWidget* parent ) + : m_parent( parent ), m_job( 0 ), m_loggedIn( false ) { } @@ -429,7 +429,7 @@ void GalleryTalker::parseResponseListAlbums(const TQByteArray &data) if (iter != albumList.end()) (*iter).summary = value; } - else if (key.startsWith("album.tqparent")) + else if (key.startsWith("album.parent")) { if (iter != albumList.end()) (*iter).parent_ref_num = value.toInt(); @@ -479,7 +479,7 @@ void GalleryTalker::parseResponseListAlbums(const TQByteArray &data) return; } - // We need tqparent albums to come first for rest of the code to work + // We need parent albums to come first for rest of the code to work qHeapSort(albumList); emit signalAlbums( albumList ); diff --git a/kipi-plugins/galleryexport/gallerytalker.h b/kipi-plugins/galleryexport/gallerytalker.h index 3cc876b..cf74183 100644 --- a/kipi-plugins/galleryexport/gallerytalker.h +++ b/kipi-plugins/galleryexport/gallerytalker.h @@ -51,7 +51,7 @@ public: GE_ADDPHOTO }; - GalleryTalker(TQWidget* tqparent); + GalleryTalker(TQWidget* parent); ~GalleryTalker(); static void setGallery2(bool usegallery2) {s_using_gallery2 = usegallery2;}; diff --git a/kipi-plugins/galleryexport/galleryviewitem.h b/kipi-plugins/galleryexport/galleryviewitem.h index 6a40c69..bb8295d 100644 --- a/kipi-plugins/galleryexport/galleryviewitem.h +++ b/kipi-plugins/galleryexport/galleryviewitem.h @@ -30,12 +30,12 @@ class GAlbumViewItem : public TQListViewItem { public: - GAlbumViewItem(TQListView* tqparent, const TQString& name, + GAlbumViewItem(TQListView* parent, const TQString& name, const GAlbum& _album) - : TQListViewItem(tqparent, name), album(_album) {} - GAlbumViewItem(TQListViewItem* tqparent, const TQString& name, + : TQListViewItem(parent, name), album(_album) {} + GAlbumViewItem(TQListViewItem* parent, const TQString& name, const GAlbum& _album) - : TQListViewItem(tqparent, name), album(_album) {} + : TQListViewItem(parent, name), album(_album) {} GAlbum album; diff --git a/kipi-plugins/galleryexport/gallerywidget.cpp b/kipi-plugins/galleryexport/gallerywidget.cpp index 0dd2435..769c4e5 100644 --- a/kipi-plugins/galleryexport/gallerywidget.cpp +++ b/kipi-plugins/galleryexport/gallerywidget.cpp @@ -42,8 +42,8 @@ namespace KIPIGalleryExportPlugin { -GalleryWidget::GalleryWidget( TQWidget* tqparent, const char* name, WFlags fl ) - : TQWidget( tqparent, name, fl ) +GalleryWidget::GalleryWidget( TQWidget* parent, const char* name, WFlags fl ) + : TQWidget( parent, name, fl ) { if ( !name ) setName( "GalleryWidget" ); diff --git a/kipi-plugins/galleryexport/gallerywidget.h b/kipi-plugins/galleryexport/gallerywidget.h index a14c944..252bb37 100644 --- a/kipi-plugins/galleryexport/gallerywidget.h +++ b/kipi-plugins/galleryexport/gallerywidget.h @@ -37,7 +37,7 @@ class GalleryWidget : public TQWidget public: - GalleryWidget( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + GalleryWidget( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~GalleryWidget(); private slots: diff --git a/kipi-plugins/galleryexport/gallerywindow.cpp b/kipi-plugins/galleryexport/gallerywindow.cpp index ea6a4b0..ac37a31 100644 --- a/kipi-plugins/galleryexport/gallerywindow.cpp +++ b/kipi-plugins/galleryexport/gallerywindow.cpp @@ -68,8 +68,8 @@ namespace KIPIGalleryExportPlugin { -GalleryWindow::GalleryWindow(KIPI::Interface* interface, TQWidget *tqparent, Galleries* pGalleries) - : KDialogBase(tqparent, 0, true, i18n("Gallery Export"), Help|Close, Close, false), +GalleryWindow::GalleryWindow(KIPI::Interface* interface, TQWidget *parent, Galleries* pGalleries) + : KDialogBase(parent, 0, true, i18n("Gallery Export"), Help|Close, Close, false), m_interface(interface), mpGalleries(pGalleries) { @@ -300,17 +300,17 @@ void GalleryWindow::slotAlbums( const TQValueList<GAlbum>& albumList ) } else { - TQListViewItem* tqparent = m_albumDict.find( album.parent_ref_num ); - if ( tqparent ) + TQListViewItem* parent = m_albumDict.find( album.parent_ref_num ); + if ( parent ) { - GAlbumViewItem* item = new GAlbumViewItem( tqparent, album.title, + GAlbumViewItem* item = new GAlbumViewItem( parent, album.title, album); item->setPixmap( 0, pix ); m_albumDict.insert( album.ref_num, item ); } else { - kdWarning() << "Failed to find tqparent for album " + kdWarning() << "Failed to find parent for album " << album.name << " with id " << album.ref_num << "\n"; } diff --git a/kipi-plugins/galleryexport/gallerywindow.h b/kipi-plugins/galleryexport/gallerywindow.h index 07cd366..06a21fd 100644 --- a/kipi-plugins/galleryexport/gallerywindow.h +++ b/kipi-plugins/galleryexport/gallerywindow.h @@ -57,7 +57,7 @@ class GalleryWindow : public KDialogBase public: - GalleryWindow(KIPI::Interface *interface, TQWidget *tqparent, Galleries* pGalleries); + GalleryWindow(KIPI::Interface *interface, TQWidget *parent, Galleries* pGalleries); ~GalleryWindow(); private: diff --git a/kipi-plugins/galleryexport/plugin_galleryexport.cpp b/kipi-plugins/galleryexport/plugin_galleryexport.cpp index 9753a92..60e2e58 100644 --- a/kipi-plugins/galleryexport/plugin_galleryexport.cpp +++ b/kipi-plugins/galleryexport/plugin_galleryexport.cpp @@ -47,10 +47,10 @@ typedef KGenericFactory<Plugin_GalleryExport> Factory; K_EXPORT_COMPONENT_FACTORY(kipiplugin_galleryexport, Factory("kipiplugin_galleryexport")) -Plugin_GalleryExport::Plugin_GalleryExport(TQObject *tqparent, +Plugin_GalleryExport::Plugin_GalleryExport(TQObject *parent, const char*, const TQStringList&) - : KIPI::Plugin(Factory::instance(), tqparent, "GalleryExport"), + : KIPI::Plugin(Factory::instance(), parent, "GalleryExport"), mpGalleries(0) { kdDebug(51001) << "Plugin_GalleryExport plugin loaded" @@ -63,7 +63,7 @@ void Plugin_GalleryExport::setup(TQWidget* widget) KIPI::Plugin::setup(widget); - KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>(tqparent()); + KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>(parent()); if (!interface) { @@ -122,7 +122,7 @@ Plugin_GalleryExport::~Plugin_GalleryExport() void Plugin_GalleryExport::slotSync() { - KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>(tqparent()); + KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>(parent()); if (!interface) { kdError( 51000 ) << "Kipi interface is null!" << endl; @@ -135,7 +135,7 @@ void Plugin_GalleryExport::slotSync() void Plugin_GalleryExport::slotConfigure() { - KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>(tqparent()); + KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>(parent()); if (!interface) { kdError( 51000 ) << "Kipi interface is null!" << endl; @@ -148,7 +148,7 @@ void Plugin_GalleryExport::slotConfigure() void Plugin_GalleryExport::slotCollectionSettings() { - KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>(tqparent()); + KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>(parent()); if (!interface) { kdError( 51000 ) << "Kipi interface is null!" << endl; @@ -160,7 +160,7 @@ void Plugin_GalleryExport::slotCollectionSettings() void Plugin_GalleryExport::slotImageSettings() { - KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>(tqparent()); + KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>(parent()); if (!interface) { kdError( 51000 ) << "Kipi interface is null!" << endl; diff --git a/kipi-plugins/galleryexport/plugin_galleryexport.h b/kipi-plugins/galleryexport/plugin_galleryexport.h index a6f61d3..a4593ad 100644 --- a/kipi-plugins/galleryexport/plugin_galleryexport.h +++ b/kipi-plugins/galleryexport/plugin_galleryexport.h @@ -40,7 +40,7 @@ class Plugin_GalleryExport : public KIPI::Plugin public: - Plugin_GalleryExport(TQObject *tqparent, + Plugin_GalleryExport(TQObject *parent, const char* name, const TQStringList &args); ~Plugin_GalleryExport(); diff --git a/kipi-plugins/gpssync/gpseditdialog.cpp b/kipi-plugins/gpssync/gpseditdialog.cpp index 43f4559..96663f7 100644 --- a/kipi-plugins/gpssync/gpseditdialog.cpp +++ b/kipi-plugins/gpssync/gpseditdialog.cpp @@ -83,11 +83,11 @@ public: GPSMapWidget *worldMap; }; -GPSEditDialog::GPSEditDialog(TQWidget* tqparent, const GPSDataContainer& gpsData, +GPSEditDialog::GPSEditDialog(TQWidget* parent, const GPSDataContainer& gpsData, const TQString& fileName, bool hasGPSInfo) : KDialogBase(Plain, i18n("%1 - Edit Geographical Coordinates").tqarg(fileName), Help|Ok|Cancel, Ok, - tqparent, 0, true, false) + parent, 0, true, false) { d = new GPSEditDialogDialogPrivate; d->hasGPSInfo = hasGPSInfo; diff --git a/kipi-plugins/gpssync/gpseditdialog.h b/kipi-plugins/gpssync/gpseditdialog.h index 848c1d9..16cd871 100644 --- a/kipi-plugins/gpssync/gpseditdialog.h +++ b/kipi-plugins/gpssync/gpseditdialog.h @@ -43,7 +43,7 @@ class GPSEditDialog : public KDialogBase public: - GPSEditDialog(TQWidget* tqparent, const GPSDataContainer& gpsData, + GPSEditDialog(TQWidget* parent, const GPSDataContainer& gpsData, const TQString& fileName, bool hasGPSInfo); ~GPSEditDialog(); diff --git a/kipi-plugins/gpssync/gpsmapwidget.cpp b/kipi-plugins/gpssync/gpsmapwidget.cpp index 3f800a2..82132ac 100644 --- a/kipi-plugins/gpssync/gpsmapwidget.cpp +++ b/kipi-plugins/gpssync/gpsmapwidget.cpp @@ -54,8 +54,8 @@ public: TQString fileName; }; -GPSMapWidget::GPSMapWidget(TQWidget* tqparent) - : KHTMLPart(tqparent) +GPSMapWidget::GPSMapWidget(TQWidget* parent) + : KHTMLPart(parent) { d = new GPSMapWidgetPrivate; diff --git a/kipi-plugins/gpssync/gpsmapwidget.h b/kipi-plugins/gpssync/gpsmapwidget.h index 9789540..2a6fff5 100644 --- a/kipi-plugins/gpssync/gpsmapwidget.h +++ b/kipi-plugins/gpssync/gpsmapwidget.h @@ -44,7 +44,7 @@ class GPSMapWidget : public KHTMLPart public: - GPSMapWidget(TQWidget* tqparent); + GPSMapWidget(TQWidget* parent); ~GPSMapWidget(); void setGPSPosition(const TQString& lat, const TQString& lon); diff --git a/kipi-plugins/gpssync/gpssyncdialog.cpp b/kipi-plugins/gpssync/gpssyncdialog.cpp index b14ee13..4ac5cca 100644 --- a/kipi-plugins/gpssync/gpssyncdialog.cpp +++ b/kipi-plugins/gpssync/gpssyncdialog.cpp @@ -103,10 +103,10 @@ public: GPSDataParser gpxParser; }; -GPSSyncDialog::GPSSyncDialog( KIPI::Interface* interface, TQWidget* tqparent) +GPSSyncDialog::GPSSyncDialog( KIPI::Interface* interface, TQWidget* parent) : KDialogBase(Plain, i18n("Geolocation"), Help|User1|User2|User3|Apply|Close, Close, - tqparent, 0, true, false) + parent, 0, true, false) { d = new GPSSyncDialogPriv; d->interface = interface; diff --git a/kipi-plugins/gpssync/gpssyncdialog.h b/kipi-plugins/gpssync/gpssyncdialog.h index e0e5199..7d04b4f 100644 --- a/kipi-plugins/gpssync/gpssyncdialog.h +++ b/kipi-plugins/gpssync/gpssyncdialog.h @@ -49,7 +49,7 @@ class GPSSyncDialog :public KDialogBase public: - GPSSyncDialog(KIPI::Interface* interface, TQWidget* tqparent); + GPSSyncDialog(KIPI::Interface* interface, TQWidget* parent); ~GPSSyncDialog(); void setImages(const KURL::List& images); diff --git a/kipi-plugins/gpssync/kmlexport.cpp b/kipi-plugins/gpssync/kmlexport.cpp index e166191..c95b54a 100644 --- a/kipi-plugins/gpssync/kmlexport.cpp +++ b/kipi-plugins/gpssync/kmlexport.cpp @@ -59,8 +59,8 @@ namespace KIPIGPSSyncPlugin kmlExport::kmlExport(KIPI::Interface* interface) { m_interface = interface; - TQWidget* tqparent = KApplication::kApplication()->mainWidget(); - m_progressDialog = new KIPI::BatchProgressDialog(tqparent, i18n("Generating KML file...")); + TQWidget* parent = KApplication::kApplication()->mainWidget(); + m_progressDialog = new KIPI::BatchProgressDialog(parent, i18n("Generating KML file...")); } kmlExport::~kmlExport() @@ -75,15 +75,15 @@ bool kmlExport::createDir(TQDir dir) { if (dir.exists()) return true; - TQDir tqparent = dir; - tqparent.cdUp(); - bool ok = createDir(tqparent); + TQDir parent = dir; + parent.cdUp(); + bool ok = createDir(parent); if (!ok) { - logError(i18n("Could not create '%1").tqarg(tqparent.path())); + logError(i18n("Could not create '%1").tqarg(parent.path())); return false; } - return tqparent.mkdir(dir.dirName()); + return parent.mkdir(dir.dirName()); } /*! @@ -450,8 +450,8 @@ void kmlExport::generate() if (defectImage) { /** @todo if defectImage==count there are no pictures exported, does it worst to continue? */ - TQWidget* tqparent = KApplication::kApplication()->mainWidget(); - KMessageBox::information(tqparent, i18n("No position data for 1 picture", + TQWidget* parent = KApplication::kApplication()->mainWidget(); + KMessageBox::information(parent, i18n("No position data for 1 picture", "No position data for %n pictures", defectImage)); } diff --git a/kipi-plugins/gpssync/kmlexport.h b/kipi-plugins/gpssync/kmlexport.h index 2ef558d..1f0ba5d 100644 --- a/kipi-plugins/gpssync/kmlexport.h +++ b/kipi-plugins/gpssync/kmlexport.h @@ -144,7 +144,7 @@ private: /*! * \fn KIPIKMLExport::kmlExport::addKmlElement(TQDomElement target, TQString tag) * Add a new element - * @param target the tqparent element to which add the element + * @param target the parent element to which add the element * @param tag the new element name * @return the New element */ @@ -158,7 +158,7 @@ private: /*! * \fn KIPIKMLExport::kmlExport::addKmlTextElement(TQDomElement target, TQString tag, TQString text) * Add a new element with a text - * @param target the tqparent element to which add the element + * @param target the parent element to which add the element * @param tag the new element name * @param text the text content of the new element * @return the New element @@ -175,7 +175,7 @@ private: /*! * \fn KIPIKMLExport::kmlExport::addKmlHtmlElement(TQDomElement target, TQString tag, TQString text) * Add a new element with html content (html entities are escaped and text is wrapped in a CDATA section) - * @param target the tqparent element to which add the element + * @param target the parent element to which add the element * @param tag the new element name * @param text the HTML content of the new element * @return the New element diff --git a/kipi-plugins/gpssync/kmlexportconfig.cpp b/kipi-plugins/gpssync/kmlexportconfig.cpp index f885f77..10602d8 100644 --- a/kipi-plugins/gpssync/kmlexportconfig.cpp +++ b/kipi-plugins/gpssync/kmlexportconfig.cpp @@ -59,13 +59,13 @@ namespace KIPIGPSSyncPlugin { /* - * Constructs a KIPIKMLExport::KMLExportConfig which is a child of 'tqparent', with the + * Constructs a KIPIKMLExport::KMLExportConfig which is a child of 'parent', with the * name 'name'.' */ -KMLExportConfig::KMLExportConfig( TQWidget* tqparent, const char* name) +KMLExportConfig::KMLExportConfig( TQWidget* parent, const char* name) : KDialogBase(Plain, i18n("KML Export"), Help|Ok|Cancel, Ok, - tqparent, 0, true, false) + parent, 0, true, false) { if ( !name ) setName( "KMLExportConfig" ); tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, diff --git a/kipi-plugins/gpssync/kmlexportconfig.h b/kipi-plugins/gpssync/kmlexportconfig.h index 3d2f7a8..0bf5bbc 100644 --- a/kipi-plugins/gpssync/kmlexportconfig.h +++ b/kipi-plugins/gpssync/kmlexportconfig.h @@ -56,7 +56,7 @@ class KMLExportConfig : public KDialogBase public: - explicit KMLExportConfig( TQWidget* tqparent = 0, const char* name = 0); + explicit KMLExportConfig( TQWidget* parent = 0, const char* name = 0); ~KMLExportConfig(); public: diff --git a/kipi-plugins/gpssync/kmlgpsdataparser.cpp b/kipi-plugins/gpssync/kmlgpsdataparser.cpp index cb3a25d..1d9226d 100644 --- a/kipi-plugins/gpssync/kmlgpsdataparser.cpp +++ b/kipi-plugins/gpssync/kmlgpsdataparser.cpp @@ -55,14 +55,14 @@ TQString KMLGPSDataParser::lineString() } /*! -\fn void KIPIGPSSyncPlugin::KMLGPSDataParser::CreateTrackLine(TQDomElement &tqparent, TQDomDocument &root, int altitudeMode) +\fn void KIPIGPSSyncPlugin::KMLGPSDataParser::CreateTrackLine(TQDomElement &parent, TQDomDocument &root, int altitudeMode) */ -void KIPIGPSSyncPlugin::KMLGPSDataParser::CreateTrackLine(TQDomElement &tqparent, TQDomDocument &root, int altitudeMode) +void KIPIGPSSyncPlugin::KMLGPSDataParser::CreateTrackLine(TQDomElement &parent, TQDomDocument &root, int altitudeMode) { kmlDocument = &root; // add the linetrack - TQDomElement kmlPlacemark = addKmlElement(tqparent, "Placemark"); + TQDomElement kmlPlacemark = addKmlElement(parent, "Placemark"); addKmlTextElement(kmlPlacemark, "name", i18n("Track")); TQDomElement kmlLineString = addKmlElement(kmlPlacemark, "LineString"); addKmlTextElement(kmlLineString, "coordinates", lineString()); @@ -82,16 +82,16 @@ void KIPIGPSSyncPlugin::KMLGPSDataParser::CreateTrackLine(TQDomElement &tqparent } /*! -\fn void KIPIGPSSyncPlugin::KMLGPSDataParser::CreateTrackPoints(TQDomElement &tqparent, TQDomDocument &root, int timeZone, int altitudeMode) +\fn void KIPIGPSSyncPlugin::KMLGPSDataParser::CreateTrackPoints(TQDomElement &parent, TQDomDocument &root, int timeZone, int altitudeMode) */ -void KIPIGPSSyncPlugin::KMLGPSDataParser::CreateTrackPoints(TQDomElement &tqparent, TQDomDocument &root, +void KIPIGPSSyncPlugin::KMLGPSDataParser::CreateTrackPoints(TQDomElement &parent, TQDomDocument &root, int timeZone, int altitudeMode) { kmlDocument = &root; kdDebug( 51001 ) << "creation d'un trackpoint" << endl; // create the points - TQDomElement kmlPointsFolder = addKmlElement(tqparent, "Folder"); + TQDomElement kmlPointsFolder = addKmlElement(parent, "Folder"); addKmlTextElement(kmlPointsFolder, "name", i18n("Points")); addKmlTextElement(kmlPointsFolder, "visibility", "0"); addKmlTextElement(kmlPointsFolder, "open", "0"); diff --git a/kipi-plugins/gpssync/kmlgpsdataparser.h b/kipi-plugins/gpssync/kmlgpsdataparser.h index b570274..fb760dd 100644 --- a/kipi-plugins/gpssync/kmlgpsdataparser.h +++ b/kipi-plugins/gpssync/kmlgpsdataparser.h @@ -50,19 +50,19 @@ public: */ TQString lineString(); /*! Create a KML Element that will contain the linetrace of the GPS - * @param tqparent the TQDomElement to which the track will be added + * @param parent the TQDomElement to which the track will be added * @param root the TQDomDocument used to create all elements * @param altitudeMode altitude mode of the line and points */ - void CreateTrackLine(TQDomElement &tqparent, TQDomDocument &root, int altitudeMode); + void CreateTrackLine(TQDomElement &parent, TQDomDocument &root, int altitudeMode); /*! Create a KML Element that will contain the points and of the GPS - * @param tqparent the TQDomElement to which the track will be added + * @param parent the TQDomElement to which the track will be added * @param root the TQDomDocument used to create all elements * @param timeZone the Timezone of the pictures * @param altitudeMode altitude mode of the line and points */ - void CreateTrackPoints(TQDomElement &tqparent, TQDomDocument &root, int timeZone, int altitudeMode); + void CreateTrackPoints(TQDomElement &parent, TQDomDocument &root, int timeZone, int altitudeMode); private: @@ -73,7 +73,7 @@ private: /*! \fn TQDomElement KIPIGPSSyncPlugin::KMLGPSDataParser::addKmlElement(TQDomElement target, TQString tag) * Add a new element - * @param target the tqparent element to which add the element + * @param target the parent element to which add the element * @param tag the new element name * @return the New element */ @@ -87,7 +87,7 @@ private: /*! \fn TQDomElement KIPIGPSSyncPlugin::KMLGPSDataParser::addKmlTextElement(TQDomElement target, TQString tag, TQString text) * Add a new element with a text - * @param target the tqparent element to which add the element + * @param target the parent element to which add the element * @param tag the new element name * @param text the text content of the new element * @return the New element diff --git a/kipi-plugins/gpssync/plugin_gpssync.cpp b/kipi-plugins/gpssync/plugin_gpssync.cpp index 760508b..2c9695a 100644 --- a/kipi-plugins/gpssync/plugin_gpssync.cpp +++ b/kipi-plugins/gpssync/plugin_gpssync.cpp @@ -60,8 +60,8 @@ typedef KGenericFactory<Plugin_GPSSync> Factory; K_EXPORT_COMPONENT_FACTORY( kipiplugin_gpssync, Factory("kipiplugin_gpssync")) -Plugin_GPSSync::Plugin_GPSSync(TQObject *tqparent, const char*, const TQStringList&) - : KIPI::Plugin( Factory::instance(), tqparent, "GPSSync") +Plugin_GPSSync::Plugin_GPSSync(TQObject *parent, const char*, const TQStringList&) + : KIPI::Plugin( Factory::instance(), parent, "GPSSync") { kdDebug( 51001 ) << "Plugin_GPSSync plugin loaded" << endl; } @@ -112,7 +112,7 @@ void Plugin_GPSSync::setup( TQWidget* widget ) addAction( m_actionKMLExport ); - m_interface = dynamic_cast< KIPI::Interface* >( tqparent() ); + m_interface = dynamic_cast< KIPI::Interface* >( parent() ); if ( !m_interface ) { diff --git a/kipi-plugins/gpssync/plugin_gpssync.h b/kipi-plugins/gpssync/plugin_gpssync.h index 5562db8..07f5167 100644 --- a/kipi-plugins/gpssync/plugin_gpssync.h +++ b/kipi-plugins/gpssync/plugin_gpssync.h @@ -39,7 +39,7 @@ class Plugin_GPSSync : public KIPI::Plugin public: - Plugin_GPSSync(TQObject *tqparent, const char* name, const TQStringList &args); + Plugin_GPSSync(TQObject *parent, const char* name, const TQStringList &args); virtual KIPI::Category category( KAction* action ) const; virtual void setup( TQWidget* ); diff --git a/kipi-plugins/helloworld/plugin_helloworld.cpp b/kipi-plugins/helloworld/plugin_helloworld.cpp index c3c01f1..992d906 100644 --- a/kipi-plugins/helloworld/plugin_helloworld.cpp +++ b/kipi-plugins/helloworld/plugin_helloworld.cpp @@ -45,10 +45,10 @@ typedef KGenericFactory<Plugin_HelloWorld> Factory; K_EXPORT_COMPONENT_FACTORY( kipiplugin_helloworld, Factory("kipiplugin_helloworld")); -Plugin_HelloWorld::Plugin_HelloWorld(TQObject *tqparent, +Plugin_HelloWorld::Plugin_HelloWorld(TQObject *parent, const char*, const TQStringList&) - : KIPI::Plugin( Factory::instance(), tqparent, "HelloWorld") + : KIPI::Plugin( Factory::instance(), parent, "HelloWorld") { kdDebug( 51001 ) << "Plugin_HelloWorld plugin loaded" << endl; } @@ -68,7 +68,7 @@ void Plugin_HelloWorld::setup( TQWidget* widget ) addAction( m_actionHelloWorld ); - m_interface = dynamic_cast< KIPI::Interface* >( tqparent() ); + m_interface = dynamic_cast< KIPI::Interface* >( parent() ); if ( !m_interface ) { diff --git a/kipi-plugins/helloworld/plugin_helloworld.h b/kipi-plugins/helloworld/plugin_helloworld.h index bf260da..c03ec39 100644 --- a/kipi-plugins/helloworld/plugin_helloworld.h +++ b/kipi-plugins/helloworld/plugin_helloworld.h @@ -36,10 +36,10 @@ class Plugin_HelloWorld : public KIPI::Plugin public: // Notice the constructor - // takes three arguments TQObject *tqparent (the tqparent of this object), + // takes three arguments TQObject *parent (the parent of this object), // const char* name (the name of this object) and // const TQStringList &args (the arguments passed). - Plugin_HelloWorld(TQObject *tqparent, + Plugin_HelloWorld(TQObject *parent, const char* name, const TQStringList &args); diff --git a/kipi-plugins/htmlexport/abstractthemeparameter.h b/kipi-plugins/htmlexport/abstractthemeparameter.h index 5127232..97d8a88 100644 --- a/kipi-plugins/htmlexport/abstractthemeparameter.h +++ b/kipi-plugins/htmlexport/abstractthemeparameter.h @@ -54,7 +54,7 @@ public: * This method should return a TQWidget representing the parameter, * initialized with value. */ - virtual TQWidget* createWidget(TQWidget* tqparent, const TQString& value) const = 0; + virtual TQWidget* createWidget(TQWidget* parent, const TQString& value) const = 0; /** * The opposite of createWidget: given a widget previously created with diff --git a/kipi-plugins/htmlexport/colorthemeparameter.cpp b/kipi-plugins/htmlexport/colorthemeparameter.cpp index 9df77e0..ad80719 100644 --- a/kipi-plugins/htmlexport/colorthemeparameter.cpp +++ b/kipi-plugins/htmlexport/colorthemeparameter.cpp @@ -31,8 +31,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA namespace KIPIHTMLExport { -TQWidget* ColorThemeParameter::createWidget(TQWidget* tqparent, const TQString& value) const { - KColorButton* button = new KColorButton(tqparent); +TQWidget* ColorThemeParameter::createWidget(TQWidget* parent, const TQString& value) const { + KColorButton* button = new KColorButton(parent); TQColor color(value); button->setColor(color); return button; diff --git a/kipi-plugins/htmlexport/colorthemeparameter.h b/kipi-plugins/htmlexport/colorthemeparameter.h index 5a62395..44dab93 100644 --- a/kipi-plugins/htmlexport/colorthemeparameter.h +++ b/kipi-plugins/htmlexport/colorthemeparameter.h @@ -36,7 +36,7 @@ namespace KIPIHTMLExport { */ class ColorThemeParameter : public AbstractThemeParameter { public: - virtual TQWidget* createWidget(TQWidget* tqparent, const TQString& value) const; + virtual TQWidget* createWidget(TQWidget* parent, const TQString& value) const; virtual TQString valueFromWidget(TQWidget*) const; }; diff --git a/kipi-plugins/htmlexport/intthemeparameter.cpp b/kipi-plugins/htmlexport/intthemeparameter.cpp index 87472bd..17388e2 100644 --- a/kipi-plugins/htmlexport/intthemeparameter.cpp +++ b/kipi-plugins/htmlexport/intthemeparameter.cpp @@ -59,8 +59,8 @@ void IntThemeParameter::init(const TQCString& internalName, const KConfigBase* c } -TQWidget* IntThemeParameter::createWidget(TQWidget* tqparent, const TQString& value) const { - TQSpinBox* spinBox = new TQSpinBox(tqparent); +TQWidget* IntThemeParameter::createWidget(TQWidget* parent, const TQString& value) const { + TQSpinBox* spinBox = new TQSpinBox(parent); spinBox->setValue(value.toInt()); spinBox->setMinValue(d->mMinValue); spinBox->setMaxValue(d->mMaxValue); diff --git a/kipi-plugins/htmlexport/intthemeparameter.h b/kipi-plugins/htmlexport/intthemeparameter.h index 802ccde..4aa354c 100644 --- a/kipi-plugins/htmlexport/intthemeparameter.h +++ b/kipi-plugins/htmlexport/intthemeparameter.h @@ -40,7 +40,7 @@ public: ~IntThemeParameter(); virtual void init(const TQCString& internalName, const KConfigBase* configFile); - virtual TQWidget* createWidget(TQWidget* tqparent, const TQString& value) const; + virtual TQWidget* createWidget(TQWidget* parent, const TQString& value) const; virtual TQString valueFromWidget(TQWidget*) const; private: diff --git a/kipi-plugins/htmlexport/listthemeparameter.cpp b/kipi-plugins/htmlexport/listthemeparameter.cpp index 7a49b6d..8bae470 100644 --- a/kipi-plugins/htmlexport/listthemeparameter.cpp +++ b/kipi-plugins/htmlexport/listthemeparameter.cpp @@ -63,8 +63,8 @@ void ListThemeParameter::init(const TQCString& internalName, const KConfigBase* } } -TQWidget* ListThemeParameter::createWidget(TQWidget* tqparent, const TQString& widgetDefaultValue) const { - TQComboBox* comboBox = new TQComboBox(tqparent); +TQWidget* ListThemeParameter::createWidget(TQWidget* parent, const TQString& widgetDefaultValue) const { + TQComboBox* comboBox = new TQComboBox(parent); TQStringList::ConstIterator it = d->mOrderedValueList.begin(), diff --git a/kipi-plugins/htmlexport/listthemeparameter.h b/kipi-plugins/htmlexport/listthemeparameter.h index eae31d8..8de2e1f 100644 --- a/kipi-plugins/htmlexport/listthemeparameter.h +++ b/kipi-plugins/htmlexport/listthemeparameter.h @@ -36,7 +36,7 @@ public: ~ListThemeParameter(); virtual void init(const TQCString& internalName, const KConfigBase* configFile); - virtual TQWidget* createWidget(TQWidget* tqparent, const TQString& value) const; + virtual TQWidget* createWidget(TQWidget* parent, const TQString& value) const; virtual TQString valueFromWidget(TQWidget*) const; private: diff --git a/kipi-plugins/htmlexport/plugin.cpp b/kipi-plugins/htmlexport/plugin.cpp index 659e10f..0fc8e76 100644 --- a/kipi-plugins/htmlexport/plugin.cpp +++ b/kipi-plugins/htmlexport/plugin.cpp @@ -49,8 +49,8 @@ struct Plugin::Private { }; -Plugin::Plugin(TQObject *tqparent, const char*, const TQStringList&) -: KIPI::Plugin(Factory::instance(), tqparent, "HTMLExport") +Plugin::Plugin(TQObject *parent, const char*, const TQStringList&) +: KIPI::Plugin(Factory::instance(), parent, "HTMLExport") { d=new Private; d->mAction=0; @@ -72,17 +72,17 @@ void Plugin::setup( TQWidget* widget ) { void Plugin::slotActivate() { - KIPI::Interface* interface = dynamic_cast< KIPI::Interface* >( tqparent() ); + KIPI::Interface* interface = dynamic_cast< KIPI::Interface* >( parent() ); Q_ASSERT(interface); GalleryInfo info; info.readConfig(); - TQWidget* tqparent=KApplication::kApplication()->mainWidget(); - Wizard wizard(tqparent, interface, &info); + TQWidget* parent=KApplication::kApplication()->mainWidget(); + Wizard wizard(parent, interface, &info); if (wizard.exec()==TQDialog::Rejected) return; info.writeConfig(); - KIPI::BatchProgressDialog* progressDialog=new KIPI::BatchProgressDialog(tqparent, i18n("Generating gallery...")); + KIPI::BatchProgressDialog* progressDialog=new KIPI::BatchProgressDialog(parent, i18n("Generating gallery...")); Generator generator(interface, &info, progressDialog); progressDialog->show(); diff --git a/kipi-plugins/htmlexport/plugin.h b/kipi-plugins/htmlexport/plugin.h index cab9e82..a29bf23 100644 --- a/kipi-plugins/htmlexport/plugin.h +++ b/kipi-plugins/htmlexport/plugin.h @@ -36,7 +36,7 @@ class Plugin : public KIPI::Plugin { TQ_OBJECT public: - Plugin(TQObject *tqparent, const char* name, const TQStringList &args); + Plugin(TQObject *parent, const char* name, const TQStringList &args); virtual ~Plugin(); KIPI::Category category( KAction* action ) const; diff --git a/kipi-plugins/htmlexport/stringthemeparameter.cpp b/kipi-plugins/htmlexport/stringthemeparameter.cpp index 8ad7f1c..1be630e 100644 --- a/kipi-plugins/htmlexport/stringthemeparameter.cpp +++ b/kipi-plugins/htmlexport/stringthemeparameter.cpp @@ -29,8 +29,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA namespace KIPIHTMLExport { -TQWidget* StringThemeParameter::createWidget(TQWidget* tqparent, const TQString& value) const { - TQLineEdit* edit = new TQLineEdit(tqparent); +TQWidget* StringThemeParameter::createWidget(TQWidget* parent, const TQString& value) const { + TQLineEdit* edit = new TQLineEdit(parent); edit->setText(value); return edit; diff --git a/kipi-plugins/htmlexport/stringthemeparameter.h b/kipi-plugins/htmlexport/stringthemeparameter.h index 26bbe6c..765bfe1 100644 --- a/kipi-plugins/htmlexport/stringthemeparameter.h +++ b/kipi-plugins/htmlexport/stringthemeparameter.h @@ -31,7 +31,7 @@ namespace KIPIHTMLExport { */ class StringThemeParameter : public AbstractThemeParameter { public: - virtual TQWidget* createWidget(TQWidget* tqparent, const TQString& value) const; + virtual TQWidget* createWidget(TQWidget* parent, const TQString& value) const; virtual TQString valueFromWidget(TQWidget*) const; }; diff --git a/kipi-plugins/htmlexport/wizard.cpp b/kipi-plugins/htmlexport/wizard.cpp index 6833f4c..acc7f6e 100644 --- a/kipi-plugins/htmlexport/wizard.cpp +++ b/kipi-plugins/htmlexport/wizard.cpp @@ -159,14 +159,14 @@ struct Wizard::Private { } // Add spacer at the end, so that widgets aren't spread on the whole - // tqparent height + // parent height TQSpacerItem* spacer = new TQSpacerItem(1, 1, TQSizePolicy::Minimum, TQSizePolicy::Expanding); tqlayout->addItem(spacer, tqlayout->numRows(), 0); } }; -Wizard::Wizard(TQWidget* tqparent, KIPI::Interface* interface, GalleryInfo* info) -: KWizard(tqparent) +Wizard::Wizard(TQWidget* parent, KIPI::Interface* interface, GalleryInfo* info) +: KWizard(parent) { d=new Private; d->mInfo=info; diff --git a/kipi-plugins/htmlexport/wizard.h b/kipi-plugins/htmlexport/wizard.h index d7e0bbd..f59358c 100644 --- a/kipi-plugins/htmlexport/wizard.h +++ b/kipi-plugins/htmlexport/wizard.h @@ -39,7 +39,7 @@ class Wizard : public KWizard { Q_OBJECT TQ_OBJECT public: - Wizard(TQWidget* tqparent, KIPI::Interface* interface, GalleryInfo* info); + Wizard(TQWidget* parent, KIPI::Interface* interface, GalleryInfo* info); ~Wizard(); protected slots: diff --git a/kipi-plugins/imageviewer/plugin_viewer.cpp b/kipi-plugins/imageviewer/plugin_viewer.cpp index b7f9c67..5e9b420 100644 --- a/kipi-plugins/imageviewer/plugin_viewer.cpp +++ b/kipi-plugins/imageviewer/plugin_viewer.cpp @@ -38,8 +38,8 @@ typedef KGenericFactory<Plugin_viewer> Factory; K_EXPORT_COMPONENT_FACTORY( kipiplugin_viewer, Factory("kipiplugin_viewer")) -Plugin_viewer::Plugin_viewer( TQObject *tqparent, const char* name, const TQStringList& ) - :KIPI::Plugin::Plugin( Factory::instance(), tqparent, name ) +Plugin_viewer::Plugin_viewer( TQObject *parent, const char* name, const TQStringList& ) + :KIPI::Plugin::Plugin( Factory::instance(), parent, name ) { kdDebug(51001) << "image viewer plugin loaded" << endl; } @@ -48,7 +48,7 @@ void Plugin_viewer::setup( TQWidget* widget ) { KIPI::Plugin::setup( widget ); - KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>( tqparent() ); + KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>( parent() ); if ( !interface ) { @@ -87,7 +87,7 @@ KIPI::Category Plugin_viewer::category( KAction* action ) const */ void Plugin_viewer::slotActivate() { - KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>( tqparent() ); + KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>( parent() ); if ( !interface ) { diff --git a/kipi-plugins/imageviewer/plugin_viewer.h b/kipi-plugins/imageviewer/plugin_viewer.h index 9ca7b23..ca4ecac 100644 --- a/kipi-plugins/imageviewer/plugin_viewer.h +++ b/kipi-plugins/imageviewer/plugin_viewer.h @@ -40,7 +40,7 @@ class Plugin_viewer :public KIPI::Plugin Q_OBJECT TQ_OBJECT public: - Plugin_viewer( TQObject *tqparent, const char* name, const TQStringList& ); + Plugin_viewer( TQObject *parent, const char* name, const TQStringList& ); virtual void setup( TQWidget* widget ); virtual KIPI::Category category( KAction* action ) const; diff --git a/kipi-plugins/ipodexport/imagelist.cpp b/kipi-plugins/ipodexport/imagelist.cpp index 5f534d4..940b920 100644 --- a/kipi-plugins/ipodexport/imagelist.cpp +++ b/kipi-plugins/ipodexport/imagelist.cpp @@ -27,8 +27,8 @@ using namespace IpodExport; ///////////////////////////////////////////////////////////////////////////////////////////// -ImageList::ImageList( ListType type, TQWidget *tqparent, const char *name ) - : KListView( tqparent, name ) +ImageList::ImageList( ListType type, TQWidget *parent, const char *name ) + : KListView( parent, name ) , m_type( type ) { if( type == ImageList::UploadType ) diff --git a/kipi-plugins/ipodexport/imagelist.h b/kipi-plugins/ipodexport/imagelist.h index 1d92a81..5b38aca 100644 --- a/kipi-plugins/ipodexport/imagelist.h +++ b/kipi-plugins/ipodexport/imagelist.h @@ -37,7 +37,7 @@ class ImageList : public KListView public: enum ListType { UploadType, IpodType }; - ImageList( ListType=UploadType, TQWidget *tqparent=0, const char *name=0 ); + ImageList( ListType=UploadType, TQWidget *parent=0, const char *name=0 ); ListType getType() const { return m_type; } diff --git a/kipi-plugins/ipodexport/imagelistitem.h b/kipi-plugins/ipodexport/imagelistitem.h index 388a995..8b9160a 100644 --- a/kipi-plugins/ipodexport/imagelistitem.h +++ b/kipi-plugins/ipodexport/imagelistitem.h @@ -29,8 +29,8 @@ namespace IpodExport { public: - ImageListItem( TQListView *tqparent, TQString const & pathSrc, TQString const & name ) - : KListViewItem( tqparent, TQString()/*set below*/, name ) + ImageListItem( TQListView *parent, TQString const & pathSrc, TQString const & name ) + : KListViewItem( parent, TQString()/*set below*/, name ) , m_pathSrc( pathSrc ) { setText( 0, pathSrc.section('/', -2, -2) ); diff --git a/kipi-plugins/ipodexport/ipodexportdialog.cpp b/kipi-plugins/ipodexport/ipodexportdialog.cpp index c6a4556..387f77d 100644 --- a/kipi-plugins/ipodexport/ipodexportdialog.cpp +++ b/kipi-plugins/ipodexport/ipodexportdialog.cpp @@ -57,9 +57,9 @@ UploadDialog::UploadDialog( #if KIPI_PLUGIN KIPI::Interface* interface, #endif - TQString caption, TQWidget *tqparent ) + TQString caption, TQWidget *parent ) : KDialogBase( KDialogBase::Plain, caption, /*Help|*/Close, - Cancel, tqparent, "TripodDialog", false, false ) + Cancel, parent, "TripodDialog", false, false ) #if KIPI_PLUGIN , m_interface( interface ) #endif @@ -506,7 +506,7 @@ bool UploadDialog::deleteIpodPhoto( IpodPhotoItem *photo ) if( !photo ) return false; - IpodAlbumItem *album = static_cast<IpodAlbumItem *>( photo->tqparent() ); + IpodAlbumItem *album = static_cast<IpodAlbumItem *>( photo->parent() ); if( !album ) return false; diff --git a/kipi-plugins/ipodexport/ipodexportdialog.h b/kipi-plugins/ipodexport/ipodexportdialog.h index ef43b75..a34a431 100644 --- a/kipi-plugins/ipodexport/ipodexportdialog.h +++ b/kipi-plugins/ipodexport/ipodexportdialog.h @@ -55,7 +55,7 @@ class UploadDialog : public KDialogBase #if KIPI_PLUGIN KIPI::Interface* interface, #endif - TQString caption, TQWidget *tqparent=0 ); + TQString caption, TQWidget *parent=0 ); ~UploadDialog() { diff --git a/kipi-plugins/ipodexport/ipodheader.cpp b/kipi-plugins/ipodexport/ipodheader.cpp index 432f734..9fbf092 100644 --- a/kipi-plugins/ipodexport/ipodheader.cpp +++ b/kipi-plugins/ipodexport/ipodheader.cpp @@ -22,8 +22,8 @@ using namespace IpodExport; -IpodHeader::IpodHeader( TQWidget *tqparent, const char *name, WFlags f ) - : TQFrame( tqparent, name, f ) +IpodHeader::IpodHeader( TQWidget *parent, const char *name, WFlags f ) + : TQFrame( parent, name, f ) { TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 10/*margin*/, 5/*spacing*/ ); diff --git a/kipi-plugins/ipodexport/ipodheader.h b/kipi-plugins/ipodexport/ipodheader.h index 8e9d53a..bd22bd7 100644 --- a/kipi-plugins/ipodexport/ipodheader.h +++ b/kipi-plugins/ipodexport/ipodheader.h @@ -28,7 +28,7 @@ class IpodHeader : public TQFrame TQ_OBJECT public: - IpodHeader( TQWidget *tqparent=0, const char *name=0, WFlags f=0 ); + IpodHeader( TQWidget *parent=0, const char *name=0, WFlags f=0 ); ~IpodHeader() { } enum ViewType { NoIpod, IncompatibleIpod, ValidIpod }; diff --git a/kipi-plugins/ipodexport/ipodlistitem.cpp b/kipi-plugins/ipodexport/ipodlistitem.cpp index 4fd15ce..3af8422 100644 --- a/kipi-plugins/ipodexport/ipodlistitem.cpp +++ b/kipi-plugins/ipodexport/ipodlistitem.cpp @@ -22,8 +22,8 @@ using namespace IpodExport; /// Class IpodAlbumItem //////////////////////////////////////////// -IpodAlbumItem::IpodAlbumItem( TQListView *tqparent, TQListViewItem *after, Itdb_PhotoAlbum *pa ) - : KListViewItem( tqparent, after ) +IpodAlbumItem::IpodAlbumItem( TQListView *parent, TQListViewItem *after, Itdb_PhotoAlbum *pa ) + : KListViewItem( parent, after ) , m_photoAlbum( pa ) { // don't use setName, as it writes to the ipod @@ -55,9 +55,9 @@ void IpodAlbumItem::setName( const TQString & name ) /// Class IpodPhotoItem //////////////////////////////////////////// -IpodPhotoItem::IpodPhotoItem( IpodAlbumItem *tqparent, IpodPhotoItem *after, +IpodPhotoItem::IpodPhotoItem( IpodAlbumItem *parent, IpodPhotoItem *after, Itdb_Artwork *art ) - : KListViewItem( tqparent, after ) + : KListViewItem( parent, after ) , m_artwork( art ) { } diff --git a/kipi-plugins/ipodexport/ipodlistitem.h b/kipi-plugins/ipodexport/ipodlistitem.h index a366b4b..04dfab1 100644 --- a/kipi-plugins/ipodexport/ipodlistitem.h +++ b/kipi-plugins/ipodexport/ipodlistitem.h @@ -26,7 +26,7 @@ namespace IpodExport class IpodAlbumItem : public KListViewItem { public: - IpodAlbumItem( TQListView *tqparent, TQListViewItem *after, Itdb_PhotoAlbum *pa ); + IpodAlbumItem( TQListView *parent, TQListViewItem *after, Itdb_PhotoAlbum *pa ); TQString name() const { return m_name; } Itdb_PhotoAlbum *photoAlbum() const { return m_photoAlbum; } @@ -42,7 +42,7 @@ namespace IpodExport class IpodPhotoItem : public KListViewItem { public: - IpodPhotoItem( IpodAlbumItem *tqparent, IpodPhotoItem *after, Itdb_Artwork *art ); + IpodPhotoItem( IpodAlbumItem *parent, IpodPhotoItem *after, Itdb_Artwork *art ); Itdb_Artwork *artwork() const { return m_artwork; } void setArtwork( Itdb_Artwork *art ); diff --git a/kipi-plugins/ipodexport/plugin_ipodexport.cpp b/kipi-plugins/ipodexport/plugin_ipodexport.cpp index 91e2ee8..2c4b240 100644 --- a/kipi-plugins/ipodexport/plugin_ipodexport.cpp +++ b/kipi-plugins/ipodexport/plugin_ipodexport.cpp @@ -36,8 +36,8 @@ typedef KGenericFactory<Plugin_iPodExport> Factory; K_EXPORT_COMPONENT_FACTORY( kipiplugin_ipodexport, Factory("kipiplugin_ipodexport")); -Plugin_iPodExport::Plugin_iPodExport( TQObject *tqparent, const char*, const TQStringList& ) - : KIPI::Plugin( Factory::instance(), tqparent, "iPodExport") +Plugin_iPodExport::Plugin_iPodExport( TQObject *parent, const char*, const TQStringList& ) + : KIPI::Plugin( Factory::instance(), parent, "iPodExport") { kdDebug( 51001 ) << "Plugin_iPodExport plugin loaded" << endl; @@ -54,7 +54,7 @@ void Plugin_iPodExport::setup( TQWidget* widget ) addAction( m_actionImageUpload ); - m_interface = dynamic_cast< KIPI::Interface* >( tqparent() ); + m_interface = dynamic_cast< KIPI::Interface* >( parent() ); } KIPI::Category Plugin_iPodExport::category( KAction* action ) const diff --git a/kipi-plugins/ipodexport/plugin_ipodexport.h b/kipi-plugins/ipodexport/plugin_ipodexport.h index d94af5c..80207a1 100644 --- a/kipi-plugins/ipodexport/plugin_ipodexport.h +++ b/kipi-plugins/ipodexport/plugin_ipodexport.h @@ -25,7 +25,7 @@ class Plugin_iPodExport : public KIPI::Plugin TQ_OBJECT public: - Plugin_iPodExport( TQObject *tqparent, const char* name, const TQStringList &args); + Plugin_iPodExport( TQObject *parent, const char* name, const TQStringList &args); ~Plugin_iPodExport() { } virtual KIPI::Category category( KAction* action ) const; diff --git a/kipi-plugins/jpeglossless/actionthread.cpp b/kipi-plugins/jpeglossless/actionthread.cpp index 660990f..60dd745 100644 --- a/kipi-plugins/jpeglossless/actionthread.cpp +++ b/kipi-plugins/jpeglossless/actionthread.cpp @@ -48,8 +48,8 @@ namespace KIPIJPEGLossLessPlugin { -ActionThread::ActionThread( KIPI::Interface* interface, TQObject *tqparent) - : TQThread(), m_parent(tqparent), m_interface( interface ) +ActionThread::ActionThread( KIPI::Interface* interface, TQObject *parent) + : TQThread(), m_parent(parent), m_interface( interface ) { } diff --git a/kipi-plugins/jpeglossless/actionthread.h b/kipi-plugins/jpeglossless/actionthread.h index fb81edf..a642e07 100644 --- a/kipi-plugins/jpeglossless/actionthread.h +++ b/kipi-plugins/jpeglossless/actionthread.h @@ -58,7 +58,7 @@ class ActionThread : public TQThread { public: - ActionThread( KIPI::Interface* interface, TQObject *tqparent); + ActionThread( KIPI::Interface* interface, TQObject *parent); ~ActionThread(); void rotate(const KURL::List& urlList, RotateAction val); diff --git a/kipi-plugins/jpeglossless/plugin_jpeglossless.cpp b/kipi-plugins/jpeglossless/plugin_jpeglossless.cpp index 959fe05..59ba4e0 100644 --- a/kipi-plugins/jpeglossless/plugin_jpeglossless.cpp +++ b/kipi-plugins/jpeglossless/plugin_jpeglossless.cpp @@ -59,8 +59,8 @@ typedef KGenericFactory<Plugin_JPEGLossless> Factory; K_EXPORT_COMPONENT_FACTORY( kipiplugin_jpeglossless, Factory("kipiplugin_jpeglossless")) -Plugin_JPEGLossless::Plugin_JPEGLossless(TQObject *tqparent, const char*, const TQStringList &) - : KIPI::Plugin( Factory::instance(), tqparent, "JPEGLossless") +Plugin_JPEGLossless::Plugin_JPEGLossless(TQObject *parent, const char*, const TQStringList &) + : KIPI::Plugin( Factory::instance(), parent, "JPEGLossless") { m_total = 0; m_current = 0; @@ -140,7 +140,7 @@ void Plugin_JPEGLossless::setup( TQWidget* widget ) addAction( m_action_FlipImage ); addAction( m_action_Convert2GrayScale ); - KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>( tqparent() ); + KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>( parent() ); if ( !interface ) { @@ -318,7 +318,7 @@ void Plugin_JPEGLossless::slotCancel() { m_thread->cancel(); - KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>( tqparent() ); + KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>( parent() ); if ( !interface ) { @@ -455,7 +455,7 @@ void Plugin_JPEGLossless::customEvent(TQCustomEvent *event) m_progressDlg = 0; } - KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>( tqparent() ); + KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>( parent() ); if ( !interface ) { @@ -484,7 +484,7 @@ KIPI::Category Plugin_JPEGLossless::category( KAction* action ) const KURL::List Plugin_JPEGLossless::images() { - KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>( tqparent() ); + KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>( parent() ); if ( !interface ) { diff --git a/kipi-plugins/jpeglossless/plugin_jpeglossless.h b/kipi-plugins/jpeglossless/plugin_jpeglossless.h index c718698..26445e2 100644 --- a/kipi-plugins/jpeglossless/plugin_jpeglossless.h +++ b/kipi-plugins/jpeglossless/plugin_jpeglossless.h @@ -47,7 +47,7 @@ class Plugin_JPEGLossless : public KIPI::Plugin public: - Plugin_JPEGLossless(TQObject *tqparent, const char* name, const TQStringList &args); + Plugin_JPEGLossless(TQObject *parent, const char* name, const TQStringList &args); ~Plugin_JPEGLossless(); virtual KIPI::Category category( KAction* action ) const; diff --git a/kipi-plugins/jpeglossless/utils.cpp b/kipi-plugins/jpeglossless/utils.cpp index 9f5f0f4..d96b57e 100644 --- a/kipi-plugins/jpeglossless/utils.cpp +++ b/kipi-plugins/jpeglossless/utils.cpp @@ -73,8 +73,8 @@ extern "C" namespace KIPIJPEGLossLessPlugin { -Utils::Utils(TQObject *tqparent) - : TQObject(tqparent) +Utils::Utils(TQObject *parent) + : TQObject(parent) { } diff --git a/kipi-plugins/jpeglossless/utils.h b/kipi-plugins/jpeglossless/utils.h index 43c10ac..7f27ed6 100644 --- a/kipi-plugins/jpeglossless/utils.h +++ b/kipi-plugins/jpeglossless/utils.h @@ -42,7 +42,7 @@ class Utils : public TQObject public: - Utils(TQObject *tqparent); + Utils(TQObject *parent); ~Utils(); bool updateMetadataImageMagick(const TQString& src, TQString& err); diff --git a/kipi-plugins/kameraklient/camerafolderitem.cpp b/kipi-plugins/kameraklient/camerafolderitem.cpp index 6ab0fa7..9f4c66c 100644 --- a/kipi-plugins/kameraklient/camerafolderitem.cpp +++ b/kipi-plugins/kameraklient/camerafolderitem.cpp @@ -27,14 +27,14 @@ namespace KIPIKameraKlientPlugin { -CameraFolderItem::CameraFolderItem(KListView* tqparent, const TQString& name) : KListViewItem(tqparent, name) { +CameraFolderItem::CameraFolderItem(KListView* parent, const TQString& name) : KListViewItem(parent, name) { setPixmap(0, SmallIcon("folder")); virtualFolder_ = true; count_ = 0; name_ = name; } -CameraFolderItem::CameraFolderItem(KListViewItem* tqparent, const TQString& folderName, const TQString& folderPath) : KListViewItem(tqparent, folderName) { +CameraFolderItem::CameraFolderItem(KListViewItem* parent, const TQString& folderName, const TQString& folderPath) : KListViewItem(parent, folderName) { setPixmap(0, SmallIcon("folder")); folderName_ = folderName; folderPath_ = folderPath; diff --git a/kipi-plugins/kameraklient/camerafolderitem.h b/kipi-plugins/kameraklient/camerafolderitem.h index 17eb0cc..f3c88da 100644 --- a/kipi-plugins/kameraklient/camerafolderitem.h +++ b/kipi-plugins/kameraklient/camerafolderitem.h @@ -30,8 +30,8 @@ namespace KIPIKameraKlientPlugin class CameraFolderItem : public KListViewItem { public: - CameraFolderItem(KListView* tqparent, const TQString& name); - CameraFolderItem(KListViewItem* tqparent, const TQString& folderName, const TQString& folderPath); + CameraFolderItem(KListView* parent, const TQString& name); + CameraFolderItem(KListViewItem* parent, const TQString& folderName, const TQString& folderPath); ~CameraFolderItem(); TQString folderName(); TQString folderPath(); diff --git a/kipi-plugins/kameraklient/camerafolderview.cpp b/kipi-plugins/kameraklient/camerafolderview.cpp index 8357ca3..6c8d48e 100644 --- a/kipi-plugins/kameraklient/camerafolderview.cpp +++ b/kipi-plugins/kameraklient/camerafolderview.cpp @@ -29,7 +29,7 @@ namespace KIPIKameraKlientPlugin { -CameraFolderView::CameraFolderView(TQWidget* tqparent) : KListView(tqparent) { +CameraFolderView::CameraFolderView(TQWidget* parent) : KListView(parent) { addColumn(i18n("Camera Folders")); setFullWidth(true); setDragEnabled(false); diff --git a/kipi-plugins/kameraklient/camerafolderview.h b/kipi-plugins/kameraklient/camerafolderview.h index 9940c20..416ea1c 100644 --- a/kipi-plugins/kameraklient/camerafolderview.h +++ b/kipi-plugins/kameraklient/camerafolderview.h @@ -37,7 +37,7 @@ class CameraFolderView : public KListView { TQ_OBJECT public: - CameraFolderView(TQWidget* tqparent); + CameraFolderView(TQWidget* parent); ~CameraFolderView(); void addVirtualFolder(const TQString& name); void addRootFolder(const TQString& folder); diff --git a/kipi-plugins/kameraklient/cameraiconitem.cpp b/kipi-plugins/kameraklient/cameraiconitem.cpp index 1bca459..b41085f 100644 --- a/kipi-plugins/kameraklient/cameraiconitem.cpp +++ b/kipi-plugins/kameraklient/cameraiconitem.cpp @@ -60,8 +60,8 @@ const char* CameraIconItem::new_xpm[] = { TQPixmap* CameraIconItem::newEmblem = 0; -CameraIconItem::CameraIconItem(ThumbView* tqparent, const GPFileItemInfo* fileInfo, const TQPixmap& pixmap) - : ThumbItem(tqparent, fileInfo->name, pixmap), fileInfo_(fileInfo) { +CameraIconItem::CameraIconItem(ThumbView* parent, const GPFileItemInfo* fileInfo, const TQPixmap& pixmap) + : ThumbItem(parent, fileInfo->name, pixmap), fileInfo_(fileInfo) { pixWidth_ = pixmap.width(); pixHeight_ = pixmap.height(); loadNewEmblem(); diff --git a/kipi-plugins/kameraklient/cameraiconitem.h b/kipi-plugins/kameraklient/cameraiconitem.h index 63d7924..efe14f5 100644 --- a/kipi-plugins/kameraklient/cameraiconitem.h +++ b/kipi-plugins/kameraklient/cameraiconitem.h @@ -40,7 +40,7 @@ class CameraIconItem : public ThumbItem { friend class CameraIconView; public: - CameraIconItem(ThumbView* tqparent, const GPFileItemInfo* fileInfo, const TQPixmap& pixmap); + CameraIconItem(ThumbView* parent, const GPFileItemInfo* fileInfo, const TQPixmap& pixmap); ~CameraIconItem(); const GPFileItemInfo* fileInfo(); void setPixmap(const TQImage& thumb); diff --git a/kipi-plugins/kameraklient/cameraiconview.cpp b/kipi-plugins/kameraklient/cameraiconview.cpp index 6cf6f70..0ff21f9 100644 --- a/kipi-plugins/kameraklient/cameraiconview.cpp +++ b/kipi-plugins/kameraklient/cameraiconview.cpp @@ -56,7 +56,7 @@ public: TQPixmap unknownPix; }; -CameraIconView::CameraIconView(TQWidget *tqparent) : ThumbView(tqparent) { +CameraIconView::CameraIconView(TQWidget *parent) : ThumbView(parent) { d = new CameraIconViewPrivate; setThumbnailSize(); } diff --git a/kipi-plugins/kameraklient/cameraiconview.h b/kipi-plugins/kameraklient/cameraiconview.h index 953ec1c..3ec050e 100644 --- a/kipi-plugins/kameraklient/cameraiconview.h +++ b/kipi-plugins/kameraklient/cameraiconview.h @@ -43,7 +43,7 @@ class CameraIconView : public ThumbView { TQ_OBJECT public: - CameraIconView(TQWidget *tqparent); + CameraIconView(TQWidget *parent); ~CameraIconView(); void setThumbnailSize(); CameraIconItem* addItem(const GPFileItemInfo* fileInfo); diff --git a/kipi-plugins/kameraklient/cameralist.cpp b/kipi-plugins/kameraklient/cameralist.cpp index 46897eb..455ba26 100644 --- a/kipi-plugins/kameraklient/cameralist.cpp +++ b/kipi-plugins/kameraklient/cameralist.cpp @@ -44,7 +44,7 @@ class CameraListPrivate { bool modified; }; -CameraList::CameraList(TQObject *tqparent, const TQString& file) : TQObject(tqparent) { +CameraList::CameraList(TQObject *parent, const TQString& file) : TQObject(parent) { d = new CameraListPrivate; d->clist.setAutoDelete(true); d->file = file; diff --git a/kipi-plugins/kameraklient/cameralist.h b/kipi-plugins/kameraklient/cameralist.h index 4b624a3..2a852eb 100644 --- a/kipi-plugins/kameraklient/cameralist.h +++ b/kipi-plugins/kameraklient/cameralist.h @@ -38,7 +38,7 @@ class CameraList : public TQObject { TQ_OBJECT public: - CameraList(TQObject *tqparent, const TQString& file); + CameraList(TQObject *parent, const TQString& file); ~CameraList(); bool load(); bool close(); diff --git a/kipi-plugins/kameraklient/cameraselection.cpp b/kipi-plugins/kameraklient/cameraselection.cpp index 183ddb9..79439fe 100644 --- a/kipi-plugins/kameraklient/cameraselection.cpp +++ b/kipi-plugins/kameraklient/cameraselection.cpp @@ -51,8 +51,8 @@ namespace KIPIKameraKlientPlugin { -CameraSelection::CameraSelection(TQWidget* tqparent) - : KDialogBase(tqparent, 0, true, i18n("Camera Selection"), +CameraSelection::CameraSelection(TQWidget* parent) + : KDialogBase(parent, 0, true, i18n("Camera Selection"), Help|Ok|Cancel, Ok, true) { // About data and help button. diff --git a/kipi-plugins/kameraklient/cameraselection.h b/kipi-plugins/kameraklient/cameraselection.h index d632a36..bc15f5c 100644 --- a/kipi-plugins/kameraklient/cameraselection.h +++ b/kipi-plugins/kameraklient/cameraselection.h @@ -48,7 +48,7 @@ class CameraSelection : public KDialogBase public: - CameraSelection( TQWidget* tqparent = 0 ); + CameraSelection( TQWidget* parent = 0 ); ~CameraSelection(); void setCamera(const TQString& model, const TQString& port); diff --git a/kipi-plugins/kameraklient/gpcontroller.cpp b/kipi-plugins/kameraklient/gpcontroller.cpp index ce209ec..7f59c08 100644 --- a/kipi-plugins/kameraklient/gpcontroller.cpp +++ b/kipi-plugins/kameraklient/gpcontroller.cpp @@ -43,8 +43,8 @@ namespace KIPIKameraKlientPlugin { -GPController::GPController(TQObject *tqparent, const CameraType& ctype) : TQObject(tqparent) { - parent_ = tqparent; +GPController::GPController(TQObject *parent, const CameraType& ctype) : TQObject(parent) { + parent_ = parent; camera_ = new GPCamera(TQString(ctype.model().latin1()), TQString(ctype.port().latin1())); close_ = false; connect(GPMessages::gpMessagesWrapper(), TQT_SIGNAL(statusChanged(const TQString&)), diff --git a/kipi-plugins/kameraklient/gpcontroller.h b/kipi-plugins/kameraklient/gpcontroller.h index d925251..7234492 100644 --- a/kipi-plugins/kameraklient/gpcontroller.h +++ b/kipi-plugins/kameraklient/gpcontroller.h @@ -43,7 +43,7 @@ class GPController : public TQObject, public TQThread { TQ_OBJECT public: - GPController(TQObject *tqparent, const CameraType& ctype); + GPController(TQObject *parent, const CameraType& ctype); ~GPController(); void requestInitialize(); diff --git a/kipi-plugins/kameraklient/gpeventfilter.cpp b/kipi-plugins/kameraklient/gpeventfilter.cpp index 2efc582..30ae6ae 100644 --- a/kipi-plugins/kameraklient/gpeventfilter.cpp +++ b/kipi-plugins/kameraklient/gpeventfilter.cpp @@ -29,10 +29,10 @@ namespace KIPIKameraKlientPlugin { -GPEventFilter::GPEventFilter(TQObject* tqparent) - : TQObject(tqparent) { - tqparent->installEventFilter(this); - view_ = static_cast<CameraUI *>(TQT_TQWIDGET(tqparent)); +GPEventFilter::GPEventFilter(TQObject* parent) + : TQObject(parent) { + parent->installEventFilter(this); + view_ = static_cast<CameraUI *>(TQT_TQWIDGET(parent)); } GPEventFilter::~GPEventFilter() { diff --git a/kipi-plugins/kameraklient/gpeventfilter.h b/kipi-plugins/kameraklient/gpeventfilter.h index b415c5b..643eac3 100644 --- a/kipi-plugins/kameraklient/gpeventfilter.h +++ b/kipi-plugins/kameraklient/gpeventfilter.h @@ -40,7 +40,7 @@ class GPEventFilter : public TQObject { TQ_OBJECT public: - GPEventFilter(TQObject *tqparent); + GPEventFilter(TQObject *parent); ~GPEventFilter(); protected: diff --git a/kipi-plugins/kameraklient/gpfileitemcontainer.cpp b/kipi-plugins/kameraklient/gpfileitemcontainer.cpp index 1fd3cf3..91077cb 100644 --- a/kipi-plugins/kameraklient/gpfileitemcontainer.cpp +++ b/kipi-plugins/kameraklient/gpfileitemcontainer.cpp @@ -33,7 +33,7 @@ namespace KIPIKameraKlientPlugin { -GPFileItemContainer::GPFileItemContainer(TQObject *tqparent, CameraFolderView *folderView, CameraIconView *iconView) : TQObject(tqparent) { +GPFileItemContainer::GPFileItemContainer(TQObject *parent, CameraFolderView *folderView, CameraIconView *iconView) : TQObject(parent) { folderView_ = folderView; iconView_ = iconView; folderDict_.setAutoDelete(true); diff --git a/kipi-plugins/kameraklient/gpfileitemcontainer.h b/kipi-plugins/kameraklient/gpfileitemcontainer.h index 8c84301..b7e4311 100644 --- a/kipi-plugins/kameraklient/gpfileitemcontainer.h +++ b/kipi-plugins/kameraklient/gpfileitemcontainer.h @@ -44,7 +44,7 @@ class GPFileItemContainer : public TQObject { TQ_OBJECT public: - GPFileItemContainer(TQObject *tqparent, CameraFolderView *folderView, CameraIconView *iconView); + GPFileItemContainer(TQObject *parent, CameraFolderView *folderView, CameraIconView *iconView); ~GPFileItemContainer(); void addVirtualFolder(const TQString& title); diff --git a/kipi-plugins/kameraklient/kameraklient.cpp b/kipi-plugins/kameraklient/kameraklient.cpp index f62216b..597d176 100644 --- a/kipi-plugins/kameraklient/kameraklient.cpp +++ b/kipi-plugins/kameraklient/kameraklient.cpp @@ -39,8 +39,8 @@ typedef KGenericFactory<Plugin_KameraKlient> Factory; K_EXPORT_COMPONENT_FACTORY(kipiplugin_kameraklient, Factory("kipiplugin_kameraklient")) -Plugin_KameraKlient::Plugin_KameraKlient(TQObject *tqparent, const char*, const TQStringList&) - : KIPI::Plugin(Factory::instance(), tqparent, "KameraKlient") { +Plugin_KameraKlient::Plugin_KameraKlient(TQObject *parent, const char*, const TQStringList&) + : KIPI::Plugin(Factory::instance(), parent, "KameraKlient") { kdDebug() << "KameraKlient KIPI Plugin loaded" << endl; } diff --git a/kipi-plugins/kameraklient/kameraklient.h b/kipi-plugins/kameraklient/kameraklient.h index 0bc2cb2..9e4ca1a 100644 --- a/kipi-plugins/kameraklient/kameraklient.h +++ b/kipi-plugins/kameraklient/kameraklient.h @@ -35,7 +35,7 @@ Q_OBJECT TQ_OBJECT public: - Plugin_KameraKlient(TQObject *tqparent, const char* name, const TQStringList& args); + Plugin_KameraKlient(TQObject *parent, const char* name, const TQStringList& args); ~Plugin_KameraKlient(); virtual void setup(TQWidget* widget); virtual KIPI::Category category(KAction*) const; diff --git a/kipi-plugins/kameraklient/savefiledialog.cpp b/kipi-plugins/kameraklient/savefiledialog.cpp index e5f2109..a050f01 100644 --- a/kipi-plugins/kameraklient/savefiledialog.cpp +++ b/kipi-plugins/kameraklient/savefiledialog.cpp @@ -31,7 +31,7 @@ namespace KIPIKameraKlientPlugin { -SavefileDialog::SavefileDialog(const TQString& file, TQWidget *tqparent, const char* name, bool modal) : TQDialog(tqparent, name, modal) { +SavefileDialog::SavefileDialog(const TQString& file, TQWidget *parent, const char* name, bool modal) : TQDialog(parent, name, modal) { TQFileInfo fileInfo(file); setCaption(i18n("File Already Exists")); TQLabel *descLbl = new TQLabel(i18n("The file '%1' already exists!").tqarg(fileInfo.absFilePath()), this); diff --git a/kipi-plugins/kameraklient/savefiledialog.h b/kipi-plugins/kameraklient/savefiledialog.h index a1233e9..eabfefd 100644 --- a/kipi-plugins/kameraklient/savefiledialog.h +++ b/kipi-plugins/kameraklient/savefiledialog.h @@ -32,7 +32,7 @@ Q_OBJECT public: enum Operation { Rename, Skip, SkipAll, Overwrite, OverwriteAll, None }; - SavefileDialog(const TQString& file, TQWidget *tqparent=0, const char* name=0, bool modal=true); + SavefileDialog(const TQString& file, TQWidget *parent=0, const char* name=0, bool modal=true); ~SavefileDialog(); Operation saveFileOperation(); TQString renameFile(); diff --git a/kipi-plugins/kameraklient/setupcamera.cpp b/kipi-plugins/kameraklient/setupcamera.cpp index 4ad2cc3..1ebad16 100644 --- a/kipi-plugins/kameraklient/setupcamera.cpp +++ b/kipi-plugins/kameraklient/setupcamera.cpp @@ -56,8 +56,8 @@ namespace KIPIKameraKlientPlugin { -SetupCamera::SetupCamera(TQWidget* tqparent, const char* name) - : KDialogBase(tqparent, name, true, i18n("Setup Cameras"), +SetupCamera::SetupCamera(TQWidget* parent, const char* name) + : KDialogBase(parent, name, true, i18n("Setup Cameras"), Help|Ok|Cancel, Ok, true) { // About data and help button. diff --git a/kipi-plugins/kameraklient/setupcamera.h b/kipi-plugins/kameraklient/setupcamera.h index a6a36e7..b9d6040 100644 --- a/kipi-plugins/kameraklient/setupcamera.h +++ b/kipi-plugins/kameraklient/setupcamera.h @@ -44,7 +44,7 @@ class SetupCamera : public KDialogBase public: - SetupCamera(TQWidget* tqparent = 0, const char* name = 0); + SetupCamera(TQWidget* parent = 0, const char* name = 0); ~SetupCamera(); void applySettings(); diff --git a/kipi-plugins/kameraklient/thumbitem.cpp b/kipi-plugins/kameraklient/thumbitem.cpp index 5809fc5..72dbd54 100644 --- a/kipi-plugins/kameraklient/thumbitem.cpp +++ b/kipi-plugins/kameraklient/thumbitem.cpp @@ -31,7 +31,7 @@ namespace KIPIKameraKlientPlugin class ThumbItemLineEdit : public TQTextEdit { public: - ThumbItemLineEdit(const TQString& text, TQWidget* tqparent, ThumbItem* item); + ThumbItemLineEdit(const TQString& text, TQWidget* parent, ThumbItem* item); private: void keyPressEvent(TQKeyEvent *e); @@ -40,8 +40,8 @@ private: TQString startText; }; -ThumbItemLineEdit::ThumbItemLineEdit(const TQString& text, TQWidget* tqparent, ThumbItem* item) - : TQTextEdit(tqparent), thumbItem(item), startText(text) { +ThumbItemLineEdit::ThumbItemLineEdit(const TQString& text, TQWidget* parent, ThumbItem* item) + : TQTextEdit(parent), thumbItem(item), startText(text) { setFrameStyle(TQFrame::Plain | TQFrame::Box); setLineWidth(1); @@ -88,8 +88,8 @@ class ThumbItemPrivate { TQString key; }; -ThumbItem::ThumbItem(ThumbView* tqparent, const TQString& text, const TQPixmap& pixmap) { - view = tqparent; +ThumbItem::ThumbItem(ThumbView* parent, const TQString& text, const TQPixmap& pixmap) { + view = parent; next = 0; prev = 0; renameBox = 0; diff --git a/kipi-plugins/kameraklient/thumbitem.h b/kipi-plugins/kameraklient/thumbitem.h index 806c0be..3587476 100644 --- a/kipi-plugins/kameraklient/thumbitem.h +++ b/kipi-plugins/kameraklient/thumbitem.h @@ -37,7 +37,7 @@ class ThumbItem { public: - ThumbItem(ThumbView* tqparent, + ThumbItem(ThumbView* parent, const TQString& text, const TQPixmap& pixmap); virtual ~ThumbItem(); diff --git a/kipi-plugins/kameraklient/thumbview.cpp b/kipi-plugins/kameraklient/thumbview.cpp index 361a9b0..cca8ee6 100644 --- a/kipi-plugins/kameraklient/thumbview.cpp +++ b/kipi-plugins/kameraklient/thumbview.cpp @@ -92,7 +92,7 @@ static int cmpItems( const void *n1, const void *n2 ) { } -ThumbView::ThumbView(TQWidget* tqparent, const char* name, WFlags fl) : TQScrollView(tqparent, name, TQt::WStaticContents | fl) { +ThumbView::ThumbView(TQWidget* parent, const char* name, WFlags fl) : TQScrollView(parent, name, TQt::WStaticContents | fl) { setBackgroundMode(TQt::NoBackground); viewport()->setBackgroundMode(TQt::NoBackground); viewport()->setFocusProxy(this); diff --git a/kipi-plugins/kameraklient/thumbview.h b/kipi-plugins/kameraklient/thumbview.h index cb7ce0d..d7840c1 100644 --- a/kipi-plugins/kameraklient/thumbview.h +++ b/kipi-plugins/kameraklient/thumbview.h @@ -39,7 +39,7 @@ class ThumbView : public TQScrollView { public: - ThumbView(TQWidget* tqparent=0, const char* name=0, + ThumbView(TQWidget* parent=0, const char* name=0, WFlags fl=0); ~ThumbView(); diff --git a/kipi-plugins/metadataedit/commenteditdialog.cpp b/kipi-plugins/metadataedit/commenteditdialog.cpp index 8082632..9d4fc87 100644 --- a/kipi-plugins/metadataedit/commenteditdialog.cpp +++ b/kipi-plugins/metadataedit/commenteditdialog.cpp @@ -73,10 +73,10 @@ public: KIPIPlugins::KPAboutData *about; }; -CommentEditDialog::CommentEditDialog(TQWidget* tqparent) +CommentEditDialog::CommentEditDialog(TQWidget* parent) : KDialogBase(Plain, i18n("Edit Image Caption"), Help|Ok|Cancel, Ok, - tqparent, 0, true, true) + parent, 0, true, true) { d = new CommentEditDialogDialogPrivate; diff --git a/kipi-plugins/metadataedit/commenteditdialog.h b/kipi-plugins/metadataedit/commenteditdialog.h index 280d6db..cb68d6d 100644 --- a/kipi-plugins/metadataedit/commenteditdialog.h +++ b/kipi-plugins/metadataedit/commenteditdialog.h @@ -43,7 +43,7 @@ class CommentEditDialog : public KDialogBase public: - CommentEditDialog(TQWidget* tqparent); + CommentEditDialog(TQWidget* parent); ~CommentEditDialog(); bool syncJFIFCommentIsChecked(); diff --git a/kipi-plugins/metadataedit/commentremovedialog.cpp b/kipi-plugins/metadataedit/commentremovedialog.cpp index 4e6b271..86f6fdd 100644 --- a/kipi-plugins/metadataedit/commentremovedialog.cpp +++ b/kipi-plugins/metadataedit/commentremovedialog.cpp @@ -71,10 +71,10 @@ public: KIPIPlugins::KPAboutData *about; }; -CommentRemoveDialog::CommentRemoveDialog(TQWidget* tqparent) +CommentRemoveDialog::CommentRemoveDialog(TQWidget* parent) : KDialogBase(Plain, i18n("Remove Image Captions"), Help|Ok|Cancel, Ok, - tqparent, 0, true, true) + parent, 0, true, true) { d = new CommentRemoveDialogDialogPrivate; diff --git a/kipi-plugins/metadataedit/commentremovedialog.h b/kipi-plugins/metadataedit/commentremovedialog.h index 2506364..78ffc37 100644 --- a/kipi-plugins/metadataedit/commentremovedialog.h +++ b/kipi-plugins/metadataedit/commentremovedialog.h @@ -39,7 +39,7 @@ class CommentRemoveDialog : public KDialogBase public: - CommentRemoveDialog(TQWidget* tqparent); + CommentRemoveDialog(TQWidget* parent); ~CommentRemoveDialog(); bool removeHOSTCommentIsChecked(); diff --git a/kipi-plugins/metadataedit/exifadjust.cpp b/kipi-plugins/metadataedit/exifadjust.cpp index aad43f8..553b630 100644 --- a/kipi-plugins/metadataedit/exifadjust.cpp +++ b/kipi-plugins/metadataedit/exifadjust.cpp @@ -87,17 +87,17 @@ public: MetadataCheckBox *customRenderedCheck; }; -EXIFAdjust::EXIFAdjust(TQWidget* tqparent) - : TQWidget(tqparent) +EXIFAdjust::EXIFAdjust(TQWidget* parent) + : TQWidget(parent) { d = new EXIFAdjustPriv; - TQGridLayout* grid = new TQGridLayout(tqparent, 6, 2, KDialog::spacingHint()); + TQGridLayout* grid = new TQGridLayout(parent, 6, 2, KDialog::spacingHint()); // -------------------------------------------------------- - d->brightnessCheck = new TQCheckBox(i18n("Brightness (APEX):"), tqparent); - d->brightnessEdit = new KDoubleSpinBox(-99.99, 99.99, 0.1, 0.0, 2, tqparent); + d->brightnessCheck = new TQCheckBox(i18n("Brightness (APEX):"), parent); + d->brightnessEdit = new KDoubleSpinBox(-99.99, 99.99, 0.1, 0.0, 2, parent); grid->addMultiCellWidget(d->brightnessCheck, 0, 0, 0, 0); grid->addMultiCellWidget(d->brightnessEdit, 0, 0, 2, 2); TQWhatsThis::add(d->brightnessEdit, i18n("<p>Set here the brightness adjustment value in APEX unit " @@ -105,8 +105,8 @@ EXIFAdjust::EXIFAdjust(TQWidget* tqparent) // -------------------------------------------------------- - d->gainControlCheck = new MetadataCheckBox(i18n("Gain Control:"), tqparent); - d->gainControlCB = new TQComboBox(false, tqparent); + d->gainControlCheck = new MetadataCheckBox(i18n("Gain Control:"), parent); + d->gainControlCB = new TQComboBox(false, parent); d->gainControlCB->insertItem(i18n("None"), 0); d->gainControlCB->insertItem(i18n("Low gain up"), 1); d->gainControlCB->insertItem(i18n("High gain up"), 2); @@ -119,8 +119,8 @@ EXIFAdjust::EXIFAdjust(TQWidget* tqparent) // -------------------------------------------------------- - d->contrastCheck = new MetadataCheckBox(i18n("Contrast:"), tqparent); - d->contrastCB = new TQComboBox(false, tqparent); + d->contrastCheck = new MetadataCheckBox(i18n("Contrast:"), parent); + d->contrastCB = new TQComboBox(false, parent); d->contrastCB->insertItem(i18n("Normal"), 0); d->contrastCB->insertItem(i18n("Soft"), 1); d->contrastCB->insertItem(i18n("Hard"), 2); @@ -131,8 +131,8 @@ EXIFAdjust::EXIFAdjust(TQWidget* tqparent) // -------------------------------------------------------- - d->saturationCheck = new MetadataCheckBox(i18n("Saturation:"), tqparent); - d->saturationCB = new TQComboBox(false, tqparent); + d->saturationCheck = new MetadataCheckBox(i18n("Saturation:"), parent); + d->saturationCB = new TQComboBox(false, parent); d->saturationCB->insertItem(i18n("Normal"), 0); d->saturationCB->insertItem(i18n("Low"), 1); d->saturationCB->insertItem(i18n("High"), 2); @@ -143,8 +143,8 @@ EXIFAdjust::EXIFAdjust(TQWidget* tqparent) // -------------------------------------------------------- - d->sharpnessCheck = new MetadataCheckBox(i18n("Sharpness:"), tqparent); - d->sharpnessCB = new TQComboBox(false, tqparent); + d->sharpnessCheck = new MetadataCheckBox(i18n("Sharpness:"), parent); + d->sharpnessCB = new TQComboBox(false, parent); d->sharpnessCB->insertItem(i18n("Normal"), 0); d->sharpnessCB->insertItem(i18n("Soft"), 1); d->sharpnessCB->insertItem(i18n("Hard"), 2); @@ -155,8 +155,8 @@ EXIFAdjust::EXIFAdjust(TQWidget* tqparent) // -------------------------------------------------------- - d->customRenderedCheck = new MetadataCheckBox(i18n("Custom rendered:"), tqparent); - d->customRenderedCB = new TQComboBox(false, tqparent); + d->customRenderedCheck = new MetadataCheckBox(i18n("Custom rendered:"), parent); + d->customRenderedCB = new TQComboBox(false, parent); d->customRenderedCB->insertItem(i18n("Normal process"), 0); d->customRenderedCB->insertItem(i18n("Custom process"), 1); grid->addMultiCellWidget(d->customRenderedCheck, 5, 5, 0, 0); diff --git a/kipi-plugins/metadataedit/exifadjust.h b/kipi-plugins/metadataedit/exifadjust.h index 1acabaf..02ffd78 100644 --- a/kipi-plugins/metadataedit/exifadjust.h +++ b/kipi-plugins/metadataedit/exifadjust.h @@ -40,7 +40,7 @@ class EXIFAdjust : public TQWidget public: - EXIFAdjust(TQWidget* tqparent); + EXIFAdjust(TQWidget* parent); ~EXIFAdjust(); void applyMetadata(TQByteArray& exifData); diff --git a/kipi-plugins/metadataedit/exifcaption.cpp b/kipi-plugins/metadataedit/exifcaption.cpp index b41ac1b..0bcd96e 100644 --- a/kipi-plugins/metadataedit/exifcaption.cpp +++ b/kipi-plugins/metadataedit/exifcaption.cpp @@ -91,11 +91,11 @@ public: KLineEdit *copyrightEdit; }; -EXIFCaption::EXIFCaption(TQWidget* tqparent) - : TQWidget(tqparent) +EXIFCaption::EXIFCaption(TQWidget* parent) + : TQWidget(parent) { d = new EXIFCaptionPriv; - TQVBoxLayout *vlay = new TQVBoxLayout( tqparent, 0, KDialog::spacingHint() ); + TQVBoxLayout *vlay = new TQVBoxLayout( parent, 0, KDialog::spacingHint() ); // EXIF only accept printable Ascii char. TQRegExp asciiRx("[\x20-\x7F]+$"); @@ -103,8 +103,8 @@ EXIFCaption::EXIFCaption(TQWidget* tqparent) // -------------------------------------------------------- - d->documentNameCheck = new TQCheckBox(i18n("Document name (*):"), tqparent); - d->documentNameEdit = new KLineEdit(tqparent); + d->documentNameCheck = new TQCheckBox(i18n("Document name (*):"), parent); + d->documentNameEdit = new KLineEdit(parent); d->documentNameEdit->setValidator(asciiValidator); vlay->addWidget(d->documentNameCheck); vlay->addWidget(d->documentNameEdit); @@ -114,8 +114,8 @@ EXIFCaption::EXIFCaption(TQWidget* tqparent) // -------------------------------------------------------- - d->imageDescCheck = new TQCheckBox(i18n("Image description (*):"), tqparent); - d->imageDescEdit = new KLineEdit(tqparent); + d->imageDescCheck = new TQCheckBox(i18n("Image description (*):"), parent); + d->imageDescEdit = new KLineEdit(parent); d->imageDescEdit->setValidator(asciiValidator); vlay->addWidget(d->imageDescCheck); vlay->addWidget(d->imageDescEdit); @@ -124,8 +124,8 @@ EXIFCaption::EXIFCaption(TQWidget* tqparent) // -------------------------------------------------------- - d->artistCheck = new TQCheckBox(i18n("Artist (*):"), tqparent); - d->artistEdit = new KLineEdit(tqparent); + d->artistCheck = new TQCheckBox(i18n("Artist (*):"), parent); + d->artistEdit = new KLineEdit(parent); d->artistEdit->setValidator(asciiValidator); vlay->addWidget(d->artistCheck); vlay->addWidget(d->artistEdit); @@ -134,8 +134,8 @@ EXIFCaption::EXIFCaption(TQWidget* tqparent) // -------------------------------------------------------- - d->copyrightCheck = new TQCheckBox(i18n("Copyright (*):"), tqparent); - d->copyrightEdit = new KLineEdit(tqparent); + d->copyrightCheck = new TQCheckBox(i18n("Copyright (*):"), parent); + d->copyrightEdit = new KLineEdit(parent); d->copyrightEdit->setValidator(asciiValidator); vlay->addWidget(d->copyrightCheck); vlay->addWidget(d->copyrightEdit); @@ -144,18 +144,18 @@ EXIFCaption::EXIFCaption(TQWidget* tqparent) // -------------------------------------------------------- - d->userCommentCheck = new TQCheckBox(i18n("Caption:"), tqparent); - d->userCommentEdit = new KTextEdit(tqparent); + d->userCommentCheck = new TQCheckBox(i18n("Caption:"), parent); + d->userCommentEdit = new KTextEdit(parent); TQWhatsThis::add(d->userCommentEdit, i18n("<p>Enter the image's caption. " "This field is not limited. UTF8 encoding " "will be used to save the text.")); d->syncHOSTCommentCheck = new TQCheckBox(i18n("Sync captions entered through %1") .tqarg(KApplication::kApplication()->aboutData()->appName()), - tqparent); - d->syncJFIFCommentCheck = new TQCheckBox(i18n("Sync JFIF Comment section"), tqparent); + parent); + d->syncJFIFCommentCheck = new TQCheckBox(i18n("Sync JFIF Comment section"), parent); d->syncIPTCCaptionCheck = new TQCheckBox(i18n("Sync IPTC caption (warning: limited to 2000 printable " - "Ascii characters set)"), tqparent); + "Ascii characters set)"), parent); vlay->addWidget(d->userCommentCheck); vlay->addWidget(d->userCommentEdit); @@ -169,7 +169,7 @@ EXIFCaption::EXIFCaption(TQWidget* tqparent) "<b><a href='http://en.wikipedia.org/wiki/EXIF'>EXIF</a></b> " "text tags marked by (*) only support printable " "<b><a href='http://en.wikipedia.org/wiki/Ascii'>ASCII</a></b> " - "characters set.</b>"), tqparent); + "characters set.</b>"), parent); vlay->addWidget(note); vlay->addStretch(); diff --git a/kipi-plugins/metadataedit/exifcaption.h b/kipi-plugins/metadataedit/exifcaption.h index 8c231d8..0430939 100644 --- a/kipi-plugins/metadataedit/exifcaption.h +++ b/kipi-plugins/metadataedit/exifcaption.h @@ -41,7 +41,7 @@ class EXIFCaption : public TQWidget public: - EXIFCaption(TQWidget* tqparent); + EXIFCaption(TQWidget* parent); ~EXIFCaption(); void applyMetadata(TQByteArray& exifData, TQByteArray& iptcData); diff --git a/kipi-plugins/metadataedit/exifdatetime.cpp b/kipi-plugins/metadataedit/exifdatetime.cpp index c9d3c94..dac52c5 100644 --- a/kipi-plugins/metadataedit/exifdatetime.cpp +++ b/kipi-plugins/metadataedit/exifdatetime.cpp @@ -91,25 +91,25 @@ public: KDateTimeWidget *dateDigitalizedSel; }; -EXIFDateTime::EXIFDateTime(TQWidget* tqparent) - : TQWidget(tqparent) +EXIFDateTime::EXIFDateTime(TQWidget* parent) + : TQWidget(parent) { d = new EXIFDateTimePriv; - TQGridLayout* grid = new TQGridLayout(tqparent, 9, 3, KDialog::spacingHint()); + TQGridLayout* grid = new TQGridLayout(parent, 9, 3, KDialog::spacingHint()); // -------------------------------------------------------- - d->dateCreatedCheck = new TQCheckBox(i18n("Creation date and time"), tqparent); - d->dateCreatedSubSecCheck = new TQCheckBox(i18n("Creation sub-second"), tqparent); - d->dateCreatedSel = new KDateTimeWidget(tqparent); - d->dateCreatedSubSecEdit = new KIntSpinBox(0, 999, 1, 0, 10, tqparent); + d->dateCreatedCheck = new TQCheckBox(i18n("Creation date and time"), parent); + d->dateCreatedSubSecCheck = new TQCheckBox(i18n("Creation sub-second"), parent); + d->dateCreatedSel = new KDateTimeWidget(parent); + d->dateCreatedSubSecEdit = new KIntSpinBox(0, 999, 1, 0, 10, parent); d->dateCreatedSel->setDateTime(TQDateTime::tqcurrentDateTime()); d->syncHOSTDateCheck = new TQCheckBox(i18n("Sync creation date entered through %1") .tqarg(KApplication::kApplication()->aboutData()->appName()), - tqparent); - d->syncIPTCDateCheck = new TQCheckBox(i18n("Sync IPTC creation date"), tqparent); - KSeparator *line = new KSeparator(Qt::Horizontal, tqparent); + parent); + d->syncIPTCDateCheck = new TQCheckBox(i18n("Sync IPTC creation date"), parent); + KSeparator *line = new KSeparator(Qt::Horizontal, parent); grid->addMultiCellWidget(d->dateCreatedCheck, 0, 0, 0, 0); grid->addMultiCellWidget(d->dateCreatedSubSecCheck, 0, 0, 1, 2); @@ -126,10 +126,10 @@ EXIFDateTime::EXIFDateTime(TQWidget* tqparent) // -------------------------------------------------------- - d->dateOriginalCheck = new TQCheckBox(i18n("Original date and time"), tqparent); - d->dateOriginalSubSecCheck = new TQCheckBox(i18n("Original sub-second"), tqparent); - d->dateOriginalSel = new KDateTimeWidget(tqparent); - d->dateOriginalSubSecEdit = new KIntSpinBox(0, 999, 1, 0, 10, tqparent); + d->dateOriginalCheck = new TQCheckBox(i18n("Original date and time"), parent); + d->dateOriginalSubSecCheck = new TQCheckBox(i18n("Original sub-second"), parent); + d->dateOriginalSel = new KDateTimeWidget(parent); + d->dateOriginalSubSecEdit = new KIntSpinBox(0, 999, 1, 0, 10, parent); d->dateOriginalSel->setDateTime(TQDateTime::tqcurrentDateTime()); grid->addMultiCellWidget(d->dateOriginalCheck, 5, 5, 0, 0); grid->addMultiCellWidget(d->dateOriginalSubSecCheck, 5, 5, 1, 2); @@ -143,10 +143,10 @@ EXIFDateTime::EXIFDateTime(TQWidget* tqparent) // -------------------------------------------------------- - d->dateDigitalizedCheck = new TQCheckBox(i18n("Digitization date and time"), tqparent); - d->dateDigitalizedSubSecCheck = new TQCheckBox(i18n("Digitization sub-second"), tqparent); - d->dateDigitalizedSel = new KDateTimeWidget(tqparent); - d->dateDigitalizedSubSecEdit = new KIntSpinBox(0, 999, 1, 0, 10, tqparent); + d->dateDigitalizedCheck = new TQCheckBox(i18n("Digitization date and time"), parent); + d->dateDigitalizedSubSecCheck = new TQCheckBox(i18n("Digitization sub-second"), parent); + d->dateDigitalizedSel = new KDateTimeWidget(parent); + d->dateDigitalizedSubSecEdit = new KIntSpinBox(0, 999, 1, 0, 10, parent); d->dateDigitalizedSel->setDateTime(TQDateTime::tqcurrentDateTime()); grid->addMultiCellWidget(d->dateDigitalizedCheck, 7, 7, 0, 0); grid->addMultiCellWidget(d->dateDigitalizedSubSecCheck, 7, 7, 1, 2); diff --git a/kipi-plugins/metadataedit/exifdatetime.h b/kipi-plugins/metadataedit/exifdatetime.h index 6b41fb5..21263c9 100644 --- a/kipi-plugins/metadataedit/exifdatetime.h +++ b/kipi-plugins/metadataedit/exifdatetime.h @@ -41,7 +41,7 @@ class EXIFDateTime : public TQWidget public: - EXIFDateTime(TQWidget* tqparent); + EXIFDateTime(TQWidget* parent); ~EXIFDateTime(); void applyMetadata(TQByteArray& exifData, TQByteArray& iptcData); diff --git a/kipi-plugins/metadataedit/exifdevice.cpp b/kipi-plugins/metadataedit/exifdevice.cpp index c5a28bf..890a1e3 100644 --- a/kipi-plugins/metadataedit/exifdevice.cpp +++ b/kipi-plugins/metadataedit/exifdevice.cpp @@ -118,12 +118,12 @@ public: MetadataCheckBox *subjectDistanceTypeCheck; }; -EXIFDevice::EXIFDevice(TQWidget* tqparent) - : TQWidget(tqparent) +EXIFDevice::EXIFDevice(TQWidget* parent) + : TQWidget(parent) { d = new EXIFDevicePriv; - TQGridLayout* grid = new TQGridLayout(tqparent, 16, 5, KDialog::spacingHint()); + TQGridLayout* grid = new TQGridLayout(parent, 16, 5, KDialog::spacingHint()); // EXIF only accept printable Ascii char. TQRegExp asciiRx("[\x20-\x7F]+$"); @@ -131,8 +131,8 @@ EXIFDevice::EXIFDevice(TQWidget* tqparent) // -------------------------------------------------------- - d->makeCheck = new TQCheckBox(i18n("Device manufacturer (*):"), tqparent); - d->makeEdit = new KLineEdit(tqparent); + d->makeCheck = new TQCheckBox(i18n("Device manufacturer (*):"), parent); + d->makeEdit = new KLineEdit(parent); d->makeEdit->setValidator(asciiValidator); grid->addMultiCellWidget(d->makeCheck, 0, 0, 0, 0); grid->addMultiCellWidget(d->makeEdit, 0, 0, 2, 5); @@ -141,8 +141,8 @@ EXIFDevice::EXIFDevice(TQWidget* tqparent) // -------------------------------------------------------- - d->modelCheck = new TQCheckBox(i18n("Device model (*):"), tqparent); - d->modelEdit = new KLineEdit(tqparent); + d->modelCheck = new TQCheckBox(i18n("Device model (*):"), parent); + d->modelEdit = new KLineEdit(parent); d->modelEdit->setValidator(asciiValidator); grid->addMultiCellWidget(d->modelCheck, 1, 1, 0, 0); grid->addMultiCellWidget(d->modelEdit, 1, 1, 2, 5); @@ -151,8 +151,8 @@ EXIFDevice::EXIFDevice(TQWidget* tqparent) // -------------------------------------------------------- - d->deviceTypeCheck = new MetadataCheckBox(i18n("Device type:"), tqparent); - d->deviceTypeCB = new TQComboBox(false, tqparent); + d->deviceTypeCheck = new MetadataCheckBox(i18n("Device type:"), parent); + d->deviceTypeCB = new TQComboBox(false, parent); d->deviceTypeCB->insertItem(i18n("Film scanner"), 0); d->deviceTypeCB->insertItem(i18n("Reflection print scanner"), 1); d->deviceTypeCB->insertItem(i18n("Digital still camera"), 2); @@ -164,18 +164,18 @@ EXIFDevice::EXIFDevice(TQWidget* tqparent) KActiveLabel *warning = new KActiveLabel(i18n("<b>Warning: EXIF <b><a href=" "'http://en.wikipedia.org/wiki/Exchangeable_image_file_format#MakerNote_Information'>" "Makernotes</a></b> can be unreadable if you set " - "wrong device manufacturer/model description.</b>"), tqparent); + "wrong device manufacturer/model description.</b>"), parent); - KSeparator *line = new KSeparator(Qt::Horizontal, tqparent); + KSeparator *line = new KSeparator(Qt::Horizontal, parent); grid->addMultiCellWidget(warning, 3, 3, 0, 5); grid->addMultiCellWidget(line, 4, 4, 0, 5); // -------------------------------------------------------- - d->exposureTimeCheck = new TQCheckBox(i18n("Exposure time (seconds):"), tqparent); - d->exposureTimeNumEdit = new KIntSpinBox(1, 100000, 1, 1, 10, tqparent); - d->exposureTimeDenEdit = new KIntSpinBox(1, 100000, 1, 1, 10, tqparent); - TQLabel *exposureLabel = new TQLabel("/", tqparent); + d->exposureTimeCheck = new TQCheckBox(i18n("Exposure time (seconds):"), parent); + d->exposureTimeNumEdit = new KIntSpinBox(1, 100000, 1, 1, 10, parent); + d->exposureTimeDenEdit = new KIntSpinBox(1, 100000, 1, 1, 10, parent); + TQLabel *exposureLabel = new TQLabel("/", parent); exposureLabel->tqsetAlignment (TQt::AlignRight|TQt::AlignVCenter); grid->addMultiCellWidget(d->exposureTimeCheck, 5, 5, 0, 0); grid->addMultiCellWidget(d->exposureTimeNumEdit, 5, 5, 2, 2); @@ -186,8 +186,8 @@ EXIFDevice::EXIFDevice(TQWidget* tqparent) // -------------------------------------------------------- - d->exposureProgramCheck = new MetadataCheckBox(i18n("Exposure program:"), tqparent); - d->exposureProgramCB = new TQComboBox(false, tqparent); + d->exposureProgramCheck = new MetadataCheckBox(i18n("Exposure program:"), parent); + d->exposureProgramCB = new TQComboBox(false, parent); d->exposureProgramCB->insertItem(i18n("Not defined"), 0); d->exposureProgramCB->insertItem(i18n("Manual"), 1); d->exposureProgramCB->insertItem(i18n("Auto"), 2); @@ -204,8 +204,8 @@ EXIFDevice::EXIFDevice(TQWidget* tqparent) // -------------------------------------------------------- - d->exposureModeCheck = new MetadataCheckBox(i18n("Exposure mode:"), tqparent); - d->exposureModeCB = new TQComboBox(false, tqparent); + d->exposureModeCheck = new MetadataCheckBox(i18n("Exposure mode:"), parent); + d->exposureModeCB = new TQComboBox(false, parent); d->exposureModeCB->insertItem(i18n("Auto"), 0); d->exposureModeCB->insertItem(i18n("Manual"), 1); d->exposureModeCB->insertItem(i18n("Auto bracket"), 2); @@ -219,20 +219,20 @@ EXIFDevice::EXIFDevice(TQWidget* tqparent) // -------------------------------------------------------- - d->exposureBiasCheck = new TQCheckBox(i18n("Exposure bias (APEX):"), tqparent); - d->exposureBiasEdit = new KDoubleSpinBox(-99.99, 99.99, 0.1, 0.0, 2, tqparent); + d->exposureBiasCheck = new TQCheckBox(i18n("Exposure bias (APEX):"), parent); + d->exposureBiasEdit = new KDoubleSpinBox(-99.99, 99.99, 0.1, 0.0, 2, parent); grid->addMultiCellWidget(d->exposureBiasCheck, 8, 8, 0, 0); grid->addMultiCellWidget(d->exposureBiasEdit, 8, 8, 2, 2); TQWhatsThis::add(d->exposureBiasEdit, i18n("<p>Set here the exposure bias value in APEX unit " "used by camera to take the picture.")); - KSeparator *line2 = new KSeparator(Qt::Horizontal, tqparent); + KSeparator *line2 = new KSeparator(Qt::Horizontal, parent); grid->addMultiCellWidget(line2, 9, 9, 0, 5); // -------------------------------------------------------- - d->meteringModeCheck = new MetadataCheckBox(i18n("Metering mode:"), tqparent); - d->meteringModeCB = new TQComboBox(false, tqparent); + d->meteringModeCheck = new MetadataCheckBox(i18n("Metering mode:"), parent); + d->meteringModeCB = new TQComboBox(false, parent); d->meteringModeCB->insertItem(i18n("Unknown"), 0); d->meteringModeCB->insertItem(i18n("Average"), 1); d->meteringModeCB->insertItem(i18n("Center weighted average"), 2); @@ -248,8 +248,8 @@ EXIFDevice::EXIFDevice(TQWidget* tqparent) // -------------------------------------------------------- - d->ISOSpeedCheck = new MetadataCheckBox(i18n("Sensitivity (ISO):"), tqparent); - d->ISOSpeedCB = new TQComboBox(false, tqparent); + d->ISOSpeedCheck = new MetadataCheckBox(i18n("Sensitivity (ISO):"), parent); + d->ISOSpeedCB = new TQComboBox(false, parent); d->ISOSpeedCB->insertItem("10", 0); d->ISOSpeedCB->insertItem("12", 1); d->ISOSpeedCB->insertItem("16", 2); @@ -293,8 +293,8 @@ EXIFDevice::EXIFDevice(TQWidget* tqparent) // -------------------------------------------------------- - d->sensingMethodCheck = new MetadataCheckBox(i18n("Sensing method:"), tqparent); - d->sensingMethodCB = new TQComboBox(false, tqparent); + d->sensingMethodCheck = new MetadataCheckBox(i18n("Sensing method:"), parent); + d->sensingMethodCB = new TQComboBox(false, parent); d->sensingMethodCB->insertItem(i18n("Not defined"), 0); d->sensingMethodCB->insertItem(i18n("One-chip color area"), 1); d->sensingMethodCB->insertItem(i18n("Two-chip color area"), 2); @@ -309,8 +309,8 @@ EXIFDevice::EXIFDevice(TQWidget* tqparent) // -------------------------------------------------------- - d->sceneTypeCheck = new MetadataCheckBox(i18n("Scene capture type:"), tqparent); - d->sceneTypeCB = new TQComboBox(false, tqparent); + d->sceneTypeCheck = new MetadataCheckBox(i18n("Scene capture type:"), parent); + d->sceneTypeCB = new TQComboBox(false, parent); d->sceneTypeCB->insertItem(i18n("Standard"), 0); d->sceneTypeCB->insertItem(i18n("Landscape"), 1); d->sceneTypeCB->insertItem(i18n("Portrait"), 2); @@ -322,8 +322,8 @@ EXIFDevice::EXIFDevice(TQWidget* tqparent) // -------------------------------------------------------- - d->subjectDistanceTypeCheck = new MetadataCheckBox(i18n("Subject distance type:"), tqparent); - d->subjectDistanceTypeCB = new TQComboBox(false, tqparent); + d->subjectDistanceTypeCheck = new MetadataCheckBox(i18n("Subject distance type:"), parent); + d->subjectDistanceTypeCB = new TQComboBox(false, parent); d->subjectDistanceTypeCB->insertItem(i18n("Unknow"), 0); d->subjectDistanceTypeCB->insertItem(i18n("Macro"), 1); d->subjectDistanceTypeCB->insertItem(i18n("Close view"), 2); @@ -339,7 +339,7 @@ EXIFDevice::EXIFDevice(TQWidget* tqparent) "<b><a href='http://en.wikipedia.org/wiki/EXIF'>EXIF</a></b> " "text tags marked by (*) only support printable " "<b><a href='http://en.wikipedia.org/wiki/Ascii'>ASCII</a></b> " - "characters set.</b>"), tqparent); + "characters set.</b>"), parent); grid->addMultiCellWidget(note, 15, 15, 0, 5); grid->setColStretch(1, 10); diff --git a/kipi-plugins/metadataedit/exifdevice.h b/kipi-plugins/metadataedit/exifdevice.h index 1d95cb4..41bfca0 100644 --- a/kipi-plugins/metadataedit/exifdevice.h +++ b/kipi-plugins/metadataedit/exifdevice.h @@ -40,7 +40,7 @@ class EXIFDevice : public TQWidget public: - EXIFDevice(TQWidget* tqparent); + EXIFDevice(TQWidget* parent); ~EXIFDevice(); void applyMetadata(TQByteArray& exifData); diff --git a/kipi-plugins/metadataedit/exifeditdialog.cpp b/kipi-plugins/metadataedit/exifeditdialog.cpp index 60258cb..c8989a2 100644 --- a/kipi-plugins/metadataedit/exifeditdialog.cpp +++ b/kipi-plugins/metadataedit/exifeditdialog.cpp @@ -120,11 +120,11 @@ public: KIPIPlugins::KPAboutData *about; }; -EXIFEditDialog::EXIFEditDialog(TQWidget* tqparent, KURL::List urls, KIPI::Interface *iface) +EXIFEditDialog::EXIFEditDialog(TQWidget* parent, KURL::List urls, KIPI::Interface *iface) : KDialogBase(IconList, TQString(), urls.count() > 1 ? Help|User1|User2|Stretch|Ok|Apply|Close : Help|Stretch|Ok|Apply|Close, - Ok, tqparent, 0, true, true, + Ok, parent, 0, true, true, KStdGuiItem::guiItem(KStdGuiItem::Forward), KStdGuiItem::guiItem(KStdGuiItem::Back) ) { diff --git a/kipi-plugins/metadataedit/exifeditdialog.h b/kipi-plugins/metadataedit/exifeditdialog.h index 3fc0bb7..7fb45cf 100644 --- a/kipi-plugins/metadataedit/exifeditdialog.h +++ b/kipi-plugins/metadataedit/exifeditdialog.h @@ -49,7 +49,7 @@ class EXIFEditDialog : public KDialogBase public: - EXIFEditDialog(TQWidget* tqparent, KURL::List urls, KIPI::Interface *iface); + EXIFEditDialog(TQWidget* parent, KURL::List urls, KIPI::Interface *iface); ~EXIFEditDialog(); public slots: diff --git a/kipi-plugins/metadataedit/exiflens.cpp b/kipi-plugins/metadataedit/exiflens.cpp index 4f75217..a672b87 100644 --- a/kipi-plugins/metadataedit/exiflens.cpp +++ b/kipi-plugins/metadataedit/exiflens.cpp @@ -145,17 +145,17 @@ public: MetadataCheckBox *maxApertureCheck; }; -EXIFLens::EXIFLens(TQWidget* tqparent) - : TQWidget(tqparent) +EXIFLens::EXIFLens(TQWidget* parent) + : TQWidget(parent) { d = new EXIFLensPriv; - TQGridLayout* grid = new TQGridLayout(tqparent, 5, 2, KDialog::spacingHint()); + TQGridLayout* grid = new TQGridLayout(parent, 5, 2, KDialog::spacingHint()); // -------------------------------------------------------- - d->focalLengthCheck = new TQCheckBox(i18n("Focal length (mm):"), tqparent); - d->focalLengthEdit = new KDoubleSpinBox(1.0, 10000.0, 1.0, 50.0, 1, tqparent); + d->focalLengthCheck = new TQCheckBox(i18n("Focal length (mm):"), parent); + d->focalLengthEdit = new KDoubleSpinBox(1.0, 10000.0, 1.0, 50.0, 1, parent); grid->addMultiCellWidget(d->focalLengthCheck, 0, 0, 0, 0); grid->addMultiCellWidget(d->focalLengthEdit, 0, 0, 2, 2); TQWhatsThis::add(d->focalLengthEdit, i18n("<p>Set here the lens focal length in milimeters " @@ -163,8 +163,8 @@ EXIFLens::EXIFLens(TQWidget* tqparent) // -------------------------------------------------------- - d->focalLength35mmCheck = new TQCheckBox(i18n("Focal length in 35mm film (mm):"), tqparent); - d->focalLength35mmEdit = new KIntSpinBox(1, 10000, 1, 1, 10, tqparent); + d->focalLength35mmCheck = new TQCheckBox(i18n("Focal length in 35mm film (mm):"), parent); + d->focalLength35mmEdit = new KIntSpinBox(1, 10000, 1, 1, 10, parent); grid->addMultiCellWidget(d->focalLength35mmCheck, 1, 1, 0, 0); grid->addMultiCellWidget(d->focalLength35mmEdit, 1, 1, 2, 2); TQWhatsThis::add(d->focalLength35mmEdit, i18n("<p>Set here equivalent focal length assuming " @@ -173,8 +173,8 @@ EXIFLens::EXIFLens(TQWidget* tqparent) // -------------------------------------------------------- - d->digitalZoomRatioCheck = new TQCheckBox(i18n("Digital zoom ratio:"), tqparent); - d->digitalZoomRatioEdit = new KDoubleSpinBox(0.0, 100.0, 0.1, 1.0, 1, tqparent); + d->digitalZoomRatioCheck = new TQCheckBox(i18n("Digital zoom ratio:"), parent); + d->digitalZoomRatioEdit = new KDoubleSpinBox(0.0, 100.0, 0.1, 1.0, 1, parent); grid->addMultiCellWidget(d->digitalZoomRatioCheck, 2, 2, 0, 0); grid->addMultiCellWidget(d->digitalZoomRatioEdit, 2, 2, 2, 2); TQWhatsThis::add(d->digitalZoomRatioEdit, i18n("<p>Set here the digital zoom ratio " @@ -182,8 +182,8 @@ EXIFLens::EXIFLens(TQWidget* tqparent) // -------------------------------------------------------- - d->apertureCheck = new MetadataCheckBox(i18n("Lens aperture (f-number):"), tqparent); - d->apertureCB = new TQComboBox(false, tqparent); + d->apertureCheck = new MetadataCheckBox(i18n("Lens aperture (f-number):"), parent); + d->apertureCB = new TQComboBox(false, parent); d->apertureCB->insertStringList(d->apertureValues); grid->addMultiCellWidget(d->apertureCheck, 3, 3, 0, 0); grid->addMultiCellWidget(d->apertureCB, 3, 3, 2, 2); @@ -192,8 +192,8 @@ EXIFLens::EXIFLens(TQWidget* tqparent) // -------------------------------------------------------- - d->maxApertureCheck = new MetadataCheckBox(i18n("Max. lens aperture (f-number):"), tqparent); - d->maxApertureCB = new TQComboBox(false, tqparent); + d->maxApertureCheck = new MetadataCheckBox(i18n("Max. lens aperture (f-number):"), parent); + d->maxApertureCB = new TQComboBox(false, parent); d->maxApertureCB->insertStringList(d->apertureValues); grid->addMultiCellWidget(d->maxApertureCheck, 4, 4, 0, 0); grid->addMultiCellWidget(d->maxApertureCB, 4, 4, 2, 2); diff --git a/kipi-plugins/metadataedit/exiflens.h b/kipi-plugins/metadataedit/exiflens.h index d0b19ab..b2371b6 100644 --- a/kipi-plugins/metadataedit/exiflens.h +++ b/kipi-plugins/metadataedit/exiflens.h @@ -40,7 +40,7 @@ class EXIFLens : public TQWidget public: - EXIFLens(TQWidget* tqparent); + EXIFLens(TQWidget* parent); ~EXIFLens(); void applyMetadata(TQByteArray& exifData); diff --git a/kipi-plugins/metadataedit/exiflight.cpp b/kipi-plugins/metadataedit/exiflight.cpp index 8812a90..703ad9d 100644 --- a/kipi-plugins/metadataedit/exiflight.cpp +++ b/kipi-plugins/metadataedit/exiflight.cpp @@ -123,17 +123,17 @@ public: MetadataCheckBox *whiteBalanceCheck; }; -EXIFLight::EXIFLight(TQWidget* tqparent) - : TQWidget(tqparent) +EXIFLight::EXIFLight(TQWidget* parent) + : TQWidget(parent) { d = new EXIFLightPriv; - TQGridLayout* grid = new TQGridLayout(tqparent, 4, 3, KDialog::spacingHint()); + TQGridLayout* grid = new TQGridLayout(parent, 4, 3, KDialog::spacingHint()); // -------------------------------------------------------- - d->lightSourceCheck = new MetadataCheckBox(i18n("Light source:"), tqparent); - d->lightSourceCB = new TQComboBox(false, tqparent); + d->lightSourceCheck = new MetadataCheckBox(i18n("Light source:"), parent); + d->lightSourceCB = new TQComboBox(false, parent); d->lightSourceCB->insertItem(i18n("Unknown"), 0); d->lightSourceCB->insertItem(i18n("Daylight"), 1); d->lightSourceCB->insertItem(i18n("Fluorescent"), 2); @@ -162,8 +162,8 @@ EXIFLight::EXIFLight(TQWidget* tqparent) // -------------------------------------------------------- - d->flashModeCheck = new MetadataCheckBox(i18n("Flash mode:"), tqparent); - d->flashModeCB = new TQComboBox(false, tqparent); + d->flashModeCheck = new MetadataCheckBox(i18n("Flash mode:"), parent); + d->flashModeCB = new TQComboBox(false, parent); for (EXIFLightPriv::FlashModeMap::Iterator it = d->flashModeMap.begin(); it != d->flashModeMap.end(); ++it ) @@ -176,8 +176,8 @@ EXIFLight::EXIFLight(TQWidget* tqparent) // -------------------------------------------------------- - d->flashEnergyCheck = new TQCheckBox(i18n("Flash energy (BCPS):"), tqparent); - d->flashEnergyEdit = new KDoubleSpinBox(1.0, 10000.0, 1.0, 1.0, 1, tqparent); + d->flashEnergyCheck = new TQCheckBox(i18n("Flash energy (BCPS):"), parent); + d->flashEnergyEdit = new KDoubleSpinBox(1.0, 10000.0, 1.0, 1.0, 1, parent); grid->addMultiCellWidget(d->flashEnergyCheck, 2, 2, 0, 0); grid->addMultiCellWidget(d->flashEnergyEdit, 2, 2, 2, 2); TQWhatsThis::add(d->flashEnergyEdit, i18n("<p>Set here the flash energy used to take the picture " @@ -188,8 +188,8 @@ EXIFLight::EXIFLight(TQWidget* tqparent) // -------------------------------------------------------- - d->whiteBalanceCheck = new MetadataCheckBox(i18n("White balance:"), tqparent); - d->whiteBalanceCB = new TQComboBox(false, tqparent); + d->whiteBalanceCheck = new MetadataCheckBox(i18n("White balance:"), parent); + d->whiteBalanceCB = new TQComboBox(false, parent); d->whiteBalanceCB->insertItem(i18n("Auto"), 0); d->whiteBalanceCB->insertItem(i18n("Manual"), 1); grid->addMultiCellWidget(d->whiteBalanceCheck, 3, 3, 0, 0); diff --git a/kipi-plugins/metadataedit/exiflight.h b/kipi-plugins/metadataedit/exiflight.h index 5ea5611..ce6812c 100644 --- a/kipi-plugins/metadataedit/exiflight.h +++ b/kipi-plugins/metadataedit/exiflight.h @@ -40,7 +40,7 @@ class EXIFLight : public TQWidget public: - EXIFLight(TQWidget* tqparent); + EXIFLight(TQWidget* parent); ~EXIFLight(); void applyMetadata(TQByteArray& exifData); diff --git a/kipi-plugins/metadataedit/iptccaption.cpp b/kipi-plugins/metadataedit/iptccaption.cpp index cfe1f88..d5e2823 100644 --- a/kipi-plugins/metadataedit/iptccaption.cpp +++ b/kipi-plugins/metadataedit/iptccaption.cpp @@ -87,11 +87,11 @@ public: KLineEdit *headlineEdit; }; -IPTCCaption::IPTCCaption(TQWidget* tqparent) - : TQWidget(tqparent) +IPTCCaption::IPTCCaption(TQWidget* parent) + : TQWidget(parent) { d = new IPTCCaptionPriv; - TQVBoxLayout *vlay = new TQVBoxLayout( tqparent, 0, KDialog::spacingHint() ); + TQVBoxLayout *vlay = new TQVBoxLayout( parent, 0, KDialog::spacingHint() ); // IPTC only accept printable Ascii char. TQRegExp asciiRx("[\x20-\x7F]+$"); @@ -99,14 +99,14 @@ IPTCCaption::IPTCCaption(TQWidget* tqparent) // -------------------------------------------------------- - d->captionCheck = new TQCheckBox(i18n("Caption:"), tqparent); - d->captionEdit = new KTextEdit(tqparent); - d->syncJFIFCommentCheck = new TQCheckBox(i18n("Sync JFIF Comment section"), tqparent); + d->captionCheck = new TQCheckBox(i18n("Caption:"), parent); + d->captionEdit = new KTextEdit(parent); + d->syncJFIFCommentCheck = new TQCheckBox(i18n("Sync JFIF Comment section"), parent); d->syncHOSTCommentCheck = new TQCheckBox(i18n("Sync caption entered through %1") .tqarg(KApplication::kApplication()->aboutData()->appName()), - tqparent); - d->syncEXIFCommentCheck = new TQCheckBox(i18n("Sync EXIF Comment"), tqparent); - KSeparator *line = new KSeparator(Qt::Horizontal, tqparent); + parent); + d->syncEXIFCommentCheck = new TQCheckBox(i18n("Sync EXIF Comment"), parent); + KSeparator *line = new KSeparator(Qt::Horizontal, parent); /* d->captionEdit->setValidator(asciiValidator); d->captionEdit->setMaxLength(2000);*/ @@ -121,8 +121,8 @@ IPTCCaption::IPTCCaption(TQWidget* tqparent) // -------------------------------------------------------- - d->writerCheck = new TQCheckBox(i18n("Caption Writer:"), tqparent); - d->writerEdit = new KLineEdit(tqparent); + d->writerCheck = new TQCheckBox(i18n("Caption Writer:"), parent); + d->writerEdit = new KLineEdit(parent); d->writerEdit->setValidator(asciiValidator); d->writerEdit->setMaxLength(32); vlay->addWidget(d->writerCheck); @@ -132,8 +132,8 @@ IPTCCaption::IPTCCaption(TQWidget* tqparent) // -------------------------------------------------------- - d->headlineCheck = new TQCheckBox(i18n("Headline:"), tqparent); - d->headlineEdit = new KLineEdit(tqparent); + d->headlineCheck = new TQCheckBox(i18n("Headline:"), parent); + d->headlineEdit = new KLineEdit(parent); d->headlineEdit->setValidator(asciiValidator); d->headlineEdit->setMaxLength(256); vlay->addWidget(d->headlineCheck); @@ -143,8 +143,8 @@ IPTCCaption::IPTCCaption(TQWidget* tqparent) // -------------------------------------------------------- - d->specialInstructionCheck = new TQCheckBox(i18n("Special Instructions:"), tqparent); - d->specialInstructionEdit = new KTextEdit(tqparent); + d->specialInstructionCheck = new TQCheckBox(i18n("Special Instructions:"), parent); + d->specialInstructionEdit = new KTextEdit(parent); /* d->specialInstructionEdit->setValidator(asciiValidator); d->specialInstructionEdit->setMaxLength(256);*/ vlay->addWidget(d->specialInstructionCheck); @@ -159,7 +159,7 @@ IPTCCaption::IPTCCaption(TQWidget* tqparent) "text tags only support the printable " "<b><a href='http://en.wikipedia.org/wiki/Ascii'>ASCII</a></b> " "characters set and limit strings size. " - "Use contextual help for details.</b>"), tqparent); + "Use contextual help for details.</b>"), parent); vlay->addWidget(note); vlay->addStretch(); diff --git a/kipi-plugins/metadataedit/iptccaption.h b/kipi-plugins/metadataedit/iptccaption.h index c47c1bc..0a7f6ab 100644 --- a/kipi-plugins/metadataedit/iptccaption.h +++ b/kipi-plugins/metadataedit/iptccaption.h @@ -40,7 +40,7 @@ class IPTCCaption : public TQWidget public: - IPTCCaption(TQWidget* tqparent); + IPTCCaption(TQWidget* parent); ~IPTCCaption(); void applyMetadata(TQByteArray& exifData, TQByteArray& iptcData); diff --git a/kipi-plugins/metadataedit/iptccategories.cpp b/kipi-plugins/metadataedit/iptccategories.cpp index 48ef08d..7cd3193 100644 --- a/kipi-plugins/metadataedit/iptccategories.cpp +++ b/kipi-plugins/metadataedit/iptccategories.cpp @@ -79,11 +79,11 @@ public: KListBox *subCategoriesBox; }; -IPTCCategories::IPTCCategories(TQWidget* tqparent) - : TQWidget(tqparent) +IPTCCategories::IPTCCategories(TQWidget* parent) + : TQWidget(parent) { d = new IPTCCategoriesPriv; - TQGridLayout *grid = new TQGridLayout(tqparent, 6, 1, 0, KDialog::spacingHint()); + TQGridLayout *grid = new TQGridLayout(parent, 6, 1, 0, KDialog::spacingHint()); grid->tqsetAlignment( TQt::AlignTop ); // IPTC only accept printable Ascii char. @@ -92,26 +92,26 @@ IPTCCategories::IPTCCategories(TQWidget* tqparent) // -------------------------------------------------------- - d->categoryCheck = new TQCheckBox(i18n("Identify subject of content (3 chars max):"), tqparent); - d->categoryEdit = new KLineEdit(tqparent); + d->categoryCheck = new TQCheckBox(i18n("Identify subject of content (3 chars max):"), parent); + d->categoryEdit = new KLineEdit(parent); d->categoryEdit->setValidator(asciiValidator); d->categoryEdit->setMaxLength(3); TQWhatsThis::add(d->categoryEdit, i18n("<p>Set here the category of content. This field is limited " "to 3 ASCII characters.")); - d->subCategoriesCheck = new TQCheckBox(i18n("Supplemental categories:"), tqparent); + d->subCategoriesCheck = new TQCheckBox(i18n("Supplemental categories:"), parent); - d->subCategoryEdit = new KLineEdit(tqparent); + d->subCategoryEdit = new KLineEdit(parent); d->subCategoryEdit->setValidator(asciiValidator); d->subCategoryEdit->setMaxLength(32); TQWhatsThis::add(d->subCategoryEdit, i18n("<p>Enter here a new supplemental category of content. " "This field is limited to 32 ASCII characters.")); - d->subCategoriesBox = new KListBox(tqparent); + d->subCategoriesBox = new KListBox(parent); d->subCategoriesBox->setVScrollBarMode(TQScrollView::AlwaysOn); - d->addSubCategoryButton = new TQPushButton( i18n("&Add"), tqparent); - d->delSubCategoryButton = new TQPushButton( i18n("&Delete"), tqparent); + d->addSubCategoryButton = new TQPushButton( i18n("&Add"), parent); + d->delSubCategoryButton = new TQPushButton( i18n("&Delete"), parent); d->addSubCategoryButton->setIconSet(SmallIcon("add")); d->delSubCategoryButton->setIconSet(SmallIcon("remove")); d->delSubCategoryButton->setEnabled(false); @@ -131,7 +131,7 @@ IPTCCategories::IPTCCategories(TQWidget* tqparent) "text tags only support the printable " "<b><a href='http://en.wikipedia.org/wiki/Ascii'>ASCII</a></b> " "characters set and limit strings size. " - "Use contextual help for details.</b>"), tqparent); + "Use contextual help for details.</b>"), parent); note->setMaximumWidth(150); grid->addMultiCellWidget(note, 5, 5, 1, 1); diff --git a/kipi-plugins/metadataedit/iptccategories.h b/kipi-plugins/metadataedit/iptccategories.h index abb2e0e..85a16aa 100644 --- a/kipi-plugins/metadataedit/iptccategories.h +++ b/kipi-plugins/metadataedit/iptccategories.h @@ -40,7 +40,7 @@ class IPTCCategories : public TQWidget public: - IPTCCategories(TQWidget* tqparent); + IPTCCategories(TQWidget* parent); ~IPTCCategories(); void applyMetadata(TQByteArray& iptcData); diff --git a/kipi-plugins/metadataedit/iptccredits.cpp b/kipi-plugins/metadataedit/iptccredits.cpp index cfdf9de..3c88916 100644 --- a/kipi-plugins/metadataedit/iptccredits.cpp +++ b/kipi-plugins/metadataedit/iptccredits.cpp @@ -84,11 +84,11 @@ public: KLineEdit *contactEdit; }; -IPTCCredits::IPTCCredits(TQWidget* tqparent) - : TQWidget(tqparent) +IPTCCredits::IPTCCredits(TQWidget* parent) + : TQWidget(parent) { d = new IPTCCreditsPriv; - TQVBoxLayout *vlay = new TQVBoxLayout( tqparent, 0, KDialog::spacingHint() ); + TQVBoxLayout *vlay = new TQVBoxLayout( parent, 0, KDialog::spacingHint() ); // IPTC only accept printable Ascii char. TQRegExp asciiRx("[\x20-\x7F]+$"); @@ -96,8 +96,8 @@ IPTCCredits::IPTCCredits(TQWidget* tqparent) // -------------------------------------------------------- - d->copyrightCheck = new TQCheckBox(i18n("Copyright:"), tqparent); - d->copyrightEdit = new KLineEdit(tqparent); + d->copyrightCheck = new TQCheckBox(i18n("Copyright:"), parent); + d->copyrightEdit = new KLineEdit(parent); d->copyrightEdit->setValidator(asciiValidator); d->copyrightEdit->setMaxLength(128); vlay->addWidget(d->copyrightCheck); @@ -107,8 +107,8 @@ IPTCCredits::IPTCCredits(TQWidget* tqparent) // -------------------------------------------------------- - d->bylineCheck = new TQCheckBox(i18n("Byline:"), tqparent); - d->bylineEdit = new KLineEdit(tqparent); + d->bylineCheck = new TQCheckBox(i18n("Byline:"), parent); + d->bylineEdit = new KLineEdit(parent); d->bylineEdit->setValidator(asciiValidator); d->bylineEdit->setMaxLength(32); vlay->addWidget(d->bylineCheck); @@ -118,8 +118,8 @@ IPTCCredits::IPTCCredits(TQWidget* tqparent) // -------------------------------------------------------- - d->bylineTitleCheck = new TQCheckBox(i18n("Byline Title:"), tqparent); - d->bylineTitleEdit = new KLineEdit(tqparent); + d->bylineTitleCheck = new TQCheckBox(i18n("Byline Title:"), parent); + d->bylineTitleEdit = new KLineEdit(parent); d->bylineTitleEdit->setValidator(asciiValidator); d->bylineTitleEdit->setMaxLength(32); vlay->addWidget(d->bylineTitleCheck); @@ -129,8 +129,8 @@ IPTCCredits::IPTCCredits(TQWidget* tqparent) // -------------------------------------------------------- - d->creditCheck = new TQCheckBox(i18n("Credit:"), tqparent); - d->creditEdit = new KLineEdit(tqparent); + d->creditCheck = new TQCheckBox(i18n("Credit:"), parent); + d->creditEdit = new KLineEdit(parent); d->creditEdit->setValidator(asciiValidator); d->creditEdit->setMaxLength(32); vlay->addWidget(d->creditCheck); @@ -140,8 +140,8 @@ IPTCCredits::IPTCCredits(TQWidget* tqparent) // -------------------------------------------------------- - d->sourceCheck = new TQCheckBox(i18n("Source:"), tqparent); - d->sourceEdit = new KLineEdit(tqparent); + d->sourceCheck = new TQCheckBox(i18n("Source:"), parent); + d->sourceEdit = new KLineEdit(parent); d->sourceEdit->setValidator(asciiValidator); d->sourceEdit->setMaxLength(32); vlay->addWidget(d->sourceCheck); @@ -151,8 +151,8 @@ IPTCCredits::IPTCCredits(TQWidget* tqparent) // -------------------------------------------------------- - d->contactCheck = new TQCheckBox(i18n("Contact:"), tqparent); - d->contactEdit = new KLineEdit(tqparent); + d->contactCheck = new TQCheckBox(i18n("Contact:"), parent); + d->contactEdit = new KLineEdit(parent); d->contactEdit->setValidator(asciiValidator); d->contactEdit->setMaxLength(128); vlay->addWidget(d->contactCheck); @@ -167,7 +167,7 @@ IPTCCredits::IPTCCredits(TQWidget* tqparent) "text tags only support the printable " "<b><a href='http://en.wikipedia.org/wiki/Ascii'>ASCII</a></b> " "characters set and limit strings size. " - "Use contextual help for details.</b>"), tqparent); + "Use contextual help for details.</b>"), parent); vlay->addWidget(note); vlay->addStretch(); diff --git a/kipi-plugins/metadataedit/iptccredits.h b/kipi-plugins/metadataedit/iptccredits.h index cf56067..ca35908 100644 --- a/kipi-plugins/metadataedit/iptccredits.h +++ b/kipi-plugins/metadataedit/iptccredits.h @@ -40,7 +40,7 @@ class IPTCCredits : public TQWidget public: - IPTCCredits(TQWidget* tqparent); + IPTCCredits(TQWidget* parent); ~IPTCCredits(); void applyMetadata(TQByteArray& iptcData); diff --git a/kipi-plugins/metadataedit/iptcdatetime.cpp b/kipi-plugins/metadataedit/iptcdatetime.cpp index db68bb6..df101d1 100644 --- a/kipi-plugins/metadataedit/iptcdatetime.cpp +++ b/kipi-plugins/metadataedit/iptcdatetime.cpp @@ -100,24 +100,24 @@ public: KTimeWidget *timeDigitalizedSel; }; -IPTCDateTime::IPTCDateTime(TQWidget* tqparent) - : TQWidget(tqparent) +IPTCDateTime::IPTCDateTime(TQWidget* parent) + : TQWidget(parent) { d = new IPTCDateTimePriv; - TQGridLayout* grid = new TQGridLayout(tqparent, 11, 2, KDialog::spacingHint()); + TQGridLayout* grid = new TQGridLayout(parent, 11, 2, KDialog::spacingHint()); // -------------------------------------------------------- - d->dateCreatedCheck = new TQCheckBox(i18n("Creation date"), tqparent); - d->timeCreatedCheck = new TQCheckBox(i18n("Creation time"), tqparent); - d->dateCreatedSel = new KDateWidget(tqparent); - d->timeCreatedSel = new KTimeWidget(tqparent); + d->dateCreatedCheck = new TQCheckBox(i18n("Creation date"), parent); + d->timeCreatedCheck = new TQCheckBox(i18n("Creation time"), parent); + d->dateCreatedSel = new KDateWidget(parent); + d->timeCreatedSel = new KTimeWidget(parent); d->syncHOSTDateCheck = new TQCheckBox(i18n("Sync creation date entered through %1") .tqarg(KApplication::kApplication()->aboutData()->appName()), - tqparent); - d->syncEXIFDateCheck = new TQCheckBox(i18n("Sync EXIF creation date"), tqparent); - KSeparator *line = new KSeparator(Qt::Horizontal, tqparent); + parent); + d->syncEXIFDateCheck = new TQCheckBox(i18n("Sync EXIF creation date"), parent); + KSeparator *line = new KSeparator(Qt::Horizontal, parent); d->dateCreatedSel->setDate(TQDate::tqcurrentDate()); d->timeCreatedSel->setTime(TQTime::currentTime()); grid->addMultiCellWidget(d->dateCreatedCheck, 0, 0, 0, 0); @@ -134,10 +134,10 @@ IPTCDateTime::IPTCDateTime(TQWidget* tqparent) // -------------------------------------------------------- - d->dateReleasedCheck = new TQCheckBox(i18n("Release date"), tqparent); - d->timeReleasedCheck = new TQCheckBox(i18n("Release time"), tqparent); - d->dateReleasedSel = new KDateWidget(tqparent); - d->timeReleasedSel = new KTimeWidget(tqparent); + d->dateReleasedCheck = new TQCheckBox(i18n("Release date"), parent); + d->timeReleasedCheck = new TQCheckBox(i18n("Release time"), parent); + d->dateReleasedSel = new KDateWidget(parent); + d->timeReleasedSel = new KTimeWidget(parent); d->dateReleasedSel->setDate(TQDate::tqcurrentDate()); d->timeReleasedSel->setTime(TQTime::currentTime()); grid->addMultiCellWidget(d->dateReleasedCheck, 5, 5, 0, 0); @@ -151,10 +151,10 @@ IPTCDateTime::IPTCDateTime(TQWidget* tqparent) // -------------------------------------------------------- - d->dateExpiredCheck = new TQCheckBox(i18n("Expiration date"), tqparent); - d->timeExpiredCheck = new TQCheckBox(i18n("Expiration time"), tqparent); - d->dateExpiredSel = new KDateWidget(tqparent); - d->timeExpiredSel = new KTimeWidget(tqparent); + d->dateExpiredCheck = new TQCheckBox(i18n("Expiration date"), parent); + d->timeExpiredCheck = new TQCheckBox(i18n("Expiration time"), parent); + d->dateExpiredSel = new KDateWidget(parent); + d->timeExpiredSel = new KTimeWidget(parent); d->dateExpiredSel->setDate(TQDate::tqcurrentDate()); d->timeExpiredSel->setTime(TQTime::currentTime()); grid->addMultiCellWidget(d->dateExpiredCheck, 7, 7, 0, 0); @@ -168,10 +168,10 @@ IPTCDateTime::IPTCDateTime(TQWidget* tqparent) // -------------------------------------------------------- - d->dateDigitalizedCheck = new TQCheckBox(i18n("Digitization date"), tqparent); - d->timeDigitalizedCheck = new TQCheckBox(i18n("Digitization time"), tqparent); - d->dateDigitalizedSel = new KDateWidget(tqparent); - d->timeDigitalizedSel = new KTimeWidget(tqparent); + d->dateDigitalizedCheck = new TQCheckBox(i18n("Digitization date"), parent); + d->timeDigitalizedCheck = new TQCheckBox(i18n("Digitization time"), parent); + d->dateDigitalizedSel = new KDateWidget(parent); + d->timeDigitalizedSel = new KTimeWidget(parent); d->dateDigitalizedSel->setDate(TQDate::tqcurrentDate()); d->timeDigitalizedSel->setTime(TQTime::currentTime()); grid->addMultiCellWidget(d->dateDigitalizedCheck, 9, 9, 0, 0); diff --git a/kipi-plugins/metadataedit/iptcdatetime.h b/kipi-plugins/metadataedit/iptcdatetime.h index 92d5489..9c8e5f9 100644 --- a/kipi-plugins/metadataedit/iptcdatetime.h +++ b/kipi-plugins/metadataedit/iptcdatetime.h @@ -40,7 +40,7 @@ class IPTCDateTime : public TQWidget public: - IPTCDateTime(TQWidget* tqparent); + IPTCDateTime(TQWidget* parent); ~IPTCDateTime(); void applyMetadata(TQByteArray& exifData, TQByteArray& iptcData); diff --git a/kipi-plugins/metadataedit/iptceditdialog.cpp b/kipi-plugins/metadataedit/iptceditdialog.cpp index 4364322..e4de26d 100644 --- a/kipi-plugins/metadataedit/iptceditdialog.cpp +++ b/kipi-plugins/metadataedit/iptceditdialog.cpp @@ -128,11 +128,11 @@ public: KIPIPlugins::KPAboutData *about; }; -IPTCEditDialog::IPTCEditDialog(TQWidget* tqparent, KURL::List urls, KIPI::Interface *iface) +IPTCEditDialog::IPTCEditDialog(TQWidget* parent, KURL::List urls, KIPI::Interface *iface) : KDialogBase(IconList, TQString(), urls.count() > 1 ? Help|User1|User2|Stretch|Ok|Apply|Close : Help|Stretch|Ok|Apply|Close, - Ok, tqparent, 0, true, true, + Ok, parent, 0, true, true, KStdGuiItem::guiItem(KStdGuiItem::Forward), KStdGuiItem::guiItem(KStdGuiItem::Back) ) { diff --git a/kipi-plugins/metadataedit/iptceditdialog.h b/kipi-plugins/metadataedit/iptceditdialog.h index 5c17ff7..e473a1f 100644 --- a/kipi-plugins/metadataedit/iptceditdialog.h +++ b/kipi-plugins/metadataedit/iptceditdialog.h @@ -44,7 +44,7 @@ class IPTCEditDialog : public KDialogBase public: - IPTCEditDialog(TQWidget* tqparent, KURL::List urls, KIPI::Interface *iface); + IPTCEditDialog(TQWidget* parent, KURL::List urls, KIPI::Interface *iface); ~IPTCEditDialog(); public slots: diff --git a/kipi-plugins/metadataedit/iptckeywords.cpp b/kipi-plugins/metadataedit/iptckeywords.cpp index 7787f2c..ee85553 100644 --- a/kipi-plugins/metadataedit/iptckeywords.cpp +++ b/kipi-plugins/metadataedit/iptckeywords.cpp @@ -75,11 +75,11 @@ public: KListBox *keywordsBox; }; -IPTCKeywords::IPTCKeywords(TQWidget* tqparent) - : TQWidget(tqparent) +IPTCKeywords::IPTCKeywords(TQWidget* parent) + : TQWidget(parent) { d = new IPTCKeywordsPriv; - TQGridLayout *grid = new TQGridLayout(tqparent, 5, 2, 0, KDialog::spacingHint()); + TQGridLayout *grid = new TQGridLayout(parent, 5, 2, 0, KDialog::spacingHint()); grid->tqsetAlignment( TQt::AlignTop ); // IPTC only accept printable Ascii char. @@ -88,19 +88,19 @@ IPTCKeywords::IPTCKeywords(TQWidget* tqparent) // -------------------------------------------------------- - d->keywordsCheck = new TQCheckBox(i18n("Use information retrieval words:"), tqparent); + d->keywordsCheck = new TQCheckBox(i18n("Use information retrieval words:"), parent); - d->keywordEdit = new KLineEdit(tqparent); + d->keywordEdit = new KLineEdit(parent); d->keywordEdit->setValidator(asciiValidator); d->keywordEdit->setMaxLength(64); TQWhatsThis::add(d->keywordEdit, i18n("<p>Enter here a new keyword. " "This field is limited to 64 ASCII characters.")); - d->keywordsBox = new KListBox(tqparent); + d->keywordsBox = new KListBox(parent); d->keywordsBox->setVScrollBarMode(TQScrollView::AlwaysOn); - d->addKeywordButton = new TQPushButton( i18n("&Add"), tqparent); - d->delKeywordButton = new TQPushButton( i18n("&Delete"), tqparent); + d->addKeywordButton = new TQPushButton( i18n("&Add"), parent); + d->delKeywordButton = new TQPushButton( i18n("&Delete"), parent); d->addKeywordButton->setIconSet(SmallIcon("add")); d->delKeywordButton->setIconSet(SmallIcon("remove")); d->delKeywordButton->setEnabled(false); @@ -118,7 +118,7 @@ IPTCKeywords::IPTCKeywords(TQWidget* tqparent) "text tags only support the printable " "<b><a href='http://en.wikipedia.org/wiki/Ascii'>ASCII</a></b> " "characters set and limit strings size. " - "Use contextual help for details.</b>"), tqparent); + "Use contextual help for details.</b>"), parent); note->setMaximumWidth(150); grid->addMultiCellWidget(note, 4, 4, 1, 1); diff --git a/kipi-plugins/metadataedit/iptckeywords.h b/kipi-plugins/metadataedit/iptckeywords.h index 7e9f638..2f024ed 100644 --- a/kipi-plugins/metadataedit/iptckeywords.h +++ b/kipi-plugins/metadataedit/iptckeywords.h @@ -40,7 +40,7 @@ class IPTCKeywords : public TQWidget public: - IPTCKeywords(TQWidget* tqparent); + IPTCKeywords(TQWidget* parent); ~IPTCKeywords(); void applyMetadata(TQByteArray& iptcData); diff --git a/kipi-plugins/metadataedit/iptcorigin.cpp b/kipi-plugins/metadataedit/iptcorigin.cpp index 6e79338..82966b3 100644 --- a/kipi-plugins/metadataedit/iptcorigin.cpp +++ b/kipi-plugins/metadataedit/iptcorigin.cpp @@ -353,12 +353,12 @@ public: MetadataCheckBox *countryCheck; }; -IPTCOrigin::IPTCOrigin(TQWidget* tqparent) - : TQWidget(tqparent) +IPTCOrigin::IPTCOrigin(TQWidget* parent) + : TQWidget(parent) { d = new IPTCOriginPriv; - TQGridLayout* grid = new TQGridLayout(tqparent, 12, 2, KDialog::spacingHint()); + TQGridLayout* grid = new TQGridLayout(parent, 12, 2, KDialog::spacingHint()); // IPTC only accept printable Ascii char. TQRegExp asciiRx("[\x20-\x7F]+$"); @@ -366,8 +366,8 @@ IPTCOrigin::IPTCOrigin(TQWidget* tqparent) // -------------------------------------------------------- - d->objectNameCheck = new TQCheckBox(i18n("Object name:"), tqparent); - d->objectNameEdit = new KLineEdit(tqparent); + d->objectNameCheck = new TQCheckBox(i18n("Object name:"), parent); + d->objectNameEdit = new KLineEdit(parent); d->objectNameEdit->setValidator(asciiValidator); d->objectNameEdit->setMaxLength(64); TQWhatsThis::add(d->objectNameEdit, i18n("<p>Set here the shorthand reference of content. " @@ -375,8 +375,8 @@ IPTCOrigin::IPTCOrigin(TQWidget* tqparent) // -------------------------------------------------------- - d->locationCheck = new TQCheckBox(i18n("Location:"), tqparent); - d->locationEdit = new KLineEdit(tqparent); + d->locationCheck = new TQCheckBox(i18n("Location:"), parent); + d->locationEdit = new KLineEdit(parent); d->locationEdit->setValidator(asciiValidator); d->locationEdit->setMaxLength(64); TQWhatsThis::add(d->locationEdit, i18n("<p>Set here the full country name referenced by the content. " @@ -385,8 +385,8 @@ IPTCOrigin::IPTCOrigin(TQWidget* tqparent) // -------------------------------------------------------- - d->cityCheck = new TQCheckBox(i18n("City:"), tqparent); - d->cityEdit = new KLineEdit(tqparent); + d->cityCheck = new TQCheckBox(i18n("City:"), parent); + d->cityEdit = new KLineEdit(parent); d->cityEdit->setValidator(asciiValidator); d->cityEdit->setMaxLength(32); TQWhatsThis::add(d->cityEdit, i18n("<p>Set here the city of content origin. " @@ -394,8 +394,8 @@ IPTCOrigin::IPTCOrigin(TQWidget* tqparent) // -------------------------------------------------------- - d->sublocationCheck = new TQCheckBox(i18n("Sublocation:"), tqparent); - d->sublocationEdit = new KLineEdit(tqparent); + d->sublocationCheck = new TQCheckBox(i18n("Sublocation:"), parent); + d->sublocationEdit = new KLineEdit(parent); d->sublocationEdit->setValidator(asciiValidator); d->sublocationEdit->setMaxLength(32); TQWhatsThis::add(d->sublocationEdit, i18n("<p>Set here the content location within city. " @@ -403,8 +403,8 @@ IPTCOrigin::IPTCOrigin(TQWidget* tqparent) // -------------------------------------------------------- - d->provinceCheck = new TQCheckBox(i18n("State/Province:"), tqparent); - d->provinceEdit = new KLineEdit(tqparent); + d->provinceCheck = new TQCheckBox(i18n("State/Province:"), parent); + d->provinceEdit = new KLineEdit(parent); d->provinceEdit->setValidator(asciiValidator); d->provinceEdit->setMaxLength(32); TQWhatsThis::add(d->provinceEdit, i18n("<p>Set here the Province or State of content origin. " @@ -412,8 +412,8 @@ IPTCOrigin::IPTCOrigin(TQWidget* tqparent) // -------------------------------------------------------- - d->countryCheck = new MetadataCheckBox(i18n("Country:"), tqparent); - d->countryCB = new TQComboBox(false, tqparent); + d->countryCheck = new MetadataCheckBox(i18n("Country:"), parent); + d->countryCB = new TQComboBox(false, parent); for (IPTCOriginPriv::CountryCodeMap::Iterator it = d->countryCodeMap.begin(); it != d->countryCodeMap.end(); ++it ) @@ -425,8 +425,8 @@ IPTCOrigin::IPTCOrigin(TQWidget* tqparent) // -------------------------------------------------------- - d->originalTransCheck = new TQCheckBox(i18n("Original transmission reference:"), tqparent); - d->originalTransEdit = new KLineEdit(tqparent); + d->originalTransCheck = new TQCheckBox(i18n("Original transmission reference:"), parent); + d->originalTransEdit = new KLineEdit(parent); d->originalTransEdit->setValidator(asciiValidator); d->originalTransEdit->setMaxLength(32); TQWhatsThis::add(d->originalTransEdit, i18n("<p>Set here the location of original content transmission. " @@ -439,7 +439,7 @@ IPTCOrigin::IPTCOrigin(TQWidget* tqparent) "text tags only support the printable " "<b><a href='http://en.wikipedia.org/wiki/Ascii'>ASCII</a></b> " "characters set and limit strings size. " - "Use contextual help for details.</b>"), tqparent); + "Use contextual help for details.</b>"), parent); // -------------------------------------------------------- @@ -447,7 +447,7 @@ IPTCOrigin::IPTCOrigin(TQWidget* tqparent) grid->addMultiCellWidget(d->objectNameEdit, 1, 1, 0, 2); grid->addMultiCellWidget(d->locationCheck, 2, 2, 0, 0); grid->addMultiCellWidget(d->locationEdit, 2, 2, 1, 2); - grid->addMultiCellWidget(new KSeparator(Qt::Horizontal, tqparent), 3, 3, 0, 2); + grid->addMultiCellWidget(new KSeparator(Qt::Horizontal, parent), 3, 3, 0, 2); grid->addMultiCellWidget(d->cityCheck, 4, 4, 0, 0); grid->addMultiCellWidget(d->cityEdit, 4, 4, 1, 2); grid->addMultiCellWidget(d->sublocationCheck, 5, 5, 0, 0); @@ -456,7 +456,7 @@ IPTCOrigin::IPTCOrigin(TQWidget* tqparent) grid->addMultiCellWidget(d->provinceEdit, 6, 6, 1, 2); grid->addMultiCellWidget(d->countryCheck, 7, 7, 0, 0); grid->addMultiCellWidget(d->countryCB, 7, 7, 1, 2); - grid->addMultiCellWidget(new KSeparator(Qt::Horizontal, tqparent), 8, 8, 0, 2); + grid->addMultiCellWidget(new KSeparator(Qt::Horizontal, parent), 8, 8, 0, 2); grid->addMultiCellWidget(d->originalTransCheck, 9, 9, 0, 2); grid->addMultiCellWidget(d->originalTransEdit, 10, 10, 0, 2); grid->addMultiCellWidget(note, 11, 11, 0, 2); diff --git a/kipi-plugins/metadataedit/iptcorigin.h b/kipi-plugins/metadataedit/iptcorigin.h index 443e5b4..b579958 100644 --- a/kipi-plugins/metadataedit/iptcorigin.h +++ b/kipi-plugins/metadataedit/iptcorigin.h @@ -40,7 +40,7 @@ class IPTCOrigin : public TQWidget public: - IPTCOrigin(TQWidget* tqparent); + IPTCOrigin(TQWidget* parent); ~IPTCOrigin(); void applyMetadata(TQByteArray& iptcData); diff --git a/kipi-plugins/metadataedit/iptcstatus.cpp b/kipi-plugins/metadataedit/iptcstatus.cpp index d55c405..9d7920a 100644 --- a/kipi-plugins/metadataedit/iptcstatus.cpp +++ b/kipi-plugins/metadataedit/iptcstatus.cpp @@ -88,12 +88,12 @@ public: MetadataCheckBox *objectAttributeCheck; }; -IPTCtqStatus::IPTCtqStatus(TQWidget* tqparent) - : TQWidget(tqparent) +IPTCtqStatus::IPTCtqStatus(TQWidget* parent) + : TQWidget(parent) { d = new IPTCStatusPriv; - TQGridLayout* grid = new TQGridLayout(tqparent, 11, 2, KDialog::spacingHint()); + TQGridLayout* grid = new TQGridLayout(parent, 11, 2, KDialog::spacingHint()); // IPTC only accept printable Ascii char. TQRegExp asciiRx("[\x20-\x7F]+$"); @@ -101,8 +101,8 @@ IPTCtqStatus::IPTCtqStatus(TQWidget* tqparent) // -------------------------------------------------------- - d->statusCheck = new TQCheckBox(i18n("Edit tqStatus:"), tqparent); - d->statusEdit = new KLineEdit(tqparent); + d->statusCheck = new TQCheckBox(i18n("Edit tqStatus:"), parent); + d->statusEdit = new KLineEdit(parent); d->statusEdit->setValidator(asciiValidator); d->statusEdit->setMaxLength(64); grid->addMultiCellWidget(d->statusCheck, 0, 0, 0, 2); @@ -112,8 +112,8 @@ IPTCtqStatus::IPTCtqStatus(TQWidget* tqparent) // -------------------------------------------------------- - d->priorityCheck = new MetadataCheckBox(i18n("Priority:"), tqparent); - d->priorityCB = new TQComboBox(false, tqparent); + d->priorityCheck = new MetadataCheckBox(i18n("Priority:"), parent); + d->priorityCB = new TQComboBox(false, parent); d->priorityCB->insertItem(i18n("0: None"), 0); d->priorityCB->insertItem(i18n("1: High"), 1); d->priorityCB->insertItem("2", 2); @@ -129,8 +129,8 @@ IPTCtqStatus::IPTCtqStatus(TQWidget* tqparent) // -------------------------------------------------------- - d->objectCycleCheck = new MetadataCheckBox(i18n("Object Cycle:"), tqparent); - d->objectCycleCB = new TQComboBox(false, tqparent); + d->objectCycleCheck = new MetadataCheckBox(i18n("Object Cycle:"), parent); + d->objectCycleCB = new TQComboBox(false, parent); d->objectCycleCB->insertItem(i18n("Morning"), 0); d->objectCycleCB->insertItem(i18n("Afternoon"), 1); d->objectCycleCB->insertItem(i18n("Evening"), 2); @@ -140,9 +140,9 @@ IPTCtqStatus::IPTCtqStatus(TQWidget* tqparent) // -------------------------------------------------------- - d->objectTypeCheck = new MetadataCheckBox(i18n("Object Type:"), tqparent); - d->objectTypeCB = new TQComboBox(false, tqparent); - d->objectTypeDescEdit = new KLineEdit(tqparent); + d->objectTypeCheck = new MetadataCheckBox(i18n("Object Type:"), parent); + d->objectTypeCB = new TQComboBox(false, parent); + d->objectTypeDescEdit = new KLineEdit(parent); d->objectTypeDescEdit->setValidator(asciiValidator); d->objectTypeDescEdit->setMaxLength(64); d->objectTypeCB->insertItem(i18n("News"), 0); @@ -157,9 +157,9 @@ IPTCtqStatus::IPTCtqStatus(TQWidget* tqparent) // -------------------------------------------------------- - d->objectAttributeCheck = new MetadataCheckBox(i18n("Object Attribute:"), tqparent); - d->objectAttributeCB = new TQComboBox(false, tqparent); - d->objectAttributeDescEdit = new KLineEdit(tqparent); + d->objectAttributeCheck = new MetadataCheckBox(i18n("Object Attribute:"), parent); + d->objectAttributeCB = new TQComboBox(false, parent); + d->objectAttributeDescEdit = new KLineEdit(parent); d->objectAttributeDescEdit->setValidator(asciiValidator); d->objectAttributeDescEdit->setMaxLength(64); d->objectAttributeCB->insertItem(i18n("Current"), 0); @@ -193,8 +193,8 @@ IPTCtqStatus::IPTCtqStatus(TQWidget* tqparent) // -------------------------------------------------------- - d->JobIDCheck = new TQCheckBox(i18n("Job Identification:"), tqparent); - d->JobIDEdit = new KLineEdit(tqparent); + d->JobIDCheck = new TQCheckBox(i18n("Job Identification:"), parent); + d->JobIDEdit = new KLineEdit(parent); d->JobIDEdit->setValidator(asciiValidator); d->JobIDEdit->setMaxLength(32); grid->addMultiCellWidget(d->JobIDCheck, 8, 8, 0, 2); @@ -209,7 +209,7 @@ IPTCtqStatus::IPTCtqStatus(TQWidget* tqparent) "text tags only support the printable " "<b><a href='http://en.wikipedia.org/wiki/Ascii'>ASCII</a></b> " "characters set and limit strings size. " - "Use contextual help for details.</b>"), tqparent); + "Use contextual help for details.</b>"), parent); grid->addMultiCellWidget(note, 10, 10, 0, 2); grid->setColStretch(2, 10); diff --git a/kipi-plugins/metadataedit/iptcstatus.h b/kipi-plugins/metadataedit/iptcstatus.h index 3108a49..a28744c 100644 --- a/kipi-plugins/metadataedit/iptcstatus.h +++ b/kipi-plugins/metadataedit/iptcstatus.h @@ -40,7 +40,7 @@ class IPTCtqStatus : public TQWidget public: - IPTCtqStatus(TQWidget* tqparent); + IPTCtqStatus(TQWidget* parent); ~IPTCtqStatus(); void applyMetadata(TQByteArray& iptcData); diff --git a/kipi-plugins/metadataedit/iptcsubjects.cpp b/kipi-plugins/metadataedit/iptcsubjects.cpp index 11ad303..d21a96e 100644 --- a/kipi-plugins/metadataedit/iptcsubjects.cpp +++ b/kipi-plugins/metadataedit/iptcsubjects.cpp @@ -75,11 +75,11 @@ public: KListBox *subjectsBox; }; -IPTCSubjects::IPTCSubjects(TQWidget* tqparent) - : TQWidget(tqparent) +IPTCSubjects::IPTCSubjects(TQWidget* parent) + : TQWidget(parent) { d = new IPTCSubjectsPriv; - TQGridLayout *grid = new TQGridLayout(tqparent, 5, 2, 0, KDialog::spacingHint()); + TQGridLayout *grid = new TQGridLayout(parent, 5, 2, 0, KDialog::spacingHint()); grid->tqsetAlignment( TQt::AlignTop ); // IPTC only accept printable Ascii char. @@ -88,19 +88,19 @@ IPTCSubjects::IPTCSubjects(TQWidget* tqparent) // -------------------------------------------------------- - d->subjectsCheck = new TQCheckBox(i18n("Use structured definition of the subject matter:"), tqparent); + d->subjectsCheck = new TQCheckBox(i18n("Use structured definition of the subject matter:"), parent); - d->subjectEdit = new KLineEdit(tqparent); + d->subjectEdit = new KLineEdit(parent); d->subjectEdit->setValidator(asciiValidator); d->subjectEdit->setMaxLength(236); TQWhatsThis::add(d->subjectEdit, i18n("<p>Enter here a new subject. " "This field is limited to 236 ASCII characters.")); - d->subjectsBox = new KListBox(tqparent); + d->subjectsBox = new KListBox(parent); d->subjectsBox->setVScrollBarMode(TQScrollView::AlwaysOn); - d->addSubjectButton = new TQPushButton( i18n("&Add"), tqparent); - d->delSubjectButton = new TQPushButton( i18n("&Delete"), tqparent); + d->addSubjectButton = new TQPushButton( i18n("&Add"), parent); + d->delSubjectButton = new TQPushButton( i18n("&Delete"), parent); d->addSubjectButton->setIconSet(SmallIcon("add")); d->delSubjectButton->setIconSet(SmallIcon("remove")); d->delSubjectButton->setEnabled(false); @@ -118,7 +118,7 @@ IPTCSubjects::IPTCSubjects(TQWidget* tqparent) "text tags only support the printable " "<b><a href='http://en.wikipedia.org/wiki/Ascii'>ASCII</a></b> " "characters set and limit strings size. " - "Use contextual help for details.</b>"), tqparent); + "Use contextual help for details.</b>"), parent); note->setMaximumWidth(150); grid->addMultiCellWidget(note, 4, 4, 1, 1); diff --git a/kipi-plugins/metadataedit/iptcsubjects.h b/kipi-plugins/metadataedit/iptcsubjects.h index 46e03f3..5b08a50 100644 --- a/kipi-plugins/metadataedit/iptcsubjects.h +++ b/kipi-plugins/metadataedit/iptcsubjects.h @@ -40,7 +40,7 @@ class IPTCSubjects : public TQWidget public: - IPTCSubjects(TQWidget* tqparent); + IPTCSubjects(TQWidget* parent); ~IPTCSubjects(); void applyMetadata(TQByteArray& iptcData); diff --git a/kipi-plugins/metadataedit/metadatacheckbox.cpp b/kipi-plugins/metadataedit/metadatacheckbox.cpp index 01a8f5d..7f5d3ca 100644 --- a/kipi-plugins/metadataedit/metadatacheckbox.cpp +++ b/kipi-plugins/metadataedit/metadatacheckbox.cpp @@ -31,8 +31,8 @@ namespace KIPIMetadataEditPlugin { -MetadataCheckBox::MetadataCheckBox(const TQString& text, TQWidget* tqparent) - : TQCheckBox(text, tqparent) +MetadataCheckBox::MetadataCheckBox(const TQString& text, TQWidget* parent) + : TQCheckBox(text, parent) { m_valid = true; diff --git a/kipi-plugins/metadataedit/metadatacheckbox.h b/kipi-plugins/metadataedit/metadatacheckbox.h index a349b58..56c65eb 100644 --- a/kipi-plugins/metadataedit/metadatacheckbox.h +++ b/kipi-plugins/metadataedit/metadatacheckbox.h @@ -40,7 +40,7 @@ class MetadataCheckBox : public TQCheckBox public: - MetadataCheckBox(const TQString& text, TQWidget* tqparent); + MetadataCheckBox(const TQString& text, TQWidget* parent); ~MetadataCheckBox(); void setValid(bool v); diff --git a/kipi-plugins/metadataedit/plugin_metadataedit.cpp b/kipi-plugins/metadataedit/plugin_metadataedit.cpp index 20fed59..d43de5a 100644 --- a/kipi-plugins/metadataedit/plugin_metadataedit.cpp +++ b/kipi-plugins/metadataedit/plugin_metadataedit.cpp @@ -55,8 +55,8 @@ typedef KGenericFactory<Plugin_MetadataEdit> Factory; K_EXPORT_COMPONENT_FACTORY( kipiplugin_metadataedit, Factory("kipiplugin_metadataedit")) -Plugin_MetadataEdit::Plugin_MetadataEdit(TQObject *tqparent, const char*, const TQStringList&) - : KIPI::Plugin( Factory::instance(), tqparent, "MetadataEdit") +Plugin_MetadataEdit::Plugin_MetadataEdit(TQObject *parent, const char*, const TQStringList&) + : KIPI::Plugin( Factory::instance(), parent, "MetadataEdit") { kdDebug( 51001 ) << "Plugin_MetadataEdit plugin loaded" << endl; } @@ -140,7 +140,7 @@ void Plugin_MetadataEdit::setup( TQWidget* widget ) addAction( m_actionMetadataEdit ); - m_interface = dynamic_cast< KIPI::Interface* >( tqparent() ); + m_interface = dynamic_cast< KIPI::Interface* >( parent() ); if ( !m_interface ) { diff --git a/kipi-plugins/metadataedit/plugin_metadataedit.h b/kipi-plugins/metadataedit/plugin_metadataedit.h index d4fd809..fde4da6 100644 --- a/kipi-plugins/metadataedit/plugin_metadataedit.h +++ b/kipi-plugins/metadataedit/plugin_metadataedit.h @@ -36,7 +36,7 @@ class Plugin_MetadataEdit : public KIPI::Plugin public: - Plugin_MetadataEdit(TQObject *tqparent, const char* name, const TQStringList &args); + Plugin_MetadataEdit(TQObject *parent, const char* name, const TQStringList &args); virtual KIPI::Category category( KAction* action ) const; virtual void setup( TQWidget* ); diff --git a/kipi-plugins/mpegencoder/checkbinprog.cpp b/kipi-plugins/mpegencoder/checkbinprog.cpp index 59103a6..8c9d455 100644 --- a/kipi-plugins/mpegencoder/checkbinprog.cpp +++ b/kipi-plugins/mpegencoder/checkbinprog.cpp @@ -43,7 +43,7 @@ namespace KIPIMPEGEncoderPlugin ///////////////////////////////// CONSTRUCTOR /////////////////////////////////////////////// -CheckBinProg::CheckBinProg(TQObject *tqparent) +CheckBinProg::CheckBinProg(TQObject *parent) { config = new KConfig("kipirc"); config->setGroup("MPEGEncoder Settings"); diff --git a/kipi-plugins/mpegencoder/checkbinprog.h b/kipi-plugins/mpegencoder/checkbinprog.h index 7ce17ef..7ed80c2 100644 --- a/kipi-plugins/mpegencoder/checkbinprog.h +++ b/kipi-plugins/mpegencoder/checkbinprog.h @@ -37,7 +37,7 @@ Q_OBJECT TQ_OBJECT public: - CheckBinProg(TQObject *tqparent=0); + CheckBinProg(TQObject *parent=0); virtual ~CheckBinProg(); int findExecutables( void ); diff --git a/kipi-plugins/mpegencoder/images2mpg b/kipi-plugins/mpegencoder/images2mpg index 665590c..9b15b7b 100755 --- a/kipi-plugins/mpegencoder/images2mpg +++ b/kipi-plugins/mpegencoder/images2mpg @@ -116,7 +116,7 @@ # Add a video type command line option (PAL, NTSC, SECAM). # Remove '-F' option (frame rate value -> fixed by video type option) # Add an exiting test of input image files before encoding. -# Add an exiting test of input audio files and tqmask file before encoding. +# Add an exiting test of input audio files and mask file before encoding. # Add an exiting test if verbosity level is unknown. # Add image sequence duration value test. # Add an implementation for don't used a default 'black.png' file. ImageMagick create a diff --git a/kipi-plugins/mpegencoder/kimg2mpg.cpp b/kipi-plugins/mpegencoder/kimg2mpg.cpp index 03eb1ea..be78b6d 100644 --- a/kipi-plugins/mpegencoder/kimg2mpg.cpp +++ b/kipi-plugins/mpegencoder/kimg2mpg.cpp @@ -108,9 +108,9 @@ namespace KIPIMPEGEncoderPlugin class ImageItem : public TQListBoxText { public: - ImageItem(TQListBox * tqparent, TQString const & name, TQString const & comments, TQString const & path, + ImageItem(TQListBox * parent, TQString const & name, TQString const & comments, TQString const & path, TQString const & album) - : TQListBoxText(tqparent), _name(name), _comments(comments), _path(path), _album(album) + : TQListBoxText(parent), _name(name), _comments(comments), _path(path), _album(album) {} TQString comments() { return _comments; } @@ -129,8 +129,8 @@ private: ///////////////////////////////////////////////////////////////////////////////////////////// -ListImageItems::ListImageItems(TQWidget *tqparent, const char *name) - : KListBox(tqparent, name) +ListImageItems::ListImageItems(TQWidget *parent, const char *name) + : KListBox(parent, name) { setSelectionMode (TQListBox::Extended); setAcceptDrops(true); @@ -179,8 +179,8 @@ void ListImageItems::dropEvent(TQDropEvent *e) /////////////////////////////// CONSTRUCTOR ///////////////////////////////////////////////// -KImg2mpgData::KImg2mpgData(KIPI::Interface* interface, TQWidget *tqparent, const char *name) - : KImg2mpgBase(tqparent, name), m_interface( interface ) +KImg2mpgData::KImg2mpgData(KIPI::Interface* interface, TQWidget *parent, const char *name) + : KImg2mpgBase(parent, name), m_interface( interface ) { m_TmpFolderConfig = ""; m_Proc = 0L; diff --git a/kipi-plugins/mpegencoder/kimg2mpg.h b/kipi-plugins/mpegencoder/kimg2mpg.h index 9868381..7e16e9f 100644 --- a/kipi-plugins/mpegencoder/kimg2mpg.h +++ b/kipi-plugins/mpegencoder/kimg2mpg.h @@ -80,7 +80,7 @@ Q_OBJECT TQ_OBJECT public: - ListImageItems(TQWidget *tqparent=0, const char *name=0); + ListImageItems(TQWidget *parent=0, const char *name=0); signals: void addedDropItems(KURL::List filesUrl); @@ -98,7 +98,7 @@ Q_OBJECT public: - KImg2mpgData( KIPI::Interface* interface, TQWidget* tqparent = 0, const char * name = 0 ); + KImg2mpgData( KIPI::Interface* interface, TQWidget* parent = 0, const char * name = 0 ); virtual ~KImg2mpgData(); void show(); diff --git a/kipi-plugins/mpegencoder/kshowdebuggingoutput.cpp b/kipi-plugins/mpegencoder/kshowdebuggingoutput.cpp index cd343d0..9343886 100644 --- a/kipi-plugins/mpegencoder/kshowdebuggingoutput.cpp +++ b/kipi-plugins/mpegencoder/kshowdebuggingoutput.cpp @@ -29,8 +29,8 @@ namespace KIPIMPEGEncoderPlugin ///////////////////////////////////////////////////////////////////////////////////////////// -KShowDebuggingOutput::KShowDebuggingOutput(TQString Messages, TQString Header, TQString Foot, TQWidget* tqparent ) - : KDialog( tqparent, "debugViewDialog", true ) +KShowDebuggingOutput::KShowDebuggingOutput(TQString Messages, TQString Header, TQString Foot, TQWidget* parent ) + : KDialog( parent, "debugViewDialog", true ) { setCaption( i18n("Debugging Output") ); diff --git a/kipi-plugins/mpegencoder/kshowdebuggingoutput.h b/kipi-plugins/mpegencoder/kshowdebuggingoutput.h index 60a2433..6a36569 100644 --- a/kipi-plugins/mpegencoder/kshowdebuggingoutput.h +++ b/kipi-plugins/mpegencoder/kshowdebuggingoutput.h @@ -44,7 +44,7 @@ Q_OBJECT TQ_OBJECT public: - KShowDebuggingOutput( TQString Messages, TQString Header, TQString Foot, TQWidget* tqparent ); + KShowDebuggingOutput( TQString Messages, TQString Header, TQString Foot, TQWidget* parent ); ~KShowDebuggingOutput(); public slots: diff --git a/kipi-plugins/mpegencoder/optionsdialog.cpp b/kipi-plugins/mpegencoder/optionsdialog.cpp index fe7ef1d..d657a86 100644 --- a/kipi-plugins/mpegencoder/optionsdialog.cpp +++ b/kipi-plugins/mpegencoder/optionsdialog.cpp @@ -47,8 +47,8 @@ namespace KIPIMPEGEncoderPlugin ////////////////////////////////// CONSTRUCTOR ////////////////////////////////////////////// -OptionsDialog::OptionsDialog(TQWidget *tqparent) - : KDialogBase( tqparent, "MPEGEncoderOptionsDialog", true, +OptionsDialog::OptionsDialog(TQWidget *parent) + : KDialogBase( parent, "MPEGEncoderOptionsDialog", true, i18n("MPEG Encoder Plugin Settings"), Ok|Cancel, Ok, false) { Icons = new KIconLoader( TQString( "MenuDlg" ) ); diff --git a/kipi-plugins/mpegencoder/optionsdialog.h b/kipi-plugins/mpegencoder/optionsdialog.h index b107576..3148d83 100644 --- a/kipi-plugins/mpegencoder/optionsdialog.h +++ b/kipi-plugins/mpegencoder/optionsdialog.h @@ -44,7 +44,7 @@ Q_OBJECT TQ_OBJECT public: - OptionsDialog(TQWidget *tqparent=0); + OptionsDialog(TQWidget *parent=0); ~OptionsDialog(); KLineEdit* IMBinFolderEditFilename; diff --git a/kipi-plugins/mpegencoder/plugin_mpegencoder.cpp b/kipi-plugins/mpegencoder/plugin_mpegencoder.cpp index f8e438a..cd562b5 100644 --- a/kipi-plugins/mpegencoder/plugin_mpegencoder.cpp +++ b/kipi-plugins/mpegencoder/plugin_mpegencoder.cpp @@ -49,8 +49,8 @@ typedef KGenericFactory<Plugin_Mpegencoder> Factory; K_EXPORT_COMPONENT_FACTORY( kipiplugin_mpegencoder, Factory("kipiplugin_mpegencoder")) -Plugin_Mpegencoder::Plugin_Mpegencoder(TQObject *tqparent, const char*, const TQStringList&) - : KIPI::Plugin( Factory::instance(), tqparent, "MPEGEncoder") +Plugin_Mpegencoder::Plugin_Mpegencoder(TQObject *parent, const char*, const TQStringList&) + : KIPI::Plugin( Factory::instance(), parent, "MPEGEncoder") { kdDebug( 51001 ) << "Plugin_Mpegencoder plugin loaded" << endl; } @@ -76,7 +76,7 @@ Plugin_Mpegencoder::~Plugin_Mpegencoder() void Plugin_Mpegencoder::slotActivate() { - KIPI::Interface* interface = dynamic_cast< KIPI::Interface* >( tqparent() ); + KIPI::Interface* interface = dynamic_cast< KIPI::Interface* >( parent() ); if ( !interface ) { diff --git a/kipi-plugins/mpegencoder/plugin_mpegencoder.h b/kipi-plugins/mpegencoder/plugin_mpegencoder.h index 0b8a5cf..f040040 100644 --- a/kipi-plugins/mpegencoder/plugin_mpegencoder.h +++ b/kipi-plugins/mpegencoder/plugin_mpegencoder.h @@ -35,7 +35,7 @@ Q_OBJECT public: - Plugin_Mpegencoder(TQObject *tqparent, const char* name, const TQStringList &args); + Plugin_Mpegencoder(TQObject *parent, const char* name, const TQStringList &args); virtual ~Plugin_Mpegencoder(); virtual KIPI::Category category( KAction* action ) const; virtual void setup( TQWidget* widget ); diff --git a/kipi-plugins/picasawebexport/picasaweblogin.cpp b/kipi-plugins/picasawebexport/picasaweblogin.cpp index 2d6a275..413a824 100644 --- a/kipi-plugins/picasawebexport/picasaweblogin.cpp +++ b/kipi-plugins/picasawebexport/picasaweblogin.cpp @@ -41,9 +41,9 @@ namespace KIPIPicasawebExportPlugin { -PicasawebLogin::PicasawebLogin(TQWidget* tqparent, const TQString& header, +PicasawebLogin::PicasawebLogin(TQWidget* parent, const TQString& header, const TQString& _name, const TQString& _passwd) - : TQDialog(tqparent) + : TQDialog(parent) { setSizeGripEnabled(false); diff --git a/kipi-plugins/picasawebexport/picasaweblogin.h b/kipi-plugins/picasawebexport/picasaweblogin.h index 69e0f37..86980d6 100644 --- a/kipi-plugins/picasawebexport/picasaweblogin.h +++ b/kipi-plugins/picasawebexport/picasaweblogin.h @@ -40,7 +40,7 @@ class PicasawebLogin : public TQDialog public: - PicasawebLogin(TQWidget* tqparent, const TQString& header, const TQString& _name=TQString(), + PicasawebLogin(TQWidget* parent, const TQString& header, const TQString& _name=TQString(), const TQString& _passwd=TQString()); ~PicasawebLogin(); diff --git a/kipi-plugins/picasawebexport/picasawebtalker.cpp b/kipi-plugins/picasawebexport/picasawebtalker.cpp index dd5b3c7..319373c 100644 --- a/kipi-plugins/picasawebexport/picasawebtalker.cpp +++ b/kipi-plugins/picasawebexport/picasawebtalker.cpp @@ -82,8 +82,8 @@ class PicasawebLogin; namespace KIPIPicasawebExportPlugin { -PicasawebTalker::PicasawebTalker( TQWidget* tqparent ) - : m_parent( tqparent ), m_job( 0 ) +PicasawebTalker::PicasawebTalker( TQWidget* parent ) + : m_parent( parent ), m_job( 0 ) { m_apikey="49d585bafa0758cb5c58ab67198bf632"; m_secret="34b39925e6273ffd"; diff --git a/kipi-plugins/picasawebexport/picasawebtalker.h b/kipi-plugins/picasawebexport/picasawebtalker.h index 05adacc..e2ca66a 100644 --- a/kipi-plugins/picasawebexport/picasawebtalker.h +++ b/kipi-plugins/picasawebexport/picasawebtalker.h @@ -75,7 +75,7 @@ public: public: - PicasawebTalker(TQWidget* tqparent); + PicasawebTalker(TQWidget* parent); ~PicasawebTalker(); TQValueList <PicasaWebAlbum> * m_albumsList; diff --git a/kipi-plugins/picasawebexport/picasawebviewitem.h b/kipi-plugins/picasawebexport/picasawebviewitem.h index bdf1e18..3bb98f4 100644 --- a/kipi-plugins/picasawebexport/picasawebviewitem.h +++ b/kipi-plugins/picasawebexport/picasawebviewitem.h @@ -40,11 +40,11 @@ class GAlbumViewItem : public TQListViewItem public: - GAlbumViewItem(TQListView* tqparent, const TQString& name, const GAlbum& _album) - : TQListViewItem(tqparent, name), album(_album) {}; + GAlbumViewItem(TQListView* parent, const TQString& name, const GAlbum& _album) + : TQListViewItem(parent, name), album(_album) {}; - GAlbumViewItem(TQListViewItem* tqparent, const TQString& name, const GAlbum& _album) - : TQListViewItem(tqparent, name), album(_album) {}; + GAlbumViewItem(TQListViewItem* parent, const TQString& name, const GAlbum& _album) + : TQListViewItem(parent, name), album(_album) {}; ~GAlbumViewItem() {}; diff --git a/kipi-plugins/picasawebexport/picasawebwidget.cpp b/kipi-plugins/picasawebexport/picasawebwidget.cpp index c9096c4..b6c6be9 100644 --- a/kipi-plugins/picasawebexport/picasawebwidget.cpp +++ b/kipi-plugins/picasawebexport/picasawebwidget.cpp @@ -52,8 +52,8 @@ namespace KIPIPicasawebExportPlugin { -PicasawebWidget::PicasawebWidget(TQWidget* tqparent, const char* name, WFlags fl) - : UploadWidget(tqparent, name, fl) +PicasawebWidget::PicasawebWidget(TQWidget* parent, const char* name, WFlags fl) + : UploadWidget(parent, name, fl) { if ( !name ) setName("PicasawebWidget"); diff --git a/kipi-plugins/picasawebexport/picasawebwidget.h b/kipi-plugins/picasawebexport/picasawebwidget.h index ca76c30..3a94d5b 100644 --- a/kipi-plugins/picasawebexport/picasawebwidget.h +++ b/kipi-plugins/picasawebexport/picasawebwidget.h @@ -52,7 +52,7 @@ class PicasawebWidget : public UploadWidget public: - PicasawebWidget(TQWidget* tqparent=0, const char* name=0, WFlags fl= 0); + PicasawebWidget(TQWidget* parent=0, const char* name=0, WFlags fl= 0); ~PicasawebWidget(); private slots: diff --git a/kipi-plugins/picasawebexport/picasawebwindow.cpp b/kipi-plugins/picasawebexport/picasawebwindow.cpp index 38d7af1..eaa0db4 100644 --- a/kipi-plugins/picasawebexport/picasawebwindow.cpp +++ b/kipi-plugins/picasawebexport/picasawebwindow.cpp @@ -80,7 +80,7 @@ namespace KIPIPicasawebExportPlugin { -PicasawebWindow::PicasawebWindow(KIPI::Interface* interface, const TQString &tmpFolder, TQWidget* /*tqparent*/) +PicasawebWindow::PicasawebWindow(KIPI::Interface* interface, const TQString &tmpFolder, TQWidget* /*parent*/) : KDialogBase(0, 0, false, i18n("Export to Picasa Web Service"), Help|Close, Close, false), m_tmp(tmpFolder) { diff --git a/kipi-plugins/picasawebexport/picasawebwindow.h b/kipi-plugins/picasawebexport/picasawebwindow.h index fa2c8d7..11d4079 100644 --- a/kipi-plugins/picasawebexport/picasawebwindow.h +++ b/kipi-plugins/picasawebexport/picasawebwindow.h @@ -81,7 +81,7 @@ class PicasawebWindow : public KDialogBase public: - PicasawebWindow(KIPI::Interface *interface, const TQString &tmpFolder,TQWidget *tqparent); + PicasawebWindow(KIPI::Interface *interface, const TQString &tmpFolder,TQWidget *parent); ~PicasawebWindow(); void getToken(TQString& username, TQString& password); diff --git a/kipi-plugins/picasawebexport/plugin_picasawebexport.cpp b/kipi-plugins/picasawebexport/plugin_picasawebexport.cpp index 01eae69..81e4642 100644 --- a/kipi-plugins/picasawebexport/plugin_picasawebexport.cpp +++ b/kipi-plugins/picasawebexport/plugin_picasawebexport.cpp @@ -53,8 +53,8 @@ typedef KGenericFactory<Plugin_PicasawebExport> Factory; K_EXPORT_COMPONENT_FACTORY(kipiplugin_picasawebexport, Factory("kipiplugin_picasawebexport")) -Plugin_PicasawebExport::Plugin_PicasawebExport(TQObject *tqparent, const char*, const TQStringList&) - : KIPI::Plugin(Factory::instance(), tqparent, "PicasawebExport") +Plugin_PicasawebExport::Plugin_PicasawebExport(TQObject *parent, const char*, const TQStringList&) + : KIPI::Plugin(Factory::instance(), parent, "PicasawebExport") { kdDebug(51001) << "Plugin_PicasawebExport plugin loaded" << endl; } @@ -71,7 +71,7 @@ void Plugin_PicasawebExport::setup(TQWidget* widget) actionCollection(), "picasawebexport"); - KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>(tqparent()); + KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>(parent()); if (!interface) { @@ -90,7 +90,7 @@ Plugin_PicasawebExport::~Plugin_PicasawebExport() void Plugin_PicasawebExport::slotActivate() { - KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>(tqparent()); + KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>(parent()); if (!interface) { kdError(51000) << "Kipi interface is null!" << endl; diff --git a/kipi-plugins/picasawebexport/plugin_picasawebexport.h b/kipi-plugins/picasawebexport/plugin_picasawebexport.h index 4ac156d..5de3af3 100644 --- a/kipi-plugins/picasawebexport/plugin_picasawebexport.h +++ b/kipi-plugins/picasawebexport/plugin_picasawebexport.h @@ -42,7 +42,7 @@ class Plugin_PicasawebExport : public KIPI::Plugin public: - Plugin_PicasawebExport(TQObject *tqparent, const char* name, const TQStringList &args); + Plugin_PicasawebExport(TQObject *parent, const char* name, const TQStringList &args); ~Plugin_PicasawebExport(); virtual KIPI::Category category(KAction* action) const; diff --git a/kipi-plugins/printwizard/cropframe.cpp b/kipi-plugins/printwizard/cropframe.cpp index 1f86ae5..4f9cf2e 100644 --- a/kipi-plugins/printwizard/cropframe.cpp +++ b/kipi-plugins/printwizard/cropframe.cpp @@ -36,8 +36,8 @@ extern "C" namespace KIPIPrintWizardPlugin { -CropFrame::CropFrame(TQWidget *tqparent=0, const char *name=0) - : TQWidget(tqparent, name) +CropFrame::CropFrame(TQWidget *parent=0, const char *name=0) + : TQWidget(parent, name) { m_mouseDown = false; } diff --git a/kipi-plugins/printwizard/cropframe.h b/kipi-plugins/printwizard/cropframe.h index 08ebcaa..03aeb5f 100644 --- a/kipi-plugins/printwizard/cropframe.h +++ b/kipi-plugins/printwizard/cropframe.h @@ -36,7 +36,7 @@ class CropFrame : public TQWidget TQ_OBJECT public: - CropFrame(TQWidget *tqparent, const char *name); + CropFrame(TQWidget *parent, const char *name); ~CropFrame(); void init(TPhoto *photo, int width, int height, bool autoRotate, bool paint = true); void setColor(TQColor); diff --git a/kipi-plugins/printwizard/frmprintwizard.cpp b/kipi-plugins/printwizard/frmprintwizard.cpp index 1a430c3..da53a00 100644 --- a/kipi-plugins/printwizard/frmprintwizard.cpp +++ b/kipi-plugins/printwizard/frmprintwizard.cpp @@ -78,8 +78,8 @@ inline int buttonGroupSelectedId(const TQButtonGroup* group) } -FrmPrintWizard::FrmPrintWizard(TQWidget *tqparent, const char *name ) - : FrmPrintWizardBase(tqparent, name) +FrmPrintWizard::FrmPrintWizard(TQWidget *parent, const char *name ) + : FrmPrintWizardBase(parent, name) { // enable help buttons for(int i = 0; i < pageCount(); ++i) diff --git a/kipi-plugins/printwizard/frmprintwizard.h b/kipi-plugins/printwizard/frmprintwizard.h index 42f8692..0c67d97 100644 --- a/kipi-plugins/printwizard/frmprintwizard.h +++ b/kipi-plugins/printwizard/frmprintwizard.h @@ -113,7 +113,7 @@ private: public: - FrmPrintWizard(TQWidget *tqparent=0, const char *name=0); + FrmPrintWizard(TQWidget *parent=0, const char *name=0); ~FrmPrintWizard(); void print( KURL::List fileList, TQString tempPath); TQRect * getLayout(int photoIndex); diff --git a/kipi-plugins/printwizard/plugin_printwizard.cpp b/kipi-plugins/printwizard/plugin_printwizard.cpp index bf80e05..55982b9 100644 --- a/kipi-plugins/printwizard/plugin_printwizard.cpp +++ b/kipi-plugins/printwizard/plugin_printwizard.cpp @@ -53,8 +53,8 @@ typedef KGenericFactory<Plugin_PrintWizard> Factory; K_EXPORT_COMPONENT_FACTORY( kipiplugin_printwizard, Factory("kipiplugin_printwizard")) -Plugin_PrintWizard::Plugin_PrintWizard(TQObject *tqparent, const char*, const TQStringList&) - : KIPI::Plugin(Factory::instance(), tqparent, "PrintWizard") +Plugin_PrintWizard::Plugin_PrintWizard(TQObject *parent, const char*, const TQStringList&) + : KIPI::Plugin(Factory::instance(), parent, "PrintWizard") { kdDebug( 51001 ) << "Plugin_PrintWizard plugin loaded" << endl; @@ -74,7 +74,7 @@ void Plugin_PrintWizard::setup( TQWidget* widget ) addAction( m_printAction ); - m_interface = dynamic_cast< KIPI::Interface* >( tqparent() ); + m_interface = dynamic_cast< KIPI::Interface* >( parent() ); if ( !m_interface ) { diff --git a/kipi-plugins/printwizard/plugin_printwizard.h b/kipi-plugins/printwizard/plugin_printwizard.h index 8844294..b367865 100644 --- a/kipi-plugins/printwizard/plugin_printwizard.h +++ b/kipi-plugins/printwizard/plugin_printwizard.h @@ -34,7 +34,7 @@ class Plugin_PrintWizard : public KIPI::Plugin public: - Plugin_PrintWizard(TQObject *tqparent, + Plugin_PrintWizard(TQObject *parent, const char* name, const TQStringList &args); ~Plugin_PrintWizard(); diff --git a/kipi-plugins/printwizard/utils.cpp b/kipi-plugins/printwizard/utils.cpp index bff1bd7..c54b4e8 100644 --- a/kipi-plugins/printwizard/utils.cpp +++ b/kipi-plugins/printwizard/utils.cpp @@ -74,7 +74,7 @@ bool launchExternalApp(TQStringList &args) return process.start(); } -bool checkTempPath(TQWidget *tqparent, TQString tempPath) +bool checkTempPath(TQWidget *parent, TQString tempPath) { // does the temp path exist? TQDir tempDir(tempPath); @@ -82,7 +82,7 @@ bool checkTempPath(TQWidget *tqparent, TQString tempPath) { if (!tempDir.mkdir(tempDir.path())) { - KMessageBox::sorry(tqparent, + KMessageBox::sorry(parent, i18n("Unable to create a temporary folder; " "please make sure you have proper permissions to this folder and try again.")); return false; diff --git a/kipi-plugins/printwizard/utils.h b/kipi-plugins/printwizard/utils.h index bacab08..a04fc59 100644 --- a/kipi-plugins/printwizard/utils.h +++ b/kipi-plugins/printwizard/utils.h @@ -29,7 +29,7 @@ int MIN(int a, int b); int MAX(int a, int b); bool launchExternalApp(TQStringList &args); -bool checkTempPath(TQWidget *tqparent, TQString tempPath); +bool checkTempPath(TQWidget *parent, TQString tempPath); } // NameSpace KIPIPrintWizardPlugin diff --git a/kipi-plugins/rawconverter/actionthread.cpp b/kipi-plugins/rawconverter/actionthread.cpp index ad85b81..1d6934b 100644 --- a/kipi-plugins/rawconverter/actionthread.cpp +++ b/kipi-plugins/rawconverter/actionthread.cpp @@ -54,8 +54,8 @@ extern "C" namespace KIPIRawConverterPlugin { -ActionThread::ActionThread(TQObject *tqparent) - : TQThread(), m_parent(tqparent) +ActionThread::ActionThread(TQObject *parent) + : TQThread(), m_parent(parent) { } diff --git a/kipi-plugins/rawconverter/actionthread.h b/kipi-plugins/rawconverter/actionthread.h index 044ca84..828f723 100644 --- a/kipi-plugins/rawconverter/actionthread.h +++ b/kipi-plugins/rawconverter/actionthread.h @@ -54,7 +54,7 @@ class ActionThread : public TQThread public: - ActionThread(TQObject *tqparent); + ActionThread(TQObject *parent); ~ActionThread(); void setRawDecodingSettings(KDcrawIface::RawDecodingSettings rawDecodingSettings, diff --git a/kipi-plugins/rawconverter/batchdialog.cpp b/kipi-plugins/rawconverter/batchdialog.cpp index c0a61fe..b5cc905 100644 --- a/kipi-plugins/rawconverter/batchdialog.cpp +++ b/kipi-plugins/rawconverter/batchdialog.cpp @@ -83,7 +83,7 @@ extern "C" namespace KIPIRawConverterPlugin { -BatchDialog::BatchDialog(TQWidget* /*tqparent*/) +BatchDialog::BatchDialog(TQWidget* /*parent*/) : KDialogBase(0, 0, false, i18n("Raw Images Batch Converter"), Help|Default|User1|User2|Close, Close, true, i18n("Con&vert"), i18n("&Abort")) diff --git a/kipi-plugins/rawconverter/batchdialog.h b/kipi-plugins/rawconverter/batchdialog.h index f7013cd..2bea35a 100644 --- a/kipi-plugins/rawconverter/batchdialog.h +++ b/kipi-plugins/rawconverter/batchdialog.h @@ -65,7 +65,7 @@ Q_OBJECT public: - BatchDialog(TQWidget *tqparent); + BatchDialog(TQWidget *parent); ~BatchDialog(); void addItems(const TQStringList& itemList); diff --git a/kipi-plugins/rawconverter/plugin_rawconverter.cpp b/kipi-plugins/rawconverter/plugin_rawconverter.cpp index 18ec120..483a063 100644 --- a/kipi-plugins/rawconverter/plugin_rawconverter.cpp +++ b/kipi-plugins/rawconverter/plugin_rawconverter.cpp @@ -72,8 +72,8 @@ typedef KGenericFactory<Plugin_RawConverter> Factory; K_EXPORT_COMPONENT_FACTORY( kipiplugin_rawconverter, Factory("kipiplugin_rawconverter")) -Plugin_RawConverter::Plugin_RawConverter(TQObject *tqparent, const char*, const TQStringList&) - : KIPI::Plugin( Factory::instance(), tqparent, "RawConverter") +Plugin_RawConverter::Plugin_RawConverter(TQObject *parent, const char*, const TQStringList&) + : KIPI::Plugin( Factory::instance(), parent, "RawConverter") { kdDebug( 51001 ) << "Loaded RawConverter" << endl; } @@ -100,7 +100,7 @@ void Plugin_RawConverter::setup( TQWidget* widget ) addAction( singleAction_ ); addAction( batchAction_ ); - KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>( tqparent() ); + KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>( parent() ); if ( !interface ) { @@ -147,7 +147,7 @@ bool Plugin_RawConverter::checkBinaries() void Plugin_RawConverter::slotActivateSingle() { - KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>( tqparent() ); + KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>( parent() ); if (!interface) { @@ -180,7 +180,7 @@ void Plugin_RawConverter::slotActivateSingle() void Plugin_RawConverter::slotActivateBatch() { - KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>( tqparent() ); + KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>( parent() ); if (!interface) { diff --git a/kipi-plugins/rawconverter/plugin_rawconverter.h b/kipi-plugins/rawconverter/plugin_rawconverter.h index 12b700f..39d6955 100644 --- a/kipi-plugins/rawconverter/plugin_rawconverter.h +++ b/kipi-plugins/rawconverter/plugin_rawconverter.h @@ -38,7 +38,7 @@ class Plugin_RawConverter : public KIPI::Plugin public: - Plugin_RawConverter(TQObject *tqparent, + Plugin_RawConverter(TQObject *parent, const char* name, const TQStringList &args); ~Plugin_RawConverter(); diff --git a/kipi-plugins/rawconverter/previewwidget.cpp b/kipi-plugins/rawconverter/previewwidget.cpp index 4718e0e..ed9ee83 100644 --- a/kipi-plugins/rawconverter/previewwidget.cpp +++ b/kipi-plugins/rawconverter/previewwidget.cpp @@ -62,8 +62,8 @@ public: TQImage image; }; -PreviewWidget::PreviewWidget(TQWidget *tqparent) - : TQFrame(tqparent, 0, TQt::WRepaintNoErase) +PreviewWidget::PreviewWidget(TQWidget *parent) + : TQFrame(parent, 0, TQt::WRepaintNoErase) { d = new PreviewWidgetPriv; setFrameStyle(TQFrame::GroupBoxPanel|TQFrame::Plain); diff --git a/kipi-plugins/rawconverter/previewwidget.h b/kipi-plugins/rawconverter/previewwidget.h index 58abf0f..f84ee41 100644 --- a/kipi-plugins/rawconverter/previewwidget.h +++ b/kipi-plugins/rawconverter/previewwidget.h @@ -46,7 +46,7 @@ class PreviewWidget : public TQFrame public: - PreviewWidget(TQWidget *tqparent); + PreviewWidget(TQWidget *parent); ~PreviewWidget(); void load(const TQString& file); diff --git a/kipi-plugins/rawconverter/savesettingswidget.cpp b/kipi-plugins/rawconverter/savesettingswidget.cpp index c6af08a..f511b5a 100644 --- a/kipi-plugins/rawconverter/savesettingswidget.cpp +++ b/kipi-plugins/rawconverter/savesettingswidget.cpp @@ -68,8 +68,8 @@ public: TQRadioButton *promptButton; }; -SaveSettingsWidget::SaveSettingsWidget(TQWidget *tqparent) - : TQWidget(tqparent, 0, TQt::WDestructiveClose) +SaveSettingsWidget::SaveSettingsWidget(TQWidget *parent) + : TQWidget(parent, 0, TQt::WDestructiveClose) { d = new SaveSettingsWidgetPriv; TQGridLayout* settingsBoxLayout = new TQGridLayout(this, 3, 1, KDialog::spacingHint()); diff --git a/kipi-plugins/rawconverter/savesettingswidget.h b/kipi-plugins/rawconverter/savesettingswidget.h index a5425a5..17bc42b 100644 --- a/kipi-plugins/rawconverter/savesettingswidget.h +++ b/kipi-plugins/rawconverter/savesettingswidget.h @@ -55,7 +55,7 @@ public: public: - SaveSettingsWidget(TQWidget *tqparent); + SaveSettingsWidget(TQWidget *parent); ~SaveSettingsWidget(); SaveSettingsWidget::OutputFormat fileFormat(); diff --git a/kipi-plugins/rawconverter/singledialog.cpp b/kipi-plugins/rawconverter/singledialog.cpp index fb954cf..a9fff66 100644 --- a/kipi-plugins/rawconverter/singledialog.cpp +++ b/kipi-plugins/rawconverter/singledialog.cpp @@ -79,7 +79,7 @@ extern "C" namespace KIPIRawConverterPlugin { -SingleDialog::SingleDialog(const TQString& file, TQWidget */*tqparent*/) +SingleDialog::SingleDialog(const TQString& file, TQWidget */*parent*/) : KDialogBase(0, 0, false, i18n("Raw Image Converter"), Help|Default|User1|User2|User3|Close, Close, true, i18n("&Preview"), i18n("Con&vert"), i18n("&Abort")) diff --git a/kipi-plugins/rawconverter/singledialog.h b/kipi-plugins/rawconverter/singledialog.h index 04cdd63..21d5738 100644 --- a/kipi-plugins/rawconverter/singledialog.h +++ b/kipi-plugins/rawconverter/singledialog.h @@ -59,7 +59,7 @@ class SingleDialog : public KDialogBase public: - SingleDialog(const TQString& file, TQWidget *tqparent); + SingleDialog(const TQString& file, TQWidget *parent); ~SingleDialog(); protected: diff --git a/kipi-plugins/sendimages/listimageserrordialog.cpp b/kipi-plugins/sendimages/listimageserrordialog.cpp index 6272e32..47db9af 100644 --- a/kipi-plugins/sendimages/listimageserrordialog.cpp +++ b/kipi-plugins/sendimages/listimageserrordialog.cpp @@ -45,10 +45,10 @@ namespace KIPISendimagesPlugin { -listImagesErrorDialog::listImagesErrorDialog(TQWidget* tqparent, TQString Caption, +listImagesErrorDialog::listImagesErrorDialog(TQWidget* parent, TQString Caption, const TQString &Mess1, const TQString &Mess2, KURL::List ListOfiles) - : KDialogBase( Caption, Yes|No|Cancel, Yes, Cancel, tqparent, + : KDialogBase( Caption, Yes|No|Cancel, Yes, Cancel, parent, "listImagesErrorDialog", true, false ) { TQWidget* box = new TQWidget( this ); diff --git a/kipi-plugins/sendimages/listimageserrordialog.h b/kipi-plugins/sendimages/listimageserrordialog.h index 39f27f8..eb8a586 100644 --- a/kipi-plugins/sendimages/listimageserrordialog.h +++ b/kipi-plugins/sendimages/listimageserrordialog.h @@ -40,7 +40,7 @@ class listImagesErrorDialog : public KDialogBase public: - listImagesErrorDialog(TQWidget* tqparent, TQString Caption, + listImagesErrorDialog(TQWidget* parent, TQString Caption, const TQString &Mess1, const TQString &Mess2, KURL::List ListOfiles); diff --git a/kipi-plugins/sendimages/plugin_sendimages.cpp b/kipi-plugins/sendimages/plugin_sendimages.cpp index 09d5ffa..8d00061 100644 --- a/kipi-plugins/sendimages/plugin_sendimages.cpp +++ b/kipi-plugins/sendimages/plugin_sendimages.cpp @@ -62,8 +62,8 @@ K_EXPORT_COMPONENT_FACTORY( kipiplugin_sendimages, Factory("kipiplugin_sendimages")) // ----------------------------------------------------------- -Plugin_SendImages::Plugin_SendImages(TQObject *tqparent, const char*, const TQStringList&) - : KIPI::Plugin( Factory::instance(), tqparent, "SendImages") +Plugin_SendImages::Plugin_SendImages(TQObject *parent, const char*, const TQStringList&) + : KIPI::Plugin( Factory::instance(), parent, "SendImages") { kdDebug( 51001 ) << "Plugin_SendImages plugin loaded" << endl; @@ -83,7 +83,7 @@ void Plugin_SendImages::setup( TQWidget* widget ) addAction( m_action_sendimages ); - KIPI::Interface* interface = dynamic_cast< KIPI::Interface* >( tqparent() ); + KIPI::Interface* interface = dynamic_cast< KIPI::Interface* >( parent() ); if ( !interface ) { kdError( 51000 ) << "Kipi interface is null!" << endl; @@ -106,7 +106,7 @@ void Plugin_SendImages::slotActivate() { m_progressDlg = 0; - KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>( tqparent() ); + KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>( parent() ); if ( !interface ) { kdError( 51000 ) << "Kipi interface is null!" << endl; diff --git a/kipi-plugins/sendimages/plugin_sendimages.h b/kipi-plugins/sendimages/plugin_sendimages.h index fd1eb20..a8fb237 100644 --- a/kipi-plugins/sendimages/plugin_sendimages.h +++ b/kipi-plugins/sendimages/plugin_sendimages.h @@ -44,7 +44,7 @@ Q_OBJECT public: - Plugin_SendImages(TQObject *tqparent, const char* name, const TQStringList &args); + Plugin_SendImages(TQObject *parent, const char* name, const TQStringList &args); ~Plugin_SendImages(); virtual KIPI::Category category( KAction* action ) const; diff --git a/kipi-plugins/sendimages/sendimages.cpp b/kipi-plugins/sendimages/sendimages.cpp index ed6f736..0b2a4bc 100644 --- a/kipi-plugins/sendimages/sendimages.cpp +++ b/kipi-plugins/sendimages/sendimages.cpp @@ -80,14 +80,14 @@ namespace KIPISendimagesPlugin ///Constructor: saves system handoff parameters in member variables SendImages::SendImages(KIPI::Interface* interface, const TQString &tmpFolder, - const KIPI::ImageCollection& imagesCollection, TQObject *tqparent) - : TQObject(tqparent), TQThread() + const KIPI::ImageCollection& imagesCollection, TQObject *parent) + : TQObject(parent), TQThread() { m_invokedBefore = false; m_interface = interface; m_tmp = tmpFolder; m_collection = imagesCollection; - m_parent = tqparent; + m_parent = parent; m_mozillaTimer = new TQTimer(this); KImageIO::registerFormats(); diff --git a/kipi-plugins/sendimages/sendimages.h b/kipi-plugins/sendimages/sendimages.h index 696aec4..867b15c 100644 --- a/kipi-plugins/sendimages/sendimages.h +++ b/kipi-plugins/sendimages/sendimages.h @@ -59,7 +59,7 @@ public: ///Constructor: saves system handoff parameters in member variables SendImages(KIPI::Interface* interface, const TQString &tmpFolder, - const KIPI::ImageCollection& imagesCollection, TQObject *tqparent=0); + const KIPI::ImageCollection& imagesCollection, TQObject *parent=0); ///Destructor ~SendImages(); diff --git a/kipi-plugins/sendimages/sendimagesdialog.cpp b/kipi-plugins/sendimages/sendimagesdialog.cpp index 2e91b61..cd99279 100644 --- a/kipi-plugins/sendimages/sendimagesdialog.cpp +++ b/kipi-plugins/sendimages/sendimagesdialog.cpp @@ -81,8 +81,8 @@ class ImageItem : public TQListBoxText { public: - ImageItem(TQListBox * tqparent, TQString const & comments, KURL const & url) - : TQListBoxText(tqparent), _comments(comments), _url(url) + ImageItem(TQListBox * parent, TQString const & comments, KURL const & url) + : TQListBoxText(parent), _comments(comments), _url(url) {} TQString comments() { return _comments; } @@ -97,8 +97,8 @@ private: KURL _url; }; -ListImageItems::ListImageItems(TQWidget *tqparent, const char *name) - : KListBox(tqparent, name) +ListImageItems::ListImageItems(TQWidget *parent, const char *name) + : KListBox(parent, name) { setSelectionMode (TQListBox::Extended); setAcceptDrops(true); @@ -135,10 +135,10 @@ void ListImageItems::dropEvent(TQDropEvent *e) emit addedDropItems(FilesPath); } -SendImagesDialog::SendImagesDialog(TQWidget *tqparent, KIPI::Interface* interface, +SendImagesDialog::SendImagesDialog(TQWidget *parent, KIPI::Interface* interface, const KIPI::ImageCollection& images ) : KDialogBase( IconList, i18n("Email Images Options"), Help|Ok|Cancel, - Ok, tqparent, "SendImagesDialog", false, true ) + Ok, parent, "SendImagesDialog", false, true ) { m_interface = interface; m_thumbJob = 0; diff --git a/kipi-plugins/sendimages/sendimagesdialog.h b/kipi-plugins/sendimages/sendimagesdialog.h index dd162e6..8de7ecf 100644 --- a/kipi-plugins/sendimages/sendimagesdialog.h +++ b/kipi-plugins/sendimages/sendimagesdialog.h @@ -69,7 +69,7 @@ class ListImageItems : public KListBox public: - ListImageItems(TQWidget *tqparent=0, const char *name=0); + ListImageItems(TQWidget *parent=0, const char *name=0); signals: @@ -89,7 +89,7 @@ class SendImagesDialog : public KDialogBase public: - SendImagesDialog(TQWidget *tqparent, KIPI::Interface* interface, + SendImagesDialog(TQWidget *parent, KIPI::Interface* interface, const KIPI::ImageCollection& images ); ~SendImagesDialog(); diff --git a/kipi-plugins/simpleviewerexport/firstrundlg.cpp b/kipi-plugins/simpleviewerexport/firstrundlg.cpp index 556f06d..dbf09f7 100644 --- a/kipi-plugins/simpleviewerexport/firstrundlg.cpp +++ b/kipi-plugins/simpleviewerexport/firstrundlg.cpp @@ -54,8 +54,8 @@ namespace KIPISimpleViewerExportPlugin { -FirstRunDlg::FirstRunDlg(TQWidget *tqparent) - : KDialogBase(tqparent, 0, true, i18n("Flash Export"), +FirstRunDlg::FirstRunDlg(TQWidget *parent) + : KDialogBase(parent, 0, true, i18n("Flash Export"), Help|Ok|Cancel, Ok, true) { enableButtonOK(false); diff --git a/kipi-plugins/simpleviewerexport/firstrundlg.h b/kipi-plugins/simpleviewerexport/firstrundlg.h index 9eac767..da1fd0a 100644 --- a/kipi-plugins/simpleviewerexport/firstrundlg.h +++ b/kipi-plugins/simpleviewerexport/firstrundlg.h @@ -57,7 +57,7 @@ class FirstRunDlg : public KDialogBase public: - FirstRunDlg(TQWidget *tqparent=0); + FirstRunDlg(TQWidget *parent=0); ~FirstRunDlg(); /** diff --git a/kipi-plugins/simpleviewerexport/plugin_simpleviewer.cpp b/kipi-plugins/simpleviewerexport/plugin_simpleviewer.cpp index 9692c72..ae3e88d 100644 --- a/kipi-plugins/simpleviewerexport/plugin_simpleviewer.cpp +++ b/kipi-plugins/simpleviewerexport/plugin_simpleviewer.cpp @@ -44,8 +44,8 @@ typedef KGenericFactory<Plugin_SimpleViewer> Factory; K_EXPORT_COMPONENT_FACTORY( kipiplugin_simpleviewer, Factory("kipiplugin_simpleviewer")) -Plugin_SimpleViewer::Plugin_SimpleViewer(TQObject *tqparent, const char*, const TQStringList&) - : KIPI::Plugin(Factory::instance(), tqparent, "SimpleViewer") +Plugin_SimpleViewer::Plugin_SimpleViewer(TQObject *parent, const char*, const TQStringList&) + : KIPI::Plugin(Factory::instance(), parent, "SimpleViewer") { kdDebug( 51001 ) << "Plugin_SimpleViewer plugin loaded" << endl; } @@ -64,7 +64,7 @@ void Plugin_SimpleViewer::setup( TQWidget* widget ) addAction( m_actionSimpleViewer ); - m_interface = dynamic_cast< KIPI::Interface* >( tqparent() ); + m_interface = dynamic_cast< KIPI::Interface* >( parent() ); if ( !m_interface ) { kdError( 51000 ) << "Kipi interface is null!" << endl; diff --git a/kipi-plugins/simpleviewerexport/plugin_simpleviewer.h b/kipi-plugins/simpleviewerexport/plugin_simpleviewer.h index d5f7bbc..62febd9 100644 --- a/kipi-plugins/simpleviewerexport/plugin_simpleviewer.h +++ b/kipi-plugins/simpleviewerexport/plugin_simpleviewer.h @@ -37,7 +37,7 @@ class Plugin_SimpleViewer : public KIPI::Plugin public: - Plugin_SimpleViewer(TQObject *tqparent, const char* name, const TQStringList &args); + Plugin_SimpleViewer(TQObject *parent, const char* name, const TQStringList &args); virtual KIPI::Category category( KAction* action ) const; virtual void setup( TQWidget* widget ); diff --git a/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp b/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp index 870cbe3..2a64ab6 100644 --- a/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp +++ b/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp @@ -79,9 +79,9 @@ namespace KIPISimpleViewerExportPlugin const int maxThumbSize = 45; const TQString viewer("viewer.swf"); -void SimpleViewerExport::run(KIPI::Interface* interface, TQObject *tqparent) +void SimpleViewerExport::run(KIPI::Interface* interface, TQObject *parent) { - SimpleViewerExport *plugin = new SimpleViewerExport(interface, tqparent); + SimpleViewerExport *plugin = new SimpleViewerExport(interface, parent); if(!plugin->checkSimpleViewer()) { @@ -98,8 +98,8 @@ void SimpleViewerExport::run(KIPI::Interface* interface, TQObject *tqparent) delete plugin; } -SimpleViewerExport::SimpleViewerExport(KIPI::Interface* interface, TQObject *tqparent) - : TQObject(tqparent) +SimpleViewerExport::SimpleViewerExport(KIPI::Interface* interface, TQObject *parent) + : TQObject(parent) { m_interface = interface; m_configDlg = 0; diff --git a/kipi-plugins/simpleviewerexport/simpleviewerexport.h b/kipi-plugins/simpleviewerexport/simpleviewerexport.h index 68b8eca..670cf8d 100644 --- a/kipi-plugins/simpleviewerexport/simpleviewerexport.h +++ b/kipi-plugins/simpleviewerexport/simpleviewerexport.h @@ -60,11 +60,11 @@ class SimpleViewerExport : public TQObject public: - static void run( KIPI::Interface* interface, TQObject *tqparent=0 ); + static void run( KIPI::Interface* interface, TQObject *parent=0 ); private: - SimpleViewerExport( KIPI::Interface* interface, TQObject *tqparent=0 ); + SimpleViewerExport( KIPI::Interface* interface, TQObject *parent=0 ); ~SimpleViewerExport(); bool configure(); diff --git a/kipi-plugins/simpleviewerexport/svedialog.cpp b/kipi-plugins/simpleviewerexport/svedialog.cpp index 91ad0f5..7c68d3c 100644 --- a/kipi-plugins/simpleviewerexport/svedialog.cpp +++ b/kipi-plugins/simpleviewerexport/svedialog.cpp @@ -65,9 +65,9 @@ namespace KIPISimpleViewerExportPlugin { -SVEDialog::SVEDialog(KIPI::Interface* interface, TQWidget *tqparent) +SVEDialog::SVEDialog(KIPI::Interface* interface, TQWidget *parent) : KDialogBase( IconList, i18n("Flash Export"), Help|Ok|Cancel, Ok, - tqparent, "SimpleViewerExportDialog", true, true ), + parent, "SimpleViewerExportDialog", true, true ), m_interface( interface ) { selectionPage(); diff --git a/kipi-plugins/simpleviewerexport/svedialog.h b/kipi-plugins/simpleviewerexport/svedialog.h index 1c629b3..a258f7f 100644 --- a/kipi-plugins/simpleviewerexport/svedialog.h +++ b/kipi-plugins/simpleviewerexport/svedialog.h @@ -61,7 +61,7 @@ class SVEDialog : public KDialogBase public: - SVEDialog( KIPI::Interface* interface, TQWidget *tqparent=0); + SVEDialog( KIPI::Interface* interface, TQWidget *parent=0); ~SVEDialog(); void readConfig(); diff --git a/kipi-plugins/slideshow/kbeffect.cpp b/kipi-plugins/slideshow/kbeffect.cpp index 76dbc5d..4204bb5 100644 --- a/kipi-plugins/slideshow/kbeffect.cpp +++ b/kipi-plugins/slideshow/kbeffect.cpp @@ -48,9 +48,9 @@ int KBEffect::m_numKBEffectRepeated = 0; // ------------------------------------------------------------------------- -KBEffect::KBEffect(SlideShowKB *tqparent, bool needFadeIn) { +KBEffect::KBEffect(SlideShowKB *parent, bool needFadeIn) { - this->slideWidget = tqparent; + this->slideWidget = parent; this->m_needFadeIn = needFadeIn; } @@ -99,8 +99,8 @@ KBEffect::Type KBEffect::chooseKBEffect(KBEffect::Type oldType) { // ------------------------------------------------------------------------- -FadeKBEffect::FadeKBEffect(SlideShowKB *tqparent, bool needFadeIn): - KBEffect(tqparent, needFadeIn) +FadeKBEffect::FadeKBEffect(SlideShowKB *parent, bool needFadeIn): + KBEffect(parent, needFadeIn) { m_img[0] = image(0); } @@ -138,8 +138,8 @@ void FadeKBEffect::advanceTime(float step) { // ------------------------------------------------------------------------- -BlendKBEffect::BlendKBEffect(SlideShowKB *tqparent, bool needFadeIn): - KBEffect(tqparent, needFadeIn) +BlendKBEffect::BlendKBEffect(SlideShowKB *parent, bool needFadeIn): + KBEffect(parent, needFadeIn) { m_img[0] = image(0); m_img[1] = 0; diff --git a/kipi-plugins/slideshow/kbeffect.h b/kipi-plugins/slideshow/kbeffect.h index 6490c1c..029efb5 100644 --- a/kipi-plugins/slideshow/kbeffect.h +++ b/kipi-plugins/slideshow/kbeffect.h @@ -39,7 +39,7 @@ public: typedef enum { Fade, Blend } Type; - KBEffect(SlideShowKB *tqparent, bool m_needFadeIn = true); + KBEffect(SlideShowKB *parent, bool m_needFadeIn = true); virtual ~KBEffect(); virtual void advanceTime(float step) = 0; @@ -73,7 +73,7 @@ class FadeKBEffect: public KBEffect public: - FadeKBEffect(SlideShowKB *tqparent, bool m_needFadeIn = true); + FadeKBEffect(SlideShowKB *parent, bool m_needFadeIn = true); virtual ~FadeKBEffect(); virtual void advanceTime(float step); @@ -88,7 +88,7 @@ class BlendKBEffect: public KBEffect public: - BlendKBEffect(SlideShowKB *tqparent, bool m_needFadeIn = true); + BlendKBEffect(SlideShowKB *parent, bool m_needFadeIn = true); virtual ~BlendKBEffect(); virtual void advanceTime(float step); diff --git a/kipi-plugins/slideshow/listimageitems.cpp b/kipi-plugins/slideshow/listimageitems.cpp index 6599385..32575a6 100644 --- a/kipi-plugins/slideshow/listimageitems.cpp +++ b/kipi-plugins/slideshow/listimageitems.cpp @@ -43,8 +43,8 @@ namespace KIPISlideShowPlugin { -ListImageItems::ListImageItems(TQWidget *tqparent, const char *name) - : KListBox(tqparent, name) +ListImageItems::ListImageItems(TQWidget *parent, const char *name) + : KListBox(parent, name) { setSelectionMode (TQListBox::Extended); setAcceptDrops(true); diff --git a/kipi-plugins/slideshow/listimageitems.h b/kipi-plugins/slideshow/listimageitems.h index 2cf738e..ce617f2 100644 --- a/kipi-plugins/slideshow/listimageitems.h +++ b/kipi-plugins/slideshow/listimageitems.h @@ -42,9 +42,9 @@ class ImageItem : public TQListBoxText public: - ImageItem(TQListBox * tqparent, TQString const & name, TQString const & comments, TQString const & path, + ImageItem(TQListBox * parent, TQString const & name, TQString const & comments, TQString const & path, TQString const & album) - : TQListBoxText(tqparent), _name(name), _comments(comments), _path(path), _album(album) + : TQListBoxText(parent), _name(name), _comments(comments), _path(path), _album(album) {} TQString comments() { return _comments; } @@ -68,7 +68,7 @@ class ListImageItems : public KListBox public: - ListImageItems(TQWidget *tqparent=0, const char *name=0); + ListImageItems(TQWidget *parent=0, const char *name=0); signals: diff --git a/kipi-plugins/slideshow/plugin_slideshow.cpp b/kipi-plugins/slideshow/plugin_slideshow.cpp index 17eae4e..428f2da 100644 --- a/kipi-plugins/slideshow/plugin_slideshow.cpp +++ b/kipi-plugins/slideshow/plugin_slideshow.cpp @@ -68,9 +68,9 @@ typedef KGenericFactory<Plugin_SlideShow> Factory; K_EXPORT_COMPONENT_FACTORY(kipiplugin_slideshow, Factory("kipiplugin_slideshow")); -Plugin_SlideShow::Plugin_SlideShow(TQObject *tqparent, const char*, +Plugin_SlideShow::Plugin_SlideShow(TQObject *parent, const char*, const TQStringList&) - : KIPI::Plugin( Factory::instance(), tqparent, "SlideShow") + : KIPI::Plugin( Factory::instance(), parent, "SlideShow") { kdDebug( 51001 ) << "Plugin_SlideShow plugin loaded" << endl; @@ -88,7 +88,7 @@ void Plugin_SlideShow::setup( TQWidget* widget ) actionCollection(), "slideshow"); - m_interface = dynamic_cast< KIPI::Interface* >( tqparent() ); + m_interface = dynamic_cast< KIPI::Interface* >( parent() ); m_urlList = new KURL::List(); @@ -149,7 +149,7 @@ void Plugin_SlideShow::slotAlbumChanged(bool anyAlbum) return; } - KIPI::Interface* m_interface = dynamic_cast<KIPI::Interface*>( tqparent() ); + KIPI::Interface* m_interface = dynamic_cast<KIPI::Interface*>( parent() ); if ( !m_interface ) { kdError( 51000 ) << "Kipi m_interface is null!" << endl; diff --git a/kipi-plugins/slideshow/plugin_slideshow.h b/kipi-plugins/slideshow/plugin_slideshow.h index eb66060..798fe23 100644 --- a/kipi-plugins/slideshow/plugin_slideshow.h +++ b/kipi-plugins/slideshow/plugin_slideshow.h @@ -42,7 +42,7 @@ class Plugin_SlideShow : public KIPI::Plugin public: - Plugin_SlideShow(TQObject *tqparent, const char* name, + Plugin_SlideShow(TQObject *parent, const char* name, const TQStringList &args); ~Plugin_SlideShow(); diff --git a/kipi-plugins/slideshow/slideshowconfig.cpp b/kipi-plugins/slideshow/slideshowconfig.cpp index c676baf..d372f95 100644 --- a/kipi-plugins/slideshow/slideshowconfig.cpp +++ b/kipi-plugins/slideshow/slideshowconfig.cpp @@ -75,9 +75,9 @@ namespace KIPISlideShowPlugin { SlideShowConfig::SlideShowConfig(bool allowSelectedOnly, KIPI::Interface * interface, - TQWidget *tqparent, const char* name, bool ImagesHasComments, + TQWidget *parent, const char* name, bool ImagesHasComments, KURL::List *urlList) - : SlideShowConfigBase(tqparent, name) + : SlideShowConfigBase(parent, name) { // About data and help button. diff --git a/kipi-plugins/slideshow/slideshowconfig.h b/kipi-plugins/slideshow/slideshowconfig.h index 42c8bd0..34f4201 100644 --- a/kipi-plugins/slideshow/slideshowconfig.h +++ b/kipi-plugins/slideshow/slideshowconfig.h @@ -55,7 +55,7 @@ class SlideShowConfig : public SlideShowConfigBase public: SlideShowConfig(bool allowSelectedOnly, KIPI::Interface* interface, - TQWidget *tqparent, const char* name, bool ImagesHasComments, + TQWidget *parent, const char* name, bool ImagesHasComments, KURL::List* urlList); ~SlideShowConfig(); diff --git a/kipi-plugins/slideshow/toolbar.cpp b/kipi-plugins/slideshow/toolbar.cpp index 8a4d3ce..b8136aa 100644 --- a/kipi-plugins/slideshow/toolbar.cpp +++ b/kipi-plugins/slideshow/toolbar.cpp @@ -41,8 +41,8 @@ namespace KIPISlideShowPlugin { -ToolBar::ToolBar(TQWidget* tqparent) - : TQWidget(tqparent) +ToolBar::ToolBar(TQWidget* parent) + : TQWidget(parent) { TQHBoxLayout* lay = new TQHBoxLayout(this); m_playBtn = new TQToolButton(this); diff --git a/kipi-plugins/slideshow/toolbar.h b/kipi-plugins/slideshow/toolbar.h index 8712006..d3b248f 100644 --- a/kipi-plugins/slideshow/toolbar.h +++ b/kipi-plugins/slideshow/toolbar.h @@ -40,7 +40,7 @@ class ToolBar : public TQWidget public: - ToolBar(TQWidget* tqparent); + ToolBar(TQWidget* parent); ~ToolBar(); bool canHide() const; diff --git a/kipi-plugins/sync/galleryviewitem.h b/kipi-plugins/sync/galleryviewitem.h index 6a40c69..bb8295d 100644 --- a/kipi-plugins/sync/galleryviewitem.h +++ b/kipi-plugins/sync/galleryviewitem.h @@ -30,12 +30,12 @@ class GAlbumViewItem : public TQListViewItem { public: - GAlbumViewItem(TQListView* tqparent, const TQString& name, + GAlbumViewItem(TQListView* parent, const TQString& name, const GAlbum& _album) - : TQListViewItem(tqparent, name), album(_album) {} - GAlbumViewItem(TQListViewItem* tqparent, const TQString& name, + : TQListViewItem(parent, name), album(_album) {} + GAlbumViewItem(TQListViewItem* parent, const TQString& name, const GAlbum& _album) - : TQListViewItem(tqparent, name), album(_album) {} + : TQListViewItem(parent, name), album(_album) {} GAlbum album; diff --git a/kipi-plugins/sync/gallerywidget.cpp b/kipi-plugins/sync/gallerywidget.cpp index 97e6818..d9472da 100644 --- a/kipi-plugins/sync/gallerywidget.cpp +++ b/kipi-plugins/sync/gallerywidget.cpp @@ -42,8 +42,8 @@ namespace KIPIGalleryExportPlugin { -GalleryWidget::GalleryWidget( TQWidget* tqparent, const char* name, WFlags fl ) - : TQWidget( tqparent, name, fl ) +GalleryWidget::GalleryWidget( TQWidget* parent, const char* name, WFlags fl ) + : TQWidget( parent, name, fl ) { if ( !name ) setName( "GalleryWidget" ); diff --git a/kipi-plugins/sync/gallerywidget.h b/kipi-plugins/sync/gallerywidget.h index 4f1f081..3ed8111 100644 --- a/kipi-plugins/sync/gallerywidget.h +++ b/kipi-plugins/sync/gallerywidget.h @@ -37,7 +37,7 @@ class GalleryWidget : public TQWidget public: - GalleryWidget( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + GalleryWidget( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~GalleryWidget(); private slots: diff --git a/kipi-plugins/sync/gallerywindow.cpp b/kipi-plugins/sync/gallerywindow.cpp index ebaf53e..336e6d4 100644 --- a/kipi-plugins/sync/gallerywindow.cpp +++ b/kipi-plugins/sync/gallerywindow.cpp @@ -68,8 +68,8 @@ namespace KIPIGalleryExportPlugin { -GalleryWindow::GalleryWindow(KIPI::Interface* interface, TQWidget *tqparent, Galleries* pGalleries) - : KDialogBase(tqparent, 0, true, i18n("Gallery Export"), Help|Close, Close, false), +GalleryWindow::GalleryWindow(KIPI::Interface* interface, TQWidget *parent, Galleries* pGalleries) + : KDialogBase(parent, 0, true, i18n("Gallery Export"), Help|Close, Close, false), m_interface(interface), mpGalleries(pGalleries) { @@ -285,17 +285,17 @@ void GalleryWindow::slotAlbums( const TQValueList<GAlbum>& albumList ) } else { - TQListViewItem* tqparent = m_albumDict.find( album.parent_ref_num ); - if ( tqparent ) + TQListViewItem* parent = m_albumDict.find( album.parent_ref_num ); + if ( parent ) { - GAlbumViewItem* item = new GAlbumViewItem( tqparent, album.title, + GAlbumViewItem* item = new GAlbumViewItem( parent, album.title, album); item->setPixmap( 0, pix ); m_albumDict.insert( album.ref_num, item ); } else { - kdWarning() << "Failed to find tqparent for album " + kdWarning() << "Failed to find parent for album " << album.name << " with id " << album.ref_num << "\n"; } diff --git a/kipi-plugins/sync/gallerywindow.h b/kipi-plugins/sync/gallerywindow.h index bf8d378..87c7d52 100644 --- a/kipi-plugins/sync/gallerywindow.h +++ b/kipi-plugins/sync/gallerywindow.h @@ -57,7 +57,7 @@ class GalleryWindow : public KDialogBase public: - GalleryWindow(KIPI::Interface *interface, TQWidget *tqparent, Galleries* pGalleries); + GalleryWindow(KIPI::Interface *interface, TQWidget *parent, Galleries* pGalleries); ~GalleryWindow(); private: diff --git a/kipi-plugins/sync/libkipi2/collection.h b/kipi-plugins/sync/libkipi2/collection.h index 931fa7c..8ebd4d0 100644 --- a/kipi-plugins/sync/libkipi2/collection.h +++ b/kipi-plugins/sync/libkipi2/collection.h @@ -68,7 +68,7 @@ namespace KIPI2 virtual const Item* addItem() = 0; private: - // Store for tqparent + // Store for parent Collection* mpParent; // Store the features that this collection supports diff --git a/kipi-plugins/sync/plugin_sync.cpp b/kipi-plugins/sync/plugin_sync.cpp index 69a0c06..cf28e1e 100644 --- a/kipi-plugins/sync/plugin_sync.cpp +++ b/kipi-plugins/sync/plugin_sync.cpp @@ -44,10 +44,10 @@ K_EXPORT_COMPONENT_FACTORY(kipiplugin_sync, Factory("kipiplugin_sync")) -Plugin_Sync::Plugin_Sync(TQObject *tqparent, +Plugin_Sync::Plugin_Sync(TQObject *parent, const char*, const TQStringList&) - : KIPI::Plugin(Factory::instance(), tqparent, "Sync"), + : KIPI::Plugin(Factory::instance(), parent, "Sync"), mpSinks(NULL) { kdDebug(51001) << "Plugin_Sync plugin loaded" @@ -63,7 +63,7 @@ void Plugin_Sync::setup(TQWidget* widget) // Standard initialisation for Kipi Plugins KIPI::Plugin::setup(widget); - KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>(tqparent()); + KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>(parent()); if (!interface) { @@ -122,7 +122,7 @@ Plugin_Sync::~Plugin_Sync() void Plugin_Sync::slotSync() { - KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>(tqparent()); + KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>(parent()); if (!interface) { kdError( 51000 ) << "Kipi interface is null!" << endl; @@ -137,7 +137,7 @@ void Plugin_Sync::slotSync() void Plugin_Sync::slotConfigure() { - KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>(tqparent()); + KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>(parent()); if (!interface) { kdError(51000) << "Kipi interface is null!" << endl; @@ -152,7 +152,7 @@ void Plugin_Sync::slotConfigure() void Plugin_Sync::slotSettingsCollection() { - KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>(tqparent()); + KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>(parent()); if (!interface) { kdError(51000) << "Kipi interface is null!" << endl; @@ -165,7 +165,7 @@ void Plugin_Sync::slotSettingsCollection() void Plugin_Sync::slotSettingsImage() { - KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>(tqparent()); + KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>(parent()); if (!interface) { kdError(51000) << "Kipi interface is null!" << endl; diff --git a/kipi-plugins/sync/sinks/gallery/gallerysink.cpp b/kipi-plugins/sync/sinks/gallery/gallerysink.cpp index acfae60..3035e27 100644 --- a/kipi-plugins/sync/sinks/gallery/gallerysink.cpp +++ b/kipi-plugins/sync/sinks/gallery/gallerysink.cpp @@ -438,7 +438,7 @@ void GallerySink::parseResponseListAlbums(const TQByteArray &data) if (iter != albumList.end()) (*iter).summary = value; } - else if (key.startsWith("album.tqparent")) + else if (key.startsWith("album.parent")) { if (iter != albumList.end()) (*iter).parent_ref_num = value.toInt(); @@ -484,7 +484,7 @@ void GallerySink::parseResponseListAlbums(const TQByteArray &data) return; } - // We need tqparent albums to come first for rest of the code to work + // We need parent albums to come first for rest of the code to work qHeapSort(albumList); emit signalAlbums( albumList ); diff --git a/kipi-plugins/timeadjust/plugin_timeadjust.cpp b/kipi-plugins/timeadjust/plugin_timeadjust.cpp index 1bb2986..67e6c3a 100644 --- a/kipi-plugins/timeadjust/plugin_timeadjust.cpp +++ b/kipi-plugins/timeadjust/plugin_timeadjust.cpp @@ -46,8 +46,8 @@ typedef KGenericFactory<Plugin_TimeAdjust> Factory; K_EXPORT_COMPONENT_FACTORY( kipiplugin_timeadjust, Factory("kipiplugin_timeadjust")) -Plugin_TimeAdjust::Plugin_TimeAdjust(TQObject *tqparent, const char*, const TQStringList&) - : KIPI::Plugin( Factory::instance(), tqparent, "TimeAdjust") +Plugin_TimeAdjust::Plugin_TimeAdjust(TQObject *parent, const char*, const TQStringList&) + : KIPI::Plugin( Factory::instance(), parent, "TimeAdjust") { kdDebug( 51001 ) << "Plugin_TimeAdjust plugin loaded" << endl; } @@ -68,7 +68,7 @@ void Plugin_TimeAdjust::setup(TQWidget* widget) addAction(m_actionTimeAjust); - m_interface = dynamic_cast< KIPI::Interface* >(tqparent()); + m_interface = dynamic_cast< KIPI::Interface* >(parent()); if (!m_interface) { diff --git a/kipi-plugins/timeadjust/plugin_timeadjust.h b/kipi-plugins/timeadjust/plugin_timeadjust.h index 81b8077..d23bd4a 100644 --- a/kipi-plugins/timeadjust/plugin_timeadjust.h +++ b/kipi-plugins/timeadjust/plugin_timeadjust.h @@ -37,7 +37,7 @@ class Plugin_TimeAdjust : public KIPI::Plugin public: - Plugin_TimeAdjust(TQObject *tqparent, const char* name, const TQStringList &args); + Plugin_TimeAdjust(TQObject *parent, const char* name, const TQStringList &args); virtual KIPI::Category category( KAction* action ) const; virtual void setup( TQWidget* ); diff --git a/kipi-plugins/timeadjust/timeadjustdialog.cpp b/kipi-plugins/timeadjust/timeadjustdialog.cpp index bae8864..b693ee6 100644 --- a/kipi-plugins/timeadjust/timeadjustdialog.cpp +++ b/kipi-plugins/timeadjust/timeadjustdialog.cpp @@ -146,9 +146,9 @@ public: KIPIPlugins::KPAboutData *about; }; -TimeAdjustDialog::TimeAdjustDialog(KIPI::Interface* interface, TQWidget* tqparent) +TimeAdjustDialog::TimeAdjustDialog(KIPI::Interface* interface, TQWidget* parent) : KDialogBase(Plain, i18n("Adjust Time & Date"), Help|Ok|Cancel, - Ok, tqparent, 0, true, true) + Ok, parent, 0, true, true) { d = new TimeAdjustDialogPrivate; d->interface = interface; diff --git a/kipi-plugins/timeadjust/timeadjustdialog.h b/kipi-plugins/timeadjust/timeadjustdialog.h index e932fed..810f2ef 100644 --- a/kipi-plugins/timeadjust/timeadjustdialog.h +++ b/kipi-plugins/timeadjust/timeadjustdialog.h @@ -50,7 +50,7 @@ class TimeAdjustDialog :public KDialogBase public: - TimeAdjustDialog(KIPI::Interface* interface, TQWidget* tqparent); + TimeAdjustDialog(KIPI::Interface* interface, TQWidget* parent); ~TimeAdjustDialog(); void setImages(const KURL::List& images); diff --git a/kipi-plugins/wallpaper/plugin_wallpaper.cpp b/kipi-plugins/wallpaper/plugin_wallpaper.cpp index 1a4da77..90efa9e 100644 --- a/kipi-plugins/wallpaper/plugin_wallpaper.cpp +++ b/kipi-plugins/wallpaper/plugin_wallpaper.cpp @@ -56,8 +56,8 @@ K_EXPORT_COMPONENT_FACTORY( kipiplugin_wallpaper, ///////////////////////////////////////////////////////////////////////////////////////////////////// - Plugin_WallPaper::Plugin_WallPaper(TQObject *tqparent, const char*, const TQStringList&) - : KIPI::Plugin( Factory::instance(), tqparent, "WallPaper") + Plugin_WallPaper::Plugin_WallPaper(TQObject *parent, const char*, const TQStringList&) + : KIPI::Plugin( Factory::instance(), parent, "WallPaper") { kdDebug( 51001 ) << "Plugin_WallPaper plugin loaded" << endl; } @@ -132,7 +132,7 @@ void Plugin_WallPaper::setup( TQWidget* widget ) addAction( m_action_Background ); - KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>( tqparent() ); + KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>( parent() ); if ( !interface ) { @@ -217,7 +217,7 @@ void Plugin_WallPaper::setWallpaper(int tqlayout) if (tqlayout>SCALE_AND_CROP || tqlayout < CENTER) return; - KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>( tqparent() ); + KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>( parent() ); if ( !interface ) { @@ -237,7 +237,7 @@ void Plugin_WallPaper::setWallpaper(int tqlayout) } else { - // PENDING We need a way to get a tqparent widget + // PENDING We need a way to get a parent widget // Sun, 06 Jun 2004 - Aur�ien KMessageBox::information( TQT_TQWIDGET(kapp->activeWindow()), i18n( diff --git a/kipi-plugins/wallpaper/plugin_wallpaper.h b/kipi-plugins/wallpaper/plugin_wallpaper.h index 6be59b3..03db2fc 100644 --- a/kipi-plugins/wallpaper/plugin_wallpaper.h +++ b/kipi-plugins/wallpaper/plugin_wallpaper.h @@ -45,7 +45,7 @@ public: - Plugin_WallPaper(TQObject *tqparent, + Plugin_WallPaper(TQObject *parent, const char* name, const TQStringList &args); virtual KIPI::Category category( KAction* action ) const; |