From d01079300c45612c46c51367b81573a0f4ea2637 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 18 Dec 2023 22:46:54 +0900 Subject: Replace various '#define' strings - part 6 Signed-off-by: Michele Calgaro (cherry picked from commit 663bed0454b6dd41036ee96d1e6f01b11acbcc6f) --- .../acquireimages/plugin_acquireimages.cpp | 8 ++-- .../batchprocessimagesdialog.cpp | 12 ++--- kipi-plugins/batchprocessimages/imagepreview.cpp | 2 +- .../plugin_batchprocessimages.cpp | 18 +++---- kipi-plugins/calendar/calwizard.cpp | 2 +- kipi-plugins/calendar/plugin_calendar.cpp | 2 +- kipi-plugins/cdarchiving/cdarchiving.cpp | 2 +- kipi-plugins/cdarchiving/plugin_cdarchiving.cpp | 2 +- kipi-plugins/findimages/finddupplicateimages.cpp | 6 +-- kipi-plugins/findimages/plugin_findimages.cpp | 2 +- kipi-plugins/flickrexport/flickrtalker.cpp | 6 +-- kipi-plugins/flickrexport/plugin_flickrexport.cpp | 2 +- kipi-plugins/galleryexport/gallerylist.cpp | 6 +-- .../galleryexport/plugin_galleryexport.cpp | 8 ++-- kipi-plugins/gpssync/gpseditdialog.cpp | 6 +-- kipi-plugins/gpssync/plugin_gpssync.cpp | 16 +++---- kipi-plugins/ipodexport/plugin_ipodexport.cpp | 2 +- kipi-plugins/jpeglossless/plugin_jpeglossless.cpp | 8 ++-- kipi-plugins/kameraklient/cameraui.cpp | 56 +++++++++++----------- kipi-plugins/kameraklient/gpeventfilter.cpp | 2 +- kipi-plugins/kameraklient/savefiledialog.cpp | 12 ++--- kipi-plugins/metadataedit/exifcaption.cpp | 2 +- kipi-plugins/metadataedit/exifdevice.cpp | 2 +- kipi-plugins/metadataedit/iptccaption.cpp | 2 +- kipi-plugins/metadataedit/iptccategories.cpp | 2 +- kipi-plugins/metadataedit/iptccredits.cpp | 2 +- kipi-plugins/metadataedit/iptckeywords.cpp | 2 +- kipi-plugins/metadataedit/iptcorigin.cpp | 2 +- kipi-plugins/metadataedit/iptcstatus.cpp | 2 +- kipi-plugins/metadataedit/iptcsubjects.cpp | 2 +- kipi-plugins/metadataedit/plugin_metadataedit.cpp | 40 ++++++++-------- kipi-plugins/mpegencoder/checkbinprog.cpp | 6 +-- kipi-plugins/mpegencoder/kimg2mpg.cpp | 2 +- kipi-plugins/mpegencoder/plugin_mpegencoder.cpp | 2 +- kipi-plugins/picasawebexport/picasawebtalker.cpp | 4 +- kipi-plugins/picasawebexport/picasawebwindow.cpp | 2 +- .../picasawebexport/plugin_picasawebexport.cpp | 2 +- kipi-plugins/printwizard/plugin_printwizard.cpp | 4 +- kipi-plugins/rawconverter/batchdialog.cpp | 2 +- kipi-plugins/rawconverter/plugin_rawconverter.cpp | 6 +-- kipi-plugins/rawconverter/singledialog.cpp | 2 +- kipi-plugins/sendimages/plugin_sendimages.cpp | 2 +- kipi-plugins/sendimages/sendimages.cpp | 18 +++---- .../simpleviewerexport/simpleviewerexport.cpp | 26 +++++----- kipi-plugins/timeadjust/plugin_timeadjust.cpp | 2 +- kipi-plugins/timeadjust/timeadjustdialog.cpp | 2 +- kipi-plugins/wallpaper/plugin_wallpaper.cpp | 4 +- 47 files changed, 162 insertions(+), 162 deletions(-) diff --git a/kipi-plugins/acquireimages/plugin_acquireimages.cpp b/kipi-plugins/acquireimages/plugin_acquireimages.cpp index 1753b9f..a8bd7a8 100644 --- a/kipi-plugins/acquireimages/plugin_acquireimages.cpp +++ b/kipi-plugins/acquireimages/plugin_acquireimages.cpp @@ -100,7 +100,7 @@ void Plugin_AcquireImages::slotActivate() if (from == "scan_images") { - m_scanDialog = KScanDialog::getScanDialog(TQT_TQWIDGET(kapp->activeWindow()), "KIPI Scan Images Plugin"); + m_scanDialog = KScanDialog::getScanDialog(kapp->activeWindow(), "KIPI Scan Images Plugin"); if ( m_scanDialog ) { @@ -111,7 +111,7 @@ void Plugin_AcquireImages::slotActivate() } else { - KMessageBox::sorry(TQT_TQWIDGET(kapp->activeWindow()), i18n("No TDE scan-service available; check your system."), + KMessageBox::sorry(kapp->activeWindow(), i18n("No TDE scan-service available; check your system."), i18n("KIPI's 'Scan Images' Plugin")); kdDebug ( 51000 ) << "No Scan-service available, aborting!" << endl; return; @@ -123,7 +123,7 @@ void Plugin_AcquireImages::slotActivate() else if (from == "screenshot_images") { m_screenshotDialog = new KIPIAcquireImagesPlugin::ScreenGrabDialog(interface, - TQT_TQWIDGET(kapp->activeWindow()), "KIPI ScreenshotImagesDialog"); + kapp->activeWindow(), "KIPI ScreenshotImagesDialog"); m_screenshotDialog->show(); } else @@ -152,7 +152,7 @@ void Plugin_AcquireImages::slotAcquireImageDone(const TQImage &img) return; } - m_acquireImageDialog = new KIPIAcquireImagesPlugin::AcquireImageDialog( interface, TQT_TQWIDGET(kapp->activeWindow()), img); + m_acquireImageDialog = new KIPIAcquireImagesPlugin::AcquireImageDialog( interface, kapp->activeWindow(), img); m_acquireImageDialog->setMinimumWidth(400); m_acquireImageDialog->exec(); } diff --git a/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp b/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp index 6fc1c28..ef12846 100644 --- a/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp +++ b/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp @@ -476,7 +476,7 @@ bool BatchProcessImagesDialog::startProcess(void) KURL desturl(targetAlbum + "/" + item->nameDest()); #if TDE_VERSION >= 0x30200 - if ( TDEIO::NetAccess::exists( desturl, false, TQT_TQWIDGET(kapp->activeWindow()) ) == true ) + if ( TDEIO::NetAccess::exists( desturl, false, kapp->activeWindow() ) == true ) #else if ( TDEIO::NetAccess::exists( desturl ) == true ) #endif @@ -715,7 +715,7 @@ void BatchProcessImagesDialog::slotProcessDone(TDEProcess* proc) KURL deleteImage(item->pathSrc()); #if TDE_VERSION >= 0x30200 - if ( TDEIO::NetAccess::del( deleteImage, TQT_TQWIDGET(kapp->activeWindow()) ) == false ) + if ( TDEIO::NetAccess::del( deleteImage, kapp->activeWindow() ) == false ) #else if ( TDEIO::NetAccess::del( deleteImage ) == false ) #endif @@ -868,7 +868,7 @@ void BatchProcessImagesDialog::slotPreviewProcessDone(TDEProcess* proc) KURL deletePreviewImage(m_tmpFolder + "/" + TQString::number(getpid()) + "preview.PNG"); #if TDE_VERSION >= 0x30200 - TDEIO::NetAccess::del( deletePreviewImage, TQT_TQWIDGET(kapp->activeWindow()) ); + TDEIO::NetAccess::del( deletePreviewImage, kapp->activeWindow() ); #else TDEIO::NetAccess::del( deletePreviewImage ); #endif @@ -1029,8 +1029,8 @@ void BatchProcessImagesDialog::processAborted(bool removeFlag) deleteImage.addPath(item->nameDest()); #if TDE_VERSION >= 0x30200 - if ( TDEIO::NetAccess::exists( deleteImage, false, TQT_TQWIDGET(kapp->activeWindow()) ) == true ) - TDEIO::NetAccess::del( deleteImage, TQT_TQWIDGET(kapp->activeWindow()) ); + if ( TDEIO::NetAccess::exists( deleteImage, false, kapp->activeWindow() ) == true ) + TDEIO::NetAccess::del( deleteImage, kapp->activeWindow() ); #else if ( TDEIO::NetAccess::exists( deleteImage ) == true ) TDEIO::NetAccess::del( deleteImage ); @@ -1067,7 +1067,7 @@ TQString BatchProcessImagesDialog::RenameTargetImageFile(TQFileInfo *fi) } while ( Enumerator < 100 && #if TDE_VERSION >= 0x30200 - TDEIO::NetAccess::exists( NewDestUrl, true, TQT_TQWIDGET(kapp->activeWindow()) ) + TDEIO::NetAccess::exists( NewDestUrl, true, kapp->activeWindow() ) #else TDEIO::NetAccess::exists( NewDestUrl ) #endif diff --git a/kipi-plugins/batchprocessimages/imagepreview.cpp b/kipi-plugins/batchprocessimages/imagepreview.cpp index ca419d3..364b954 100644 --- a/kipi-plugins/batchprocessimages/imagepreview.cpp +++ b/kipi-plugins/batchprocessimages/imagepreview.cpp @@ -309,7 +309,7 @@ void PixmapView::PreviewProcessDone(TDEProcess* proc) KURL deletePreviewImage( m_previewFileName ); #if TDE_VERSION >= 0x30200 - TDEIO::NetAccess::del( deletePreviewImage, TQT_TQWIDGET(kapp->activeWindow()) ); + TDEIO::NetAccess::del( deletePreviewImage, kapp->activeWindow() ); #else TDEIO::NetAccess::del( deletePreviewImage ); #endif diff --git a/kipi-plugins/batchprocessimages/plugin_batchprocessimages.cpp b/kipi-plugins/batchprocessimages/plugin_batchprocessimages.cpp index 9ae86da..6e54460 100644 --- a/kipi-plugins/batchprocessimages/plugin_batchprocessimages.cpp +++ b/kipi-plugins/batchprocessimages/plugin_batchprocessimages.cpp @@ -225,7 +225,7 @@ void Plugin_BatchProcessImages::slotActivate() if ( images.images().isEmpty() ) { - KMessageBox::sorry(TQT_TQWIDGET(kapp->activeWindow()), + KMessageBox::sorry(kapp->activeWindow(), i18n("Please select an album or a selection of images.")); return; } @@ -237,49 +237,49 @@ void Plugin_BatchProcessImages::slotActivate() if (from == "batch_convert_images") { m_ConvertImagesDialog = new KIPIBatchProcessImagesPlugin::ConvertImagesDialog( urlList, - interface, TQT_TQWIDGET(kapp->activeWindow())); + interface, kapp->activeWindow()); m_ConvertImagesDialog->show(); } else if (from == "batch_rename_images") { KIPIBatchProcessImagesPlugin::RenameImagesDialog - dlg(urlList, interface, TQT_TQWIDGET(kapp->activeWindow())); + dlg(urlList, interface, kapp->activeWindow()); dlg.exec(); } else if (from == "batch_border_images") { m_BorderImagesDialog = new KIPIBatchProcessImagesPlugin::BorderImagesDialog( urlList, - interface, TQT_TQWIDGET(kapp->activeWindow())); + interface, kapp->activeWindow()); m_BorderImagesDialog->show(); } else if (from == "batch_color_images") { m_ColorImagesDialog = new KIPIBatchProcessImagesPlugin::ColorImagesDialog( urlList, - interface, TQT_TQWIDGET(kapp->activeWindow())); + interface, kapp->activeWindow()); m_ColorImagesDialog->show(); } else if (from == "batch_filter_images") { m_FilterImagesDialog = new KIPIBatchProcessImagesPlugin::FilterImagesDialog( urlList, - interface, TQT_TQWIDGET(kapp->activeWindow())); + interface, kapp->activeWindow()); m_FilterImagesDialog->show(); } else if (from == "batch_effect_images") { m_EffectImagesDialog = new KIPIBatchProcessImagesPlugin::EffectImagesDialog( urlList, - interface, TQT_TQWIDGET(kapp->activeWindow())); + interface, kapp->activeWindow()); m_EffectImagesDialog->show(); } else if (from == "batch_recompress_images") { m_RecompressImagesDialog = new KIPIBatchProcessImagesPlugin::RecompressImagesDialog( urlList, - interface, TQT_TQWIDGET(kapp->activeWindow())); + interface, kapp->activeWindow()); m_RecompressImagesDialog->show(); } else if (from == "batch_resize_images") { m_ResizeImagesDialog = new KIPIBatchProcessImagesPlugin::ResizeImagesDialog( urlList, - interface, TQT_TQWIDGET(kapp->activeWindow())); + interface, kapp->activeWindow()); m_ResizeImagesDialog->show(); } else diff --git a/kipi-plugins/calendar/calwizard.cpp b/kipi-plugins/calendar/calwizard.cpp index 38047aa..1b00ae2 100644 --- a/kipi-plugins/calendar/calwizard.cpp +++ b/kipi-plugins/calendar/calwizard.cpp @@ -335,7 +335,7 @@ void CalWizard::slotPrintOnePage() int angle = interface_->info( image ).angle(); - cb_ = new CalBlockPainter(TQT_TQOBJECT(this), cSettings_->getYear(), month, + cb_ = new CalBlockPainter(this, cSettings_->getYear(), month, image, angle, formatter_, painter_); connect(cb_, TQT_SIGNAL(signalCompleted()), diff --git a/kipi-plugins/calendar/plugin_calendar.cpp b/kipi-plugins/calendar/plugin_calendar.cpp index 35f320b..6f41e71 100644 --- a/kipi-plugins/calendar/plugin_calendar.cpp +++ b/kipi-plugins/calendar/plugin_calendar.cpp @@ -82,7 +82,7 @@ void Plugin_Calendar::slotActivate() return; } - KIPICalendarPlugin::CalWizard* w = new KIPICalendarPlugin::CalWizard( interface, TQT_TQWIDGET(kapp->activeWindow()) ); + KIPICalendarPlugin::CalWizard* w = new KIPICalendarPlugin::CalWizard( interface, kapp->activeWindow() ); w->show(); } diff --git a/kipi-plugins/cdarchiving/cdarchiving.cpp b/kipi-plugins/cdarchiving/cdarchiving.cpp index 1d3460a..fd93c20 100644 --- a/kipi-plugins/cdarchiving/cdarchiving.cpp +++ b/kipi-plugins/cdarchiving/cdarchiving.cpp @@ -209,7 +209,7 @@ bool CDArchiving::showDialog() m_HTMLInterfaceAutoRunInf = ""; m_HTMLInterfaceAutoRunFolder = ""; - m_configDlg = new CDArchivingDialog( m_interface, TQT_TQWIDGET(kapp->activeWindow()) ); + m_configDlg = new CDArchivingDialog( m_interface, kapp->activeWindow() ); readSettings(); if ( m_configDlg->exec() == TQDialog::Accepted ) diff --git a/kipi-plugins/cdarchiving/plugin_cdarchiving.cpp b/kipi-plugins/cdarchiving/plugin_cdarchiving.cpp index 8bd97ce..f40d29b 100644 --- a/kipi-plugins/cdarchiving/plugin_cdarchiving.cpp +++ b/kipi-plugins/cdarchiving/plugin_cdarchiving.cpp @@ -123,7 +123,7 @@ void Plugin_CDArchiving::customEvent(TQCustomEvent *event) if (!m_progressDlg) { - m_progressDlg = new KIPI::BatchProgressDialog(TQT_TQWIDGET(kapp->activeWindow()), i18n("Archive to CD/DVD")); + m_progressDlg = new KIPI::BatchProgressDialog(kapp->activeWindow(), i18n("Archive to CD/DVD")); connect(m_progressDlg, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(slotCancel())); diff --git a/kipi-plugins/findimages/finddupplicateimages.cpp b/kipi-plugins/findimages/finddupplicateimages.cpp index 8aebf92..291f959 100644 --- a/kipi-plugins/findimages/finddupplicateimages.cpp +++ b/kipi-plugins/findimages/finddupplicateimages.cpp @@ -135,7 +135,7 @@ void FindDuplicateImages::readSettings(void) bool FindDuplicateImages::execDialog() { tqApp->setOverrideCursor( TQCursor(TQt::WaitCursor) ); - m_findDuplicateDialog = new FindDuplicateDialog( m_interface, TQT_TQWIDGET(kapp->activeWindow()) ); + m_findDuplicateDialog = new FindDuplicateDialog( m_interface, kapp->activeWindow() ); tqApp->restoreOverrideCursor(); readSettings(); @@ -167,9 +167,9 @@ bool FindDuplicateImages::execDialog() void FindDuplicateImages::showResult() { if( !m_res.isEmpty() ) - DisplayCompare((TQWidget *)(TQT_TQWIDGET(kapp->activeWindow())), m_interface, m_res).exec(); + DisplayCompare((TQWidget *)(kapp->activeWindow()), m_interface, m_res).exec(); else - KMessageBox::information(TQT_TQWIDGET(kapp->activeWindow()), i18n("No identical files found")); + KMessageBox::information(kapp->activeWindow(), i18n("No identical files found")); } diff --git a/kipi-plugins/findimages/plugin_findimages.cpp b/kipi-plugins/findimages/plugin_findimages.cpp index acc32b1..ce8eb5b 100644 --- a/kipi-plugins/findimages/plugin_findimages.cpp +++ b/kipi-plugins/findimages/plugin_findimages.cpp @@ -101,7 +101,7 @@ void Plugin_FindImages::slotFindDuplicateImages() if (m_findDuplicateOperation->execDialog()) { - m_progressDlg = new KIPI::BatchProgressDialog(TQT_TQWIDGET(kapp->activeWindow()), i18n("Find Duplicate Images")); + m_progressDlg = new KIPI::BatchProgressDialog(kapp->activeWindow(), i18n("Find Duplicate Images")); connect(m_progressDlg, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(slotCancel())); diff --git a/kipi-plugins/flickrexport/flickrtalker.cpp b/kipi-plugins/flickrexport/flickrtalker.cpp index 1bec505..9bc9c22 100644 --- a/kipi-plugins/flickrexport/flickrtalker.cpp +++ b/kipi-plugins/flickrexport/flickrtalker.cpp @@ -199,7 +199,7 @@ void FlickrTalker::slotAuthenticate() kdDebug() << "Authenticate url: " << url << endl; TDEApplication::kApplication()->invokeBrowser(url.url()); - int valueOk = KMessageBox::questionYesNo(TQT_TQWIDGET(kapp->activeWindow()), + int valueOk = KMessageBox::questionYesNo(kapp->activeWindow(), i18n("Please Follow through the instructions in the browser window and " "return back to press ok if you are authenticated or press No"), i18n("Flickr Service Web Authorization")); @@ -541,7 +541,7 @@ void FlickrTalker::slotError(const TQString& error) break; }; - KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), + KMessageBox::error(kapp->activeWindow(), i18n("Error Occured: %1\n We can not proceed further").arg(transError)); // kdDebug() << "Not handling the error now will see it later" << endl; @@ -716,7 +716,7 @@ void FlickrTalker::parseResponseCheckToken(const TQByteArray& data) kdDebug() << "Error code=" << errorString << endl; kdDebug() << "Msg=" << node.toElement().attribute("msg") << endl; - int valueOk = KMessageBox::questionYesNo(TQT_TQWIDGET(kapp->activeWindow()), + int valueOk = KMessageBox::questionYesNo(kapp->activeWindow(), i18n("Your token is invalid. Would you like to " "get a new token to proceed ?\n")); if(valueOk == KMessageBox::Yes) diff --git a/kipi-plugins/flickrexport/plugin_flickrexport.cpp b/kipi-plugins/flickrexport/plugin_flickrexport.cpp index fe78220..c90c160 100644 --- a/kipi-plugins/flickrexport/plugin_flickrexport.cpp +++ b/kipi-plugins/flickrexport/plugin_flickrexport.cpp @@ -100,7 +100,7 @@ void Plugin_FlickrExport::slotActivate() TQString Tmp = dir.saveLocation("tmp", "kipi-flickrexportplugin-" + TQString::number(getpid()) + "/"); // We clean it up in the close button - m_dlg = new KIPIFlickrExportPlugin::FlickrWindow(interface, Tmp, TQT_TQWIDGET(kapp->activeWindow())); + m_dlg = new KIPIFlickrExportPlugin::FlickrWindow(interface, Tmp, kapp->activeWindow()); m_dlg->show(); } diff --git a/kipi-plugins/galleryexport/gallerylist.cpp b/kipi-plugins/galleryexport/gallerylist.cpp index 2d0ef10..abdad47 100644 --- a/kipi-plugins/galleryexport/gallerylist.cpp +++ b/kipi-plugins/galleryexport/gallerylist.cpp @@ -159,7 +159,7 @@ void GalleryList::slotUser2(void) TQListViewItem* p_lvi = mpGalleryList->selectedItem(); if (!p_lvi) { - KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), i18n("No gallery selected!")); + KMessageBox::error(kapp->activeWindow(), i18n("No gallery selected!")); } else { @@ -180,12 +180,12 @@ void GalleryList::slotUser1(void) TQListViewItem* p_lvi = mpGalleryList->selectedItem(); if (!p_lvi) { - KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), i18n("No gallery selected!")); + KMessageBox::error(kapp->activeWindow(), i18n("No gallery selected!")); } else { if (KMessageBox::Yes == - KMessageBox::warningYesNo(TQT_TQWIDGET(kapp->activeWindow()), + KMessageBox::warningYesNo(kapp->activeWindow(), i18n("Are you sure you want to remove this gallery? " "All synchronisaton settings will be lost. " "You cannot undo this action."), diff --git a/kipi-plugins/galleryexport/plugin_galleryexport.cpp b/kipi-plugins/galleryexport/plugin_galleryexport.cpp index 3963286..5da37cc 100644 --- a/kipi-plugins/galleryexport/plugin_galleryexport.cpp +++ b/kipi-plugins/galleryexport/plugin_galleryexport.cpp @@ -129,7 +129,7 @@ void Plugin_GalleryExport::slotSync() return; } - KIPIGalleryExportPlugin::GalleryWindow dlg(interface, TQT_TQWIDGET(kapp->activeWindow()), mpGalleries); + KIPIGalleryExportPlugin::GalleryWindow dlg(interface, kapp->activeWindow(), mpGalleries); dlg.exec(); } @@ -142,7 +142,7 @@ void Plugin_GalleryExport::slotConfigure() return; } - KIPIGalleryExportPlugin::GalleryList dlg(TQT_TQWIDGET(kapp->activeWindow()), mpGalleries, false); + KIPIGalleryExportPlugin::GalleryList dlg(kapp->activeWindow(), mpGalleries, false); dlg.exec(); } @@ -155,7 +155,7 @@ void Plugin_GalleryExport::slotCollectionSettings() return; } - KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), "Not Implemented Yet!"); + KMessageBox::error(kapp->activeWindow(), "Not Implemented Yet!"); } void Plugin_GalleryExport::slotImageSettings() @@ -167,7 +167,7 @@ void Plugin_GalleryExport::slotImageSettings() return; } - KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), "Not Implemented Yet!"); + KMessageBox::error(kapp->activeWindow(), "Not Implemented Yet!"); } KIPI::Category Plugin_GalleryExport::category( TDEAction* action ) const diff --git a/kipi-plugins/gpssync/gpseditdialog.cpp b/kipi-plugins/gpssync/gpseditdialog.cpp index 7310396..0848e07 100644 --- a/kipi-plugins/gpssync/gpseditdialog.cpp +++ b/kipi-plugins/gpssync/gpseditdialog.cpp @@ -111,9 +111,9 @@ GPSEditDialog::GPSEditDialog(TQWidget* parent, const GPSDataContainer& gpsData, TQPushButton *latResetButton = new TQPushButton(SmallIcon("clear_left"), TQString(), plainPage()); TQPushButton *lonResetButton = new TQPushButton(SmallIcon("clear_left"), TQString(), plainPage()); - d->altitudeInput->setValidator(new TQDoubleValidator(-20000.0, 20000.0, 1, TQT_TQOBJECT(this))); - d->latitudeInput->setValidator(new TQDoubleValidator(-90.0, 90.0, 12, TQT_TQOBJECT(this))); - d->longitudeInput->setValidator(new TQDoubleValidator(-180.0, 180.0, 12, TQT_TQOBJECT(this))); + d->altitudeInput->setValidator(new TQDoubleValidator(-20000.0, 20000.0, 1, this)); + d->latitudeInput->setValidator(new TQDoubleValidator(-90.0, 90.0, 12, this)); + d->longitudeInput->setValidator(new TQDoubleValidator(-180.0, 180.0, 12, this)); d->goButton = new TQPushButton(i18n("Goto Location"), plainPage()); d->goButton->setEnabled(false); diff --git a/kipi-plugins/gpssync/plugin_gpssync.cpp b/kipi-plugins/gpssync/plugin_gpssync.cpp index dbd7c80..b3d4179 100644 --- a/kipi-plugins/gpssync/plugin_gpssync.cpp +++ b/kipi-plugins/gpssync/plugin_gpssync.cpp @@ -135,7 +135,7 @@ bool Plugin_GPSSync::checkBinaries(TQString &gpsBabelVersion) if (!gpsBabelBinary.isAvailable()) { KMessageBox::information( - TQT_TQWIDGET(kapp->activeWindow()), + kapp->activeWindow(), i18n("

Unable to find the gpsbabel executable:
" "This program is required by this plugin to support GPS data file decoding. " "Please install gpsbabel as a package from your distributor " @@ -152,7 +152,7 @@ bool Plugin_GPSSync::checkBinaries(TQString &gpsBabelVersion) if (!gpsBabelBinary.versionIsRight()) { KMessageBox::information( - TQT_TQWIDGET(kapp->activeWindow()), + kapp->activeWindow(), i18n("

gpsbabel executable is not up to date:
" "The version %1 of gpsbabel have been found on your computer. " "This version is too old to run properly with this plugin. " @@ -186,7 +186,7 @@ void Plugin_GPSSync::slotGPSSync() */ KIPIGPSSyncPlugin::GPSSyncDialog *dialog = new KIPIGPSSyncPlugin::GPSSyncDialog( - m_interface, TQT_TQWIDGET(kapp->activeWindow())); + m_interface, kapp->activeWindow()); dialog->setImages( images.images() ); dialog->show(); @@ -206,7 +206,7 @@ void Plugin_GPSSync::slotGPSEdit() bool hasGPSInfo = exiv2Iface.getGPSInfo(alt, lat, lng); KIPIGPSSyncPlugin::GPSDataContainer gpsData(alt, lat, lng, false); - KIPIGPSSyncPlugin::GPSEditDialog dlg(TQT_TQWIDGET(kapp->activeWindow()), + KIPIGPSSyncPlugin::GPSEditDialog dlg(kapp->activeWindow(), gpsData, img.fileName(), hasGPSInfo); if (dlg.exec() == KDialogBase::Accepted) @@ -245,7 +245,7 @@ void Plugin_GPSSync::slotGPSEdit() if (!errorFiles.isEmpty()) { KMessageBox::errorList( - TQT_TQWIDGET(kapp->activeWindow()), + kapp->activeWindow(), i18n("Unable to save geographical coordinates into:"), errorFiles, i18n("Edit Geographical Coordinates")); @@ -261,7 +261,7 @@ void Plugin_GPSSync::slotGPSRemove() return; if (KMessageBox::warningYesNo( - TQT_TQWIDGET(kapp->activeWindow()), + kapp->activeWindow(), i18n("Geographical coordinates will be definitively removed from all selected images.\n" "Do you want to continue ?"), i18n("Remove Geographical Coordinates")) != KMessageBox::Yes) @@ -296,7 +296,7 @@ void Plugin_GPSSync::slotGPSRemove() if (!errorFiles.isEmpty()) { KMessageBox::errorList( - TQT_TQWIDGET(kapp->activeWindow()), + kapp->activeWindow(), i18n("Unable to remove geographical coordinates from:"), errorFiles, i18n("Remove Geographical Coordinates")); @@ -314,7 +314,7 @@ void Plugin_GPSSync::slotKMLExport() else { KIPIGPSSyncPlugin::KMLExportConfig *kmlExportConfigGui = new KIPIGPSSyncPlugin::KMLExportConfig( - TQT_TQWIDGET(kapp->activeWindow()), i18n("KMLExport").ascii()); + kapp->activeWindow(), i18n("KMLExport").ascii()); connect(kmlExportConfigGui, TQT_SIGNAL(okButtonClicked()), this, TQT_SLOT(slotKMLGenerate())); kmlExportConfigGui->show(); diff --git a/kipi-plugins/ipodexport/plugin_ipodexport.cpp b/kipi-plugins/ipodexport/plugin_ipodexport.cpp index cb0ac49..6b1d69f 100644 --- a/kipi-plugins/ipodexport/plugin_ipodexport.cpp +++ b/kipi-plugins/ipodexport/plugin_ipodexport.cpp @@ -67,7 +67,7 @@ KIPI::Category Plugin_iPodExport::category( TDEAction* action ) const void Plugin_iPodExport::slotImageUpload() { IpodExport::UploadDialog *dlg = new IpodExport::UploadDialog( m_interface, i18n("iPod Export"), - TQT_TQWIDGET(kapp->activeWindow()) ); + kapp->activeWindow() ); dlg->setMinimumWidth( 460 ); dlg->show(); } diff --git a/kipi-plugins/jpeglossless/plugin_jpeglossless.cpp b/kipi-plugins/jpeglossless/plugin_jpeglossless.cpp index b387f0a..67e5e6b 100644 --- a/kipi-plugins/jpeglossless/plugin_jpeglossless.cpp +++ b/kipi-plugins/jpeglossless/plugin_jpeglossless.cpp @@ -212,7 +212,7 @@ void Plugin_JPEGLossless::slotFlip() m_progressDlg = 0; } - m_progressDlg = new KIPI::BatchProgressDialog(TQT_TQWIDGET(kapp->activeWindow()), + m_progressDlg = new KIPI::BatchProgressDialog(kapp->activeWindow(), i18n("Flip images %1").arg(title)); connect(m_progressDlg, TQT_SIGNAL(cancelClicked()), @@ -268,7 +268,7 @@ void Plugin_JPEGLossless::slotRotate() m_progressDlg = 0; } - m_progressDlg = new KIPI::BatchProgressDialog(TQT_TQWIDGET(kapp->activeWindow()), + m_progressDlg = new KIPI::BatchProgressDialog(kapp->activeWindow(), i18n("Rotate images %1").arg(title)); connect(m_progressDlg, TQT_SIGNAL(cancelClicked()), @@ -284,7 +284,7 @@ void Plugin_JPEGLossless::slotConvert2GrayScale() { KURL::List items = images(); if (items.count() <= 0 || - KMessageBox::No==KMessageBox::warningYesNo(TQT_TQWIDGET(kapp->activeWindow()), + KMessageBox::No==KMessageBox::warningYesNo(kapp->activeWindow(), i18n("

Are you sure you wish to convert the selected image(s) to " "black and white? This operation cannot be undone.

"))) return; @@ -301,7 +301,7 @@ void Plugin_JPEGLossless::slotConvert2GrayScale() m_progressDlg = 0; } - m_progressDlg = new KIPI::BatchProgressDialog(TQT_TQWIDGET(kapp->activeWindow()), + m_progressDlg = new KIPI::BatchProgressDialog(kapp->activeWindow(), i18n("Convert images to black & white")); connect(m_progressDlg, TQT_SIGNAL(cancelClicked()), diff --git a/kipi-plugins/kameraklient/cameraui.cpp b/kipi-plugins/kameraklient/cameraui.cpp index 0cdfd34..dd99650 100644 --- a/kipi-plugins/kameraklient/cameraui.cpp +++ b/kipi-plugins/kameraklient/cameraui.cpp @@ -103,7 +103,7 @@ CameraUI::CameraUI() : TQWidget() resize(700, 440); setMinimumSize(600, 400); - mCameraList = new CameraList(TQT_TQOBJECT(this), locateLocal("data", "kipi/cameras.xml")); + mCameraList = new CameraList(this, locateLocal("data", "kipi/cameras.xml")); mCameraType = new CameraType(); //--------------------------------------------- @@ -193,9 +193,9 @@ CameraUI::CameraUI() : TQWidget() mSplitter->setOpaqueResize(true); mSplitter->setResizeMode(mFolderView, TQSplitter::Stretch); mSplitter->setResizeMode(mIconView, TQSplitter::Stretch); - container_ = new GPFileItemContainer(TQT_TQOBJECT(this), mFolderView, mIconView); - efilter_ = new GPEventFilter(TQT_TQOBJECT(this)); - controller_ = new GPController(TQT_TQOBJECT(this), *mCameraType); + container_ = new GPFileItemContainer(this, mFolderView, mIconView); + efilter_ = new GPEventFilter(this); + controller_ = new GPController(this, *mCameraType); controller_->start(); cameraConnected_ = false; @@ -243,38 +243,38 @@ void CameraUI::setupAccel() { mCameraUIAccel = new TDEAccel(this); mCameraUIAccel->insert("Select All", i18n("Select All"), i18n("Select all the images from the camera."), - CTRL+Key_A, TQT_TQOBJECT(this), TQT_SLOT(slotSelectAll())); + CTRL+Key_A, this, TQT_SLOT(slotSelectAll())); mCameraUIAccel->insert("Select None", i18n("Select None"), i18n("Deselect all the images from the camera."), - CTRL+Key_U, TQT_TQOBJECT(this), TQT_SLOT(slotSelectNone())); + CTRL+Key_U, this, TQT_SLOT(slotSelectNone())); mCameraUIAccel->insert("Invert Selection", i18n("Invert Selection"), i18n("Invert the selection."), - CTRL+Key_Asterisk, TQT_TQOBJECT(this), TQT_SLOT(slotSelectInvert())); + CTRL+Key_Asterisk, this, TQT_SLOT(slotSelectInvert())); mCameraUIAccel->insert("Select New", i18n("Select New Items"), i18n("Select all the that were not previously downloaded."), - CTRL+Key_Slash, TQT_TQOBJECT(this), TQT_SLOT(slotSelectNew())); + CTRL+Key_Slash, this, TQT_SLOT(slotSelectNew())); setCameraConnected(false); } void CameraUI::setupConnections() { - connect(this, TQT_SIGNAL(signalStatusMsg(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotSetStatusMsg(const TQString&))); - connect(this, TQT_SIGNAL(signalProgressVal(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSetProgressVal(int))); - connect(this, TQT_SIGNAL(signalBusy(bool)), TQT_TQOBJECT(this), TQT_SLOT(slotBusy(bool))); - connect(efilter_, TQT_SIGNAL(signalStatusMsg(const TQString&)), TQT_TQOBJECT(this), TQT_SIGNAL(signalStatusMsg(const TQString&))); - connect(efilter_, TQT_SIGNAL(signalProgressVal(int)), TQT_TQOBJECT(this), TQT_SIGNAL(signalProgressVal(int))); - connect(efilter_, TQT_SIGNAL(signalBusy(bool)), TQT_TQOBJECT(this), TQT_SIGNAL(signalBusy(bool))); - connect(mFolderView, TQT_SIGNAL(signalFolderChanged(CameraFolderItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotFolderSelected(CameraFolderItem*))); - connect(mIconView, TQT_SIGNAL(signalDownloadSelectedItems()), TQT_TQOBJECT(this), TQT_SLOT(slotCameraDownloadSelected())); - connect(mIconView, TQT_SIGNAL(signalDeleteSelectedItems()), TQT_TQOBJECT(this), TQT_SLOT(slotCameraDeleteSelected())); - connect(mChangeDownloadDirectoryBtn, TQT_SIGNAL(pressed()), TQT_TQOBJECT(this), TQT_SLOT(slotChangeDownloadDirectory())); - connect(mCameraList, TQT_SIGNAL(signalCameraListChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotSyncCameraComboBox())); - connect(mCameraConnectBtn, TQT_SIGNAL(pressed()), TQT_TQOBJECT(this), TQT_SLOT(slotCameraConnectToggle())); - connect(mCameraSetupBtn, TQT_SIGNAL(pressed()), TQT_TQOBJECT(this), TQT_SLOT(slotSetupCamera())); - connect(mCameraStopBtn, TQT_SIGNAL(pressed()), TQT_TQOBJECT(this), TQT_SLOT(slotCameraCancel())); - connect(mCameraDownloadBtn, TQT_SIGNAL(pressed()), TQT_TQOBJECT(this), TQT_SLOT(slotCameraDownloadSelected())); - connect(mCameraUploadBtn, TQT_SIGNAL(pressed()), TQT_TQOBJECT(this), TQT_SLOT(slotCameraUpload())); - connect(mCameraDeleteBtn, TQT_SIGNAL(pressed()), TQT_TQOBJECT(this), TQT_SLOT(slotCameraDeleteSelected())); - connect(mDialogCloseBtn, TQT_SIGNAL(pressed()), TQT_TQOBJECT(this), TQT_SLOT(close())); + connect(this, TQT_SIGNAL(signalStatusMsg(const TQString&)), this, TQT_SLOT(slotSetStatusMsg(const TQString&))); + connect(this, TQT_SIGNAL(signalProgressVal(int)), this, TQT_SLOT(slotSetProgressVal(int))); + connect(this, TQT_SIGNAL(signalBusy(bool)), this, TQT_SLOT(slotBusy(bool))); + connect(efilter_, TQT_SIGNAL(signalStatusMsg(const TQString&)), this, TQT_SIGNAL(signalStatusMsg(const TQString&))); + connect(efilter_, TQT_SIGNAL(signalProgressVal(int)), this, TQT_SIGNAL(signalProgressVal(int))); + connect(efilter_, TQT_SIGNAL(signalBusy(bool)), this, TQT_SIGNAL(signalBusy(bool))); + connect(mFolderView, TQT_SIGNAL(signalFolderChanged(CameraFolderItem*)), this, TQT_SLOT(slotFolderSelected(CameraFolderItem*))); + connect(mIconView, TQT_SIGNAL(signalDownloadSelectedItems()), this, TQT_SLOT(slotCameraDownloadSelected())); + connect(mIconView, TQT_SIGNAL(signalDeleteSelectedItems()), this, TQT_SLOT(slotCameraDeleteSelected())); + connect(mChangeDownloadDirectoryBtn, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotChangeDownloadDirectory())); + connect(mCameraList, TQT_SIGNAL(signalCameraListChanged()), this, TQT_SLOT(slotSyncCameraComboBox())); + connect(mCameraConnectBtn, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotCameraConnectToggle())); + connect(mCameraSetupBtn, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotSetupCamera())); + connect(mCameraStopBtn, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotCameraCancel())); + connect(mCameraDownloadBtn, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotCameraDownloadSelected())); + connect(mCameraUploadBtn, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotCameraUpload())); + connect(mCameraDeleteBtn, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotCameraDeleteSelected())); + connect(mDialogCloseBtn, TQT_SIGNAL(pressed()), this, TQT_SLOT(close())); } void CameraUI::setCameraConnected(bool val) { @@ -328,7 +328,7 @@ void CameraUI::slotSyncCameraComboBox() { void CameraUI::setCameraType(const CameraType& ctype) { *mCameraType = ctype; delete controller_; - controller_ = new GPController(TQT_TQOBJECT(this), *mCameraType); + controller_ = new GPController(this, *mCameraType); controller_->start(); } @@ -420,7 +420,7 @@ void CameraUI::slotCameraConnectToggle() { controller_->requestInitialize(); } else { delete controller_; - controller_ = new GPController(TQT_TQOBJECT(this), *mCameraType); + controller_ = new GPController(this, *mCameraType); controller_->start(); cameraConnected_ = false; mIconView->clear(); diff --git a/kipi-plugins/kameraklient/gpeventfilter.cpp b/kipi-plugins/kameraklient/gpeventfilter.cpp index 8f108b3..99dfa1b 100644 --- a/kipi-plugins/kameraklient/gpeventfilter.cpp +++ b/kipi-plugins/kameraklient/gpeventfilter.cpp @@ -32,7 +32,7 @@ namespace KIPIKameraKlientPlugin GPEventFilter::GPEventFilter(TQObject* parent) : TQObject(parent) { parent->installEventFilter(this); - view_ = static_cast(TQT_TQWIDGET(parent)); + view_ = static_cast(parent); } GPEventFilter::~GPEventFilter() { diff --git a/kipi-plugins/kameraklient/savefiledialog.cpp b/kipi-plugins/kameraklient/savefiledialog.cpp index 5a82369..86ef664 100644 --- a/kipi-plugins/kameraklient/savefiledialog.cpp +++ b/kipi-plugins/kameraklient/savefiledialog.cpp @@ -39,13 +39,13 @@ SavefileDialog::SavefileDialog(const TQString& file, TQWidget *parent, const cha renameEdit->setText(fileInfo.fileName()); connect(renameEdit, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slot_renameEnabled())); KButtonBox *bbox = new KButtonBox(this); - renameBtn = bbox->addButton(i18n("Rename"), TQT_TQOBJECT(this), TQT_SLOT(slot_rename()), true); + renameBtn = bbox->addButton(i18n("Rename"), this, TQT_SLOT(slot_rename()), true); renameBtn->setEnabled(false); - bbox->addButton(i18n("Skip"), TQT_TQOBJECT(this), TQT_SLOT(slot_skip()), false); - bbox->addButton(i18n("Skip All"), TQT_TQOBJECT(this), TQT_SLOT(slot_skipAll()), true); - bbox->addButton(i18n("Overwrite"), TQT_TQOBJECT(this), TQT_SLOT(slot_overwrite()), true); - bbox->addButton(i18n("Overwrite All"), TQT_TQOBJECT(this), TQT_SLOT(slot_overwriteAll()), true); - TQPushButton *cancelBtn = bbox->addButton(i18n("&Cancel"), TQT_TQOBJECT(this), TQT_SLOT(reject()), true); + bbox->addButton(i18n("Skip"), this, TQT_SLOT(slot_skip()), false); + bbox->addButton(i18n("Skip All"), this, TQT_SLOT(slot_skipAll()), true); + bbox->addButton(i18n("Overwrite"), this, TQT_SLOT(slot_overwrite()), true); + bbox->addButton(i18n("Overwrite All"), this, TQT_SLOT(slot_overwriteAll()), true); + TQPushButton *cancelBtn = bbox->addButton(i18n("&Cancel"), this, TQT_SLOT(reject()), true); cancelBtn->setDefault(true); bbox->layout(); TQGridLayout *layout = new TQGridLayout(this, 0, 0, 15); diff --git a/kipi-plugins/metadataedit/exifcaption.cpp b/kipi-plugins/metadataedit/exifcaption.cpp index 2227873..60c00d7 100644 --- a/kipi-plugins/metadataedit/exifcaption.cpp +++ b/kipi-plugins/metadataedit/exifcaption.cpp @@ -99,7 +99,7 @@ EXIFCaption::EXIFCaption(TQWidget* parent) // EXIF only accept printable Ascii char. TQRegExp asciiRx("[\x20-\x7F]+$"); - TQValidator *asciiValidator = new TQRegExpValidator(asciiRx, TQT_TQOBJECT(this)); + TQValidator *asciiValidator = new TQRegExpValidator(asciiRx, this); // -------------------------------------------------------- diff --git a/kipi-plugins/metadataedit/exifdevice.cpp b/kipi-plugins/metadataedit/exifdevice.cpp index 587a9d4..ea6ecb6 100644 --- a/kipi-plugins/metadataedit/exifdevice.cpp +++ b/kipi-plugins/metadataedit/exifdevice.cpp @@ -127,7 +127,7 @@ EXIFDevice::EXIFDevice(TQWidget* parent) // EXIF only accept printable Ascii char. TQRegExp asciiRx("[\x20-\x7F]+$"); - TQValidator *asciiValidator = new TQRegExpValidator(asciiRx, TQT_TQOBJECT(this)); + TQValidator *asciiValidator = new TQRegExpValidator(asciiRx, this); // -------------------------------------------------------- diff --git a/kipi-plugins/metadataedit/iptccaption.cpp b/kipi-plugins/metadataedit/iptccaption.cpp index a310f2c..7a39437 100644 --- a/kipi-plugins/metadataedit/iptccaption.cpp +++ b/kipi-plugins/metadataedit/iptccaption.cpp @@ -95,7 +95,7 @@ IPTCCaption::IPTCCaption(TQWidget* parent) // IPTC only accept printable Ascii char. TQRegExp asciiRx("[\x20-\x7F]+$"); - TQValidator *asciiValidator = new TQRegExpValidator(asciiRx, TQT_TQOBJECT(this)); + TQValidator *asciiValidator = new TQRegExpValidator(asciiRx, this); // -------------------------------------------------------- diff --git a/kipi-plugins/metadataedit/iptccategories.cpp b/kipi-plugins/metadataedit/iptccategories.cpp index a52fc10..c83a301 100644 --- a/kipi-plugins/metadataedit/iptccategories.cpp +++ b/kipi-plugins/metadataedit/iptccategories.cpp @@ -88,7 +88,7 @@ IPTCCategories::IPTCCategories(TQWidget* parent) // IPTC only accept printable Ascii char. TQRegExp asciiRx("[\x20-\x7F]+$"); - TQValidator *asciiValidator = new TQRegExpValidator(asciiRx, TQT_TQOBJECT(this)); + TQValidator *asciiValidator = new TQRegExpValidator(asciiRx, this); // -------------------------------------------------------- diff --git a/kipi-plugins/metadataedit/iptccredits.cpp b/kipi-plugins/metadataedit/iptccredits.cpp index 6680993..e8f1cef 100644 --- a/kipi-plugins/metadataedit/iptccredits.cpp +++ b/kipi-plugins/metadataedit/iptccredits.cpp @@ -92,7 +92,7 @@ IPTCCredits::IPTCCredits(TQWidget* parent) // IPTC only accept printable Ascii char. TQRegExp asciiRx("[\x20-\x7F]+$"); - TQValidator *asciiValidator = new TQRegExpValidator(asciiRx, TQT_TQOBJECT(this)); + TQValidator *asciiValidator = new TQRegExpValidator(asciiRx, this); // -------------------------------------------------------- diff --git a/kipi-plugins/metadataedit/iptckeywords.cpp b/kipi-plugins/metadataedit/iptckeywords.cpp index bf8cfdf..0cfa796 100644 --- a/kipi-plugins/metadataedit/iptckeywords.cpp +++ b/kipi-plugins/metadataedit/iptckeywords.cpp @@ -84,7 +84,7 @@ IPTCKeywords::IPTCKeywords(TQWidget* parent) // IPTC only accept printable Ascii char. TQRegExp asciiRx("[\x20-\x7F]+$"); - TQValidator *asciiValidator = new TQRegExpValidator(asciiRx, TQT_TQOBJECT(this)); + TQValidator *asciiValidator = new TQRegExpValidator(asciiRx, this); // -------------------------------------------------------- diff --git a/kipi-plugins/metadataedit/iptcorigin.cpp b/kipi-plugins/metadataedit/iptcorigin.cpp index 0e0e642..84ac8d5 100644 --- a/kipi-plugins/metadataedit/iptcorigin.cpp +++ b/kipi-plugins/metadataedit/iptcorigin.cpp @@ -362,7 +362,7 @@ IPTCOrigin::IPTCOrigin(TQWidget* parent) // IPTC only accept printable Ascii char. TQRegExp asciiRx("[\x20-\x7F]+$"); - TQValidator *asciiValidator = new TQRegExpValidator(asciiRx, TQT_TQOBJECT(this)); + TQValidator *asciiValidator = new TQRegExpValidator(asciiRx, this); // -------------------------------------------------------- diff --git a/kipi-plugins/metadataedit/iptcstatus.cpp b/kipi-plugins/metadataedit/iptcstatus.cpp index 05113b4..0af9778 100644 --- a/kipi-plugins/metadataedit/iptcstatus.cpp +++ b/kipi-plugins/metadataedit/iptcstatus.cpp @@ -97,7 +97,7 @@ IPTCStatus::IPTCStatus(TQWidget* parent) // IPTC only accept printable Ascii char. TQRegExp asciiRx("[\x20-\x7F]+$"); - TQValidator *asciiValidator = new TQRegExpValidator(asciiRx, TQT_TQOBJECT(this)); + TQValidator *asciiValidator = new TQRegExpValidator(asciiRx, this); // -------------------------------------------------------- diff --git a/kipi-plugins/metadataedit/iptcsubjects.cpp b/kipi-plugins/metadataedit/iptcsubjects.cpp index f92b0c9..53836db 100644 --- a/kipi-plugins/metadataedit/iptcsubjects.cpp +++ b/kipi-plugins/metadataedit/iptcsubjects.cpp @@ -84,7 +84,7 @@ IPTCSubjects::IPTCSubjects(TQWidget* parent) // IPTC only accept printable Ascii char. TQRegExp asciiRx("[\x20-\x7F]+$"); - TQValidator *asciiValidator = new TQRegExpValidator(asciiRx, TQT_TQOBJECT(this)); + TQValidator *asciiValidator = new TQRegExpValidator(asciiRx, this); // -------------------------------------------------------- diff --git a/kipi-plugins/metadataedit/plugin_metadataedit.cpp b/kipi-plugins/metadataedit/plugin_metadataedit.cpp index 8e3c6e8..eee0dbf 100644 --- a/kipi-plugins/metadataedit/plugin_metadataedit.cpp +++ b/kipi-plugins/metadataedit/plugin_metadataedit.cpp @@ -162,7 +162,7 @@ void Plugin_MetadataEdit::slotEditExif() if ( !images.isValid() || images.images().isEmpty() ) return; - KIPIMetadataEditPlugin::EXIFEditDialog dialog(TQT_TQWIDGET(kapp->activeWindow()), images.images(), m_interface); + KIPIMetadataEditPlugin::EXIFEditDialog dialog(kapp->activeWindow(), images.images(), m_interface); dialog.exec(); m_interface->refreshImages(images.images()); } @@ -175,7 +175,7 @@ void Plugin_MetadataEdit::slotRemoveExif() return; if (KMessageBox::warningYesNo( - TQT_TQWIDGET(kapp->activeWindow()), + kapp->activeWindow(), i18n("EXIF metadata will be permanently removed from all current selected pictures.\n" "Do you want to continue ?"), i18n("Remove EXIF Metadata")) != KMessageBox::Yes) @@ -214,7 +214,7 @@ void Plugin_MetadataEdit::slotRemoveExif() if (!errorFiles.isEmpty()) { KMessageBox::errorList( - TQT_TQWIDGET(kapp->activeWindow()), + kapp->activeWindow(), i18n("Unable to remove EXIF metadata from:"), errorFiles, i18n("Remove EXIF Metadata")); @@ -229,7 +229,7 @@ void Plugin_MetadataEdit::slotImportExif() return; KURL importEXIFFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(), - TQString(), TQT_TQWIDGET(kapp->activeWindow()), + TQString(), kapp->activeWindow(), i18n("Select File to Import EXIF metadata") ); if( importEXIFFile.isEmpty() ) return; @@ -237,7 +237,7 @@ void Plugin_MetadataEdit::slotImportExif() KExiv2Iface::KExiv2 exiv2Iface; if (!exiv2Iface.load(importEXIFFile.path())) { - KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), + KMessageBox::error(kapp->activeWindow(), i18n("Cannot load metadata from \"%1\"").arg(importEXIFFile.fileName()), i18n("Import EXIF Metadata")); return; @@ -246,14 +246,14 @@ void Plugin_MetadataEdit::slotImportExif() TQByteArray exifData = exiv2Iface.getExif(); if (exifData.isEmpty()) { - KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), + KMessageBox::error(kapp->activeWindow(), i18n("\"%1\" do not have EXIF metadata").arg(importEXIFFile.fileName()), i18n("Import EXIF Metadata")); return; } if (KMessageBox::warningYesNo( - TQT_TQWIDGET(kapp->activeWindow()), + kapp->activeWindow(), i18n("EXIF metadata from current selected pictures will be permanently " "replaced by the EXIF content of \"%1\".\n" "Do you want to continue ?").arg(importEXIFFile.fileName()), @@ -294,7 +294,7 @@ void Plugin_MetadataEdit::slotImportExif() if (!errorFiles.isEmpty()) { KMessageBox::errorList( - TQT_TQWIDGET(kapp->activeWindow()), + kapp->activeWindow(), i18n("Unable to set EXIF metadata from:"), errorFiles, i18n("Import EXIF Metadata")); @@ -308,7 +308,7 @@ void Plugin_MetadataEdit::slotEditIptc() if ( !images.isValid() || images.images().isEmpty() ) return; - KIPIMetadataEditPlugin::IPTCEditDialog dialog(TQT_TQWIDGET(kapp->activeWindow()), images.images(), m_interface); + KIPIMetadataEditPlugin::IPTCEditDialog dialog(kapp->activeWindow(), images.images(), m_interface); dialog.exec(); m_interface->refreshImages(images.images()); } @@ -321,7 +321,7 @@ void Plugin_MetadataEdit::slotRemoveIptc() return; if (KMessageBox::warningYesNo( - TQT_TQWIDGET(kapp->activeWindow()), + kapp->activeWindow(), i18n("IPTC metadata will be permanently removed from all current selected pictures.\n" "Do you want to continue ?"), i18n("Remove IPTC Metadata")) != KMessageBox::Yes) @@ -360,7 +360,7 @@ void Plugin_MetadataEdit::slotRemoveIptc() if (!errorFiles.isEmpty()) { KMessageBox::errorList( - TQT_TQWIDGET(kapp->activeWindow()), + kapp->activeWindow(), i18n("Unable to remove IPTC metadata from:"), errorFiles, i18n("Remove IPTC Metadata")); @@ -375,7 +375,7 @@ void Plugin_MetadataEdit::slotImportIptc() return; KURL importIPTCFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(), - TQString(), TQT_TQWIDGET(kapp->activeWindow()), + TQString(), kapp->activeWindow(), i18n("Select File to Import IPTC metadata") ); if( importIPTCFile.isEmpty() ) return; @@ -383,7 +383,7 @@ void Plugin_MetadataEdit::slotImportIptc() KExiv2Iface::KExiv2 exiv2Iface; if (!exiv2Iface.load(importIPTCFile.path())) { - KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), + KMessageBox::error(kapp->activeWindow(), i18n("Cannot load metadata from \"%1\"").arg(importIPTCFile.fileName()), i18n("Import IPTC Metadata")); return; @@ -392,14 +392,14 @@ void Plugin_MetadataEdit::slotImportIptc() TQByteArray iptcData = exiv2Iface.getIptc(); if (iptcData.isEmpty()) { - KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), + KMessageBox::error(kapp->activeWindow(), i18n("\"%1\" do not have IPTC metadata").arg(importIPTCFile.fileName()), i18n("Import IPTC Metadata")); return; } if (KMessageBox::warningYesNo( - TQT_TQWIDGET(kapp->activeWindow()), + kapp->activeWindow(), i18n("IPTC metadata from current selected pictures will be permanently " "replaced by the IPTC content of \"%1\".\n" "Do you want to continue ?").arg(importIPTCFile.fileName()), @@ -440,7 +440,7 @@ void Plugin_MetadataEdit::slotImportIptc() if (!errorFiles.isEmpty()) { KMessageBox::errorList( - TQT_TQWIDGET(kapp->activeWindow()), + kapp->activeWindow(), i18n("Unable to set IPTC metadata from:"), errorFiles, i18n("Import IPTC Metadata")); @@ -454,7 +454,7 @@ void Plugin_MetadataEdit::slotEditComments() if ( !images.isValid() || images.images().isEmpty() ) return; - KIPIMetadataEditPlugin::CommentEditDialog dlg(TQT_TQWIDGET(kapp->activeWindow())); + KIPIMetadataEditPlugin::CommentEditDialog dlg(kapp->activeWindow()); if (dlg.exec() != KMessageBox::Ok) return; @@ -504,7 +504,7 @@ void Plugin_MetadataEdit::slotEditComments() if (!errorFiles.isEmpty()) { KMessageBox::informationList( - TQT_TQWIDGET(kapp->activeWindow()), + kapp->activeWindow(), i18n("Unable to set captions as image metadata from:"), errorFiles, i18n("Edit Image Caption")); @@ -518,7 +518,7 @@ void Plugin_MetadataEdit::slotRemoveComments() if ( !images.isValid() || images.images().isEmpty() ) return; - KIPIMetadataEditPlugin::CommentRemoveDialog dlg(TQT_TQWIDGET(kapp->activeWindow())); + KIPIMetadataEditPlugin::CommentRemoveDialog dlg(kapp->activeWindow()); if (dlg.exec() != KMessageBox::Ok) return; @@ -571,7 +571,7 @@ void Plugin_MetadataEdit::slotRemoveComments() if (!errorFiles.isEmpty()) { KMessageBox::informationList( - TQT_TQWIDGET(kapp->activeWindow()), + kapp->activeWindow(), i18n("Unable to remove caption as image metadata from:"), errorFiles, i18n("Remove Image Caption")); diff --git a/kipi-plugins/mpegencoder/checkbinprog.cpp b/kipi-plugins/mpegencoder/checkbinprog.cpp index 7aeb416..e2fffbb 100644 --- a/kipi-plugins/mpegencoder/checkbinprog.cpp +++ b/kipi-plugins/mpegencoder/checkbinprog.cpp @@ -68,13 +68,13 @@ int CheckBinProg::findExecutables( void ) if (ImageMagickPath.isEmpty()) { - KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), i18n("Your 'ImageMagick' binary program path is empty.\nSetting to default value. Check option's setting.")); + KMessageBox::error(kapp->activeWindow(), i18n("Your 'ImageMagick' binary program path is empty.\nSetting to default value. Check option's setting.")); return (ValRet); } if (MjpegToolsPath.isEmpty()) { - KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), i18n("Your 'MjpegTools' binary programs path is empty.\nSetting to default value. Check option's setting.")); + KMessageBox::error(kapp->activeWindow(), i18n("Your 'MjpegTools' binary programs path is empty.\nSetting to default value. Check option's setting.")); return (ValRet); } @@ -121,7 +121,7 @@ if (MjpegToolsPath.isEmpty()) "\n\nVisit these URLs for more information:" "\nImageMagick package: http://www.imagemagick.org/" "\nMjpegTools package: http://mjpeg.sourceforge.net/"); - KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), str); + KMessageBox::error(kapp->activeWindow(), str); return (ValRet); } diff --git a/kipi-plugins/mpegencoder/kimg2mpg.cpp b/kipi-plugins/mpegencoder/kimg2mpg.cpp index aca9ce7..d0fa13f 100644 --- a/kipi-plugins/mpegencoder/kimg2mpg.cpp +++ b/kipi-plugins/mpegencoder/kimg2mpg.cpp @@ -748,7 +748,7 @@ void KImg2mpgData::slotOptionDlgOkClicked( void ) m_MJBinFolderConfig.truncate(m_MJBinFolderConfig.length()-1); writeSettings(); - CheckBinProg* CheckExternalPrograms = new CheckBinProg(TQT_TQOBJECT(this)); + CheckBinProg* CheckExternalPrograms = new CheckBinProg(this); int ValRet = CheckExternalPrograms->findExecutables(); m_Encodebutton->setEnabled(true); diff --git a/kipi-plugins/mpegencoder/plugin_mpegencoder.cpp b/kipi-plugins/mpegencoder/plugin_mpegencoder.cpp index 88498a2..ddf5654 100644 --- a/kipi-plugins/mpegencoder/plugin_mpegencoder.cpp +++ b/kipi-plugins/mpegencoder/plugin_mpegencoder.cpp @@ -85,7 +85,7 @@ void Plugin_Mpegencoder::slotActivate() } KIPIMPEGEncoderPlugin::KImg2mpgData *MPEGconverterDialog = - new KIPIMPEGEncoderPlugin::KImg2mpgData( interface, TQT_TQWIDGET(kapp->activeWindow()) ); + new KIPIMPEGEncoderPlugin::KImg2mpgData( interface, kapp->activeWindow() ); KIPIMPEGEncoderPlugin::CheckBinProg* CheckExternalPrograms = new KIPIMPEGEncoderPlugin::CheckBinProg(this); diff --git a/kipi-plugins/picasawebexport/picasawebtalker.cpp b/kipi-plugins/picasawebexport/picasawebtalker.cpp index bbc2915..cd1e91f 100644 --- a/kipi-plugins/picasawebexport/picasawebtalker.cpp +++ b/kipi-plugins/picasawebexport/picasawebtalker.cpp @@ -128,7 +128,7 @@ void PicasawebTalker::getToken(const TQString& username, const TQString& passwor TQString url = "https://www.google.com/accounts/ClientLogin"; - PicasawebLogin *loginDialog = new PicasawebLogin(TQT_TQWIDGET(kapp->activeWindow()), TQString("LoginWindow"), username, password); + PicasawebLogin *loginDialog = new PicasawebLogin(kapp->activeWindow(), TQString("LoginWindow"), username, password); /*if (username!=NULL && username.length() > 0){ // kdDebug()<<"Showing stored username"<< username << endl; loginDialog->setUsername(username); @@ -593,7 +593,7 @@ void PicasawebTalker::slotError(const TQString & error) transError=i18n("Unknown error"); }; - KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), i18n("Error Occured: %1\n We can not proceed further").arg(transError)); + KMessageBox::error(kapp->activeWindow(), i18n("Error Occured: %1\n We can not proceed further").arg(transError)); //kdDebug()<<"Not handling the error now will see it later"<activeWindow())); + NewAlbumDialog *dlg = new NewAlbumDialog(kapp->activeWindow()); dlg->m_dateAndTimeEdit->setDateTime(TQDateTime::currentDateTime()); TQString test; int t = dlg->exec(); diff --git a/kipi-plugins/picasawebexport/plugin_picasawebexport.cpp b/kipi-plugins/picasawebexport/plugin_picasawebexport.cpp index 7e8583e..8e8c129 100644 --- a/kipi-plugins/picasawebexport/plugin_picasawebexport.cpp +++ b/kipi-plugins/picasawebexport/plugin_picasawebexport.cpp @@ -100,7 +100,7 @@ void Plugin_PicasawebExport::slotActivate() TDEStandardDirs dir; TQString Tmp = dir.saveLocation("tmp", "kipi-picasawebexportplugin-" + TQString::number(getpid()) + "/"); - m_dlg = new KIPIPicasawebExportPlugin::PicasawebWindow(interface,Tmp,TQT_TQWIDGET(kapp->activeWindow())); + m_dlg = new KIPIPicasawebExportPlugin::PicasawebWindow(interface,Tmp,kapp->activeWindow()); m_dlg->show(); } diff --git a/kipi-plugins/printwizard/plugin_printwizard.cpp b/kipi-plugins/printwizard/plugin_printwizard.cpp index 3917287..32447f9 100644 --- a/kipi-plugins/printwizard/plugin_printwizard.cpp +++ b/kipi-plugins/printwizard/plugin_printwizard.cpp @@ -105,12 +105,12 @@ void Plugin_PrintWizard::slotActivate() if (fileList.count() == 0) { - KMessageBox::sorry(TQT_TQWIDGET(kapp->activeWindow()), i18n("Please select one or more photos to print."), + KMessageBox::sorry(kapp->activeWindow(), i18n("Please select one or more photos to print."), i18n("Print Wizard")); return; } - KIPIPrintWizardPlugin::FrmPrintWizard frm(TQT_TQWIDGET(kapp->activeWindow())); + KIPIPrintWizardPlugin::FrmPrintWizard frm(kapp->activeWindow()); TDEStandardDirs dir; TQString tempPath = dir.saveLocation("tmp", "kipi-printwizardplugin-" + TQString::number(getpid()) + "/"); frm.print(fileList, tempPath); diff --git a/kipi-plugins/rawconverter/batchdialog.cpp b/kipi-plugins/rawconverter/batchdialog.cpp index 398fbbd..551d22d 100644 --- a/kipi-plugins/rawconverter/batchdialog.cpp +++ b/kipi-plugins/rawconverter/batchdialog.cpp @@ -159,7 +159,7 @@ BatchDialog::BatchDialog(TQWidget* /*parent*/) setButtonTip( Close, i18n("

Exit Raw Converter")); m_blinkConvertTimer = new TQTimer(this); - m_thread = new ActionThread(TQT_TQOBJECT(this)); + m_thread = new ActionThread(this); // --------------------------------------------------------------- diff --git a/kipi-plugins/rawconverter/plugin_rawconverter.cpp b/kipi-plugins/rawconverter/plugin_rawconverter.cpp index 04539c1..60a4afa 100644 --- a/kipi-plugins/rawconverter/plugin_rawconverter.cpp +++ b/kipi-plugins/rawconverter/plugin_rawconverter.cpp @@ -166,14 +166,14 @@ void Plugin_RawConverter::slotActivateSingle() if (!isRAWFile(images.images()[0].path())) { - KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), + KMessageBox::error(kapp->activeWindow(), i18n("\"%1\" is not a Raw file.").arg(images.images()[0].fileName())); return; } KIPIRawConverterPlugin::SingleDialog *converter = new KIPIRawConverterPlugin::SingleDialog(images.images()[0].path(), - TQT_TQWIDGET(kapp->activeWindow())); + kapp->activeWindow()); converter->show(); } @@ -198,7 +198,7 @@ void Plugin_RawConverter::slotActivateBatch() return; KIPIRawConverterPlugin::BatchDialog *converter = - new KIPIRawConverterPlugin::BatchDialog(TQT_TQWIDGET(kapp->activeWindow())); + new KIPIRawConverterPlugin::BatchDialog(kapp->activeWindow()); KURL::List urls = images.images(); TQStringList files; diff --git a/kipi-plugins/rawconverter/singledialog.cpp b/kipi-plugins/rawconverter/singledialog.cpp index 9b03938..bed39c0 100644 --- a/kipi-plugins/rawconverter/singledialog.cpp +++ b/kipi-plugins/rawconverter/singledialog.cpp @@ -146,7 +146,7 @@ SingleDialog::SingleDialog(const TQString& file, TQWidget */*parent*/) m_blinkPreviewTimer = new TQTimer(this); m_blinkConvertTimer = new TQTimer(this); - m_thread = new ActionThread(TQT_TQOBJECT(this)); + m_thread = new ActionThread(this); // --------------------------------------------------------------- diff --git a/kipi-plugins/sendimages/plugin_sendimages.cpp b/kipi-plugins/sendimages/plugin_sendimages.cpp index 7e61403..bc63399 100644 --- a/kipi-plugins/sendimages/plugin_sendimages.cpp +++ b/kipi-plugins/sendimages/plugin_sendimages.cpp @@ -145,7 +145,7 @@ void Plugin_SendImages::customEvent(TQCustomEvent *event) if (!m_progressDlg) { - m_progressDlg = new KIPI::BatchProgressDialog(TQT_TQWIDGET(kapp->activeWindow()), i18n("Preparing images to send")); + m_progressDlg = new KIPI::BatchProgressDialog(kapp->activeWindow(), i18n("Preparing images to send")); connect(m_progressDlg, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(slotCancel())); diff --git a/kipi-plugins/sendimages/sendimages.cpp b/kipi-plugins/sendimages/sendimages.cpp index cfd100e..97ee0d3 100644 --- a/kipi-plugins/sendimages/sendimages.cpp +++ b/kipi-plugins/sendimages/sendimages.cpp @@ -105,7 +105,7 @@ SendImages::~SendImages() ///Invokes the User Dialog Window void SendImages::showDialog() { - m_sendImagesDialog = new KIPISendimagesPlugin::SendImagesDialog(TQT_TQWIDGET(kapp->activeWindow()), + m_sendImagesDialog = new KIPISendimagesPlugin::SendImagesDialog(kapp->activeWindow(), m_interface, m_collection); m_sendImagesDialog->show(); @@ -372,7 +372,7 @@ bool SendImages::showErrors() { if ( m_imagesResizedWithError.isEmpty() == false ) { - listImagesErrorDialog *ErrorImagesDialog = new listImagesErrorDialog(TQT_TQWIDGET(kapp->activeWindow()), + listImagesErrorDialog *ErrorImagesDialog = new listImagesErrorDialog(kapp->activeWindow(), i18n("Error during resize images process."), i18n("Cannot resize the following image files:"), i18n("Do you want them to be added as attachments " @@ -484,7 +484,7 @@ bool SendImages::invokeMailAgent(void) } if ( m_mailAgentProc->start() == false ) - KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), + KMessageBox::error(kapp->activeWindow(), i18n("Cannot start '%1' program;\nplease " "check your installation.") .arg(m_sendImagesDialog->m_mailAgentName->currentText())); @@ -513,7 +513,7 @@ bool SendImages::invokeMailAgent(void) *m_mailAgentProc << TQFile::encodeName((*it).path()).data(); if ( m_mailAgentProc->start() == false ) - KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), + KMessageBox::error(kapp->activeWindow(), i18n("Cannot start '%1' program;\nplease " "check your installation.") .arg(m_sendImagesDialog->m_mailAgentName->currentText())); @@ -535,7 +535,7 @@ bool SendImages::invokeMailAgent(void) } if ( m_mailAgentProc->start() == false ) - KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), + KMessageBox::error(kapp->activeWindow(), i18n("Cannot start '%1' program;\nplease " "check your installation.") .arg(m_sendImagesDialog->m_mailAgentName->currentText())); @@ -561,7 +561,7 @@ bool SendImages::invokeMailAgent(void) *m_mailAgentProc << Temp; if ( m_mailAgentProc->start() == false ) - KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), + KMessageBox::error(kapp->activeWindow(), i18n("Cannot start '%1' program;\nplease " "check your installation.") .arg(m_sendImagesDialog->m_mailAgentName->currentText())); @@ -624,7 +624,7 @@ bool SendImages::invokeMailAgent(void) tqDebug ("%s", Temp.ascii()); if ( m_mailAgentProc->start(TDEProcess::NotifyOnExit , TDEProcess::All) == false ) - KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), + KMessageBox::error(kapp->activeWindow(), i18n("Cannot start '%1' program;\nplease " "check your installation.") .arg(m_sendImagesDialog->m_mailAgentName->currentText())); @@ -642,7 +642,7 @@ bool SendImages::invokeMailAgent(void) void SendImages::removeTmpFiles(void) { if (DeleteDir(m_tmp) == false) - KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), i18n("Cannot remove temporary folder %1.").arg(m_tmp)); + KMessageBox::error(kapp->activeWindow(), i18n("Cannot remove temporary folder %1.").arg(m_tmp)); } ///Checks if directory is empty and invokes its deletion @@ -881,7 +881,7 @@ void SendImages::slotMozillaExited(TDEProcess*) if ( m_mailAgentProc2->start() == false ) { - KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), + KMessageBox::error(kapp->activeWindow(), i18n("Cannot start '%1' program;\nplease " "check your installation.") .arg(m_sendImagesDialog->m_mailAgentName->currentText())); diff --git a/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp b/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp index d9f95ba..c6665f4 100644 --- a/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp +++ b/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp @@ -87,7 +87,7 @@ void SimpleViewerExport::run(KIPI::Interface* interface, TQObject *parent) { if(!plugin->installSimpleViewer()) { - KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), i18n("SimpleViewer installation failed")); + KMessageBox::error(kapp->activeWindow(), i18n("SimpleViewer installation failed")); return; } } @@ -134,7 +134,7 @@ bool SimpleViewerExport::configure() m_canceled = false; if(!m_configDlg) - m_configDlg = new SVEDialog(m_interface, TQT_TQWIDGET(kapp->activeWindow())); + m_configDlg = new SVEDialog(m_interface, kapp->activeWindow()); bool configured = false; while(!configured) @@ -144,9 +144,9 @@ bool SimpleViewerExport::configure() configured = true; - if(TDEIO::NetAccess::exists(m_configDlg->exportURL(), false, TQT_TQWIDGET(kapp->activeWindow()))) + if(TDEIO::NetAccess::exists(m_configDlg->exportURL(), false, kapp->activeWindow())) { - int ret = KMessageBox::warningYesNoCancel(TQT_TQWIDGET(kapp->activeWindow()), + int ret = KMessageBox::warningYesNoCancel(kapp->activeWindow(), i18n("Target folder %1 already exists.\n" "Do you want to overwrite it (all data in this folder will be lost)") .arg(m_configDlg->exportURL())); @@ -154,9 +154,9 @@ bool SimpleViewerExport::configure() switch(ret) { case KMessageBox::Yes: - if(!TDEIO::NetAccess::del(m_configDlg->exportURL(), TQT_TQWIDGET(kapp->activeWindow()))) + if(!TDEIO::NetAccess::del(m_configDlg->exportURL(), kapp->activeWindow())) { - KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), i18n("Could not delete %1\n" + KMessageBox::error(kapp->activeWindow(), i18n("Could not delete %1\n" "Please choose another export folder").arg(m_configDlg->exportURL())); configured = false; } @@ -181,7 +181,7 @@ void SimpleViewerExport::startExport() if(m_canceled) return; - m_progressDlg = new KIPI::BatchProgressDialog(TQT_TQWIDGET(kapp->activeWindow()), i18n("Flash Export")); + m_progressDlg = new KIPI::BatchProgressDialog(kapp->activeWindow(), i18n("Flash Export")); connect(m_progressDlg, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(slotCancel())); @@ -264,13 +264,13 @@ void SimpleViewerExport::slotProcess() if(m_canceled) { - int ret = KMessageBox::warningYesNo(TQT_TQWIDGET(kapp->activeWindow()), + int ret = KMessageBox::warningYesNo(kapp->activeWindow(), i18n("Export was canceled.\n" "Do you want to delete the yet created files in %1 ?") .arg(m_configDlg->exportURL())); if(ret == KMessageBox::Yes) { - TDEIO::NetAccess::del(m_configDlg->exportURL(), TQT_TQWIDGET(kapp->activeWindow())); + TDEIO::NetAccess::del(m_configDlg->exportURL(), kapp->activeWindow()); } } @@ -286,7 +286,7 @@ bool SimpleViewerExport::createExportDirectories() m_progressDlg->addedAction(i18n("Creating directories..."), KIPI::StartingMessage); KURL root = m_configDlg->exportURL(); - if(!TDEIO::NetAccess::mkdir(root, TQT_TQWIDGET(kapp->activeWindow()))) + if(!TDEIO::NetAccess::mkdir(root, kapp->activeWindow())) { m_progressDlg->addedAction(i18n("Could not create folder '%1'").arg(root.url()), KIPI::ErrorMessage); @@ -295,7 +295,7 @@ bool SimpleViewerExport::createExportDirectories() KURL thumbsDir = m_tempDir->name(); thumbsDir.addPath("/thumbs"); - if(!TDEIO::NetAccess::mkdir(thumbsDir, TQT_TQWIDGET(kapp->activeWindow()))) + if(!TDEIO::NetAccess::mkdir(thumbsDir, kapp->activeWindow())) { m_progressDlg->addedAction(i18n("Could not create folder '%1'").arg(thumbsDir.url()), KIPI::ErrorMessage); @@ -304,7 +304,7 @@ bool SimpleViewerExport::createExportDirectories() KURL imagesDir = m_tempDir->name(); imagesDir.addPath("/images"); - if(!TDEIO::NetAccess::mkdir(imagesDir, TQT_TQWIDGET(kapp->activeWindow()))) + if(!TDEIO::NetAccess::mkdir(imagesDir, kapp->activeWindow())) { m_progressDlg->addedAction(i18n("Could not create folder '%1'").arg(imagesDir.url()), KIPI::ErrorMessage); @@ -628,7 +628,7 @@ bool SimpleViewerExport::checkSimpleViewer() const bool SimpleViewerExport::installSimpleViewer() { - FirstRunDlg *firstRunDlg = new FirstRunDlg(TQT_TQWIDGET(kapp->activeWindow())); + FirstRunDlg *firstRunDlg = new FirstRunDlg(kapp->activeWindow()); if(firstRunDlg->exec() == TQDialog::Accepted) { TQString url = firstRunDlg->getURL(); diff --git a/kipi-plugins/timeadjust/plugin_timeadjust.cpp b/kipi-plugins/timeadjust/plugin_timeadjust.cpp index 6afcde2..81ad830 100644 --- a/kipi-plugins/timeadjust/plugin_timeadjust.cpp +++ b/kipi-plugins/timeadjust/plugin_timeadjust.cpp @@ -91,7 +91,7 @@ void Plugin_TimeAdjust::slotActivate() if (!images.isValid() || images.images().isEmpty()) return; - KIPITimeAdjustPlugin::TimeAdjustDialog dlg(m_interface, TQT_TQWIDGET(kapp->activeWindow())); + KIPITimeAdjustPlugin::TimeAdjustDialog dlg(m_interface, kapp->activeWindow()); dlg.setImages(images.images()); dlg.exec(); } diff --git a/kipi-plugins/timeadjust/timeadjustdialog.cpp b/kipi-plugins/timeadjust/timeadjustdialog.cpp index 03b6093..2b483aa 100644 --- a/kipi-plugins/timeadjust/timeadjustdialog.cpp +++ b/kipi-plugins/timeadjust/timeadjustdialog.cpp @@ -503,7 +503,7 @@ void TimeAdjustDialog::slotOk() if (!errorFiles.isEmpty() && (d->syncEXIFDateCheck->isChecked() || d->syncIPTCDateCheck->isChecked())) { KMessageBox::informationList( - TQT_TQWIDGET(kapp->activeWindow()), + kapp->activeWindow(), i18n("Unable to set date and time like picture metadata from:"), errorFiles, i18n("Adjust Time & Date")); diff --git a/kipi-plugins/wallpaper/plugin_wallpaper.cpp b/kipi-plugins/wallpaper/plugin_wallpaper.cpp index 559ea4d..6e67af3 100644 --- a/kipi-plugins/wallpaper/plugin_wallpaper.cpp +++ b/kipi-plugins/wallpaper/plugin_wallpaper.cpp @@ -240,10 +240,10 @@ void Plugin_WallPaper::setWallpaper(int layout) // PENDING We need a way to get a parent widget // Sun, 06 Jun 2004 - Aur�ien - KMessageBox::information( TQT_TQWIDGET(kapp->activeWindow()), i18n( + KMessageBox::information( kapp->activeWindow(), i18n( "

You selected a remote image. It needs to be saved to your local disk to be used as a wallpaper." "

You will now be asked where to save the image.

")); - path = KFileDialog::getSaveFileName(url.fileName(), TQString(), TQT_TQWIDGET(kapp->activeWindow())); + path = KFileDialog::getSaveFileName(url.fileName(), TQString(), kapp->activeWindow()); if (path.isNull()) return; #if TDE_VERSION > 0x30200 -- cgit v1.2.1