diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-12-28 16:38:33 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-12-31 22:25:56 +0900 |
| commit | 40c169795fdadb8e948851ad4f25fc34392971b2 (patch) | |
| tree | 9b2063440c8ff9020e52b5a8c8eab6a482627480 /digikam/utilities | |
| parent | 4fb5c762ef25980bba3bda8b10633a50da1ef960 (diff) | |
| download | digikam-40c16979.tar.gz digikam-40c16979.zip | |
Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit b135a5b3eb5adf5b38ff4ade393bcaa3f6454fde)
Diffstat (limited to 'digikam/utilities')
45 files changed, 781 insertions, 781 deletions
diff --git a/digikam/utilities/batch/batchalbumssyncmetadata.cpp b/digikam/utilities/batch/batchalbumssyncmetadata.cpp index 60fbae6a..fba18d34 100644 --- a/digikam/utilities/batch/batchalbumssyncmetadata.cpp +++ b/digikam/utilities/batch/batchalbumssyncmetadata.cpp @@ -79,7 +79,7 @@ BatchAlbumsSyncMetadata::BatchAlbumsSyncMetadata(TQWidget* parent) setLabel(i18n("<b>Syncing the metadata of all images with the digiKam database. Please wait...</b>")); setButtonText(i18n("&Abort")); resize(600, 300); - TQTimer::singleShot(500, this, TQT_SLOT(slotStart())); + TQTimer::singleShot(500, this, TQ_SLOT(slotStart())); } BatchAlbumsSyncMetadata::~BatchAlbumsSyncMetadata() @@ -92,11 +92,11 @@ void BatchAlbumsSyncMetadata::slotStart() setTitle(i18n("Parsing all albums")); setTotalSteps(d->palbumList.count()); - connect(d->imageInfoJob, TQT_SIGNAL(signalItemsInfo(const ImageInfoList&)), - this, TQT_SLOT(slotAlbumParsed(const ImageInfoList&))); + connect(d->imageInfoJob, TQ_SIGNAL(signalItemsInfo(const ImageInfoList&)), + this, TQ_SLOT(slotAlbumParsed(const ImageInfoList&))); - connect(d->imageInfoJob, TQT_SIGNAL(signalCompleted()), - this, TQT_SLOT(slotComplete())); + connect(d->imageInfoJob, TQ_SIGNAL(signalCompleted()), + this, TQ_SLOT(slotComplete())); d->albumsIt = d->palbumList.begin(); parseAlbum(); diff --git a/digikam/utilities/batch/batchsyncmetadata.cpp b/digikam/utilities/batch/batchsyncmetadata.cpp index 831cdaf8..50e2ad7a 100644 --- a/digikam/utilities/batch/batchsyncmetadata.cpp +++ b/digikam/utilities/batch/batchsyncmetadata.cpp @@ -93,11 +93,11 @@ void BatchSyncMetadata::parseAlbum() { d->imageInfoJob->allItemsFromAlbum(d->album); - connect(d->imageInfoJob, TQT_SIGNAL(signalItemsInfo(const ImageInfoList&)), - this, TQT_SLOT(slotAlbumParsed(const ImageInfoList&))); + connect(d->imageInfoJob, TQ_SIGNAL(signalItemsInfo(const ImageInfoList&)), + this, TQ_SLOT(slotAlbumParsed(const ImageInfoList&))); - connect(d->imageInfoJob, TQT_SIGNAL(signalCompleted()), - this, TQT_SLOT(slotComplete())); + connect(d->imageInfoJob, TQ_SIGNAL(signalCompleted()), + this, TQ_SLOT(slotComplete())); } void BatchSyncMetadata::slotComplete() diff --git a/digikam/utilities/batch/batchthumbsgenerator.cpp b/digikam/utilities/batch/batchthumbsgenerator.cpp index 783226f8..f0bd0103 100644 --- a/digikam/utilities/batch/batchthumbsgenerator.cpp +++ b/digikam/utilities/batch/batchthumbsgenerator.cpp @@ -82,7 +82,7 @@ BatchThumbsGenerator::BatchThumbsGenerator(TQWidget* parent) setCaption(i18n("Thumbnails processing")); setLabel(i18n("<b>Updating thumbnails database. Please wait...</b>")); setButtonText(i18n("&Abort")); - TQTimer::singleShot(500, this, TQT_SLOT(slotRebuildThumbs128())); + TQTimer::singleShot(500, this, TQ_SLOT(slotRebuildThumbs128())); resize(600, 300); } @@ -102,8 +102,8 @@ void BatchThumbsGenerator::slotRebuildThumbs128() setTitle(i18n("Processing small thumbs")); rebuildAllThumbs(128); - connect(this, TQT_SIGNAL(signalRebuildThumbsDone()), - this, TQT_SLOT(slotRebuildThumbs256())); + connect(this, TQ_SIGNAL(signalRebuildThumbsDone()), + this, TQ_SLOT(slotRebuildThumbs256())); } void BatchThumbsGenerator::slotRebuildThumbs256() @@ -111,11 +111,11 @@ void BatchThumbsGenerator::slotRebuildThumbs256() setTitle(i18n("Processing large thumbs")); rebuildAllThumbs(256); - disconnect(this, TQT_SIGNAL(signalRebuildThumbsDone()), - this, TQT_SLOT(slotRebuildThumbs256())); + disconnect(this, TQ_SIGNAL(signalRebuildThumbsDone()), + this, TQ_SLOT(slotRebuildThumbs256())); - connect(this, TQT_SIGNAL(signalRebuildThumbsDone()), - this, TQT_SLOT(slotRebuildAllThumbComplete())); + connect(this, TQ_SIGNAL(signalRebuildThumbsDone()), + this, TQ_SLOT(slotRebuildAllThumbComplete())); } void BatchThumbsGenerator::slotRebuildAllThumbComplete() @@ -189,14 +189,14 @@ void BatchThumbsGenerator::rebuildAllThumbs(int size) d->thumbJob = new ThumbnailJob(KURL::List(allPicturesPath), size, true, exifRotate); - connect(d->thumbJob, TQT_SIGNAL(signalThumbnail(const KURL&, const TQPixmap&)), - this, TQT_SLOT(slotRebuildThumbDone(const KURL&, const TQPixmap&))); + connect(d->thumbJob, TQ_SIGNAL(signalThumbnail(const KURL&, const TQPixmap&)), + this, TQ_SLOT(slotRebuildThumbDone(const KURL&, const TQPixmap&))); - connect(d->thumbJob, TQT_SIGNAL(signalFailed(const KURL&)), - this, TQT_SLOT(slotRebuildThumbDone(const KURL&))); + connect(d->thumbJob, TQ_SIGNAL(signalFailed(const KURL&)), + this, TQ_SLOT(slotRebuildThumbDone(const KURL&))); - connect(d->thumbJob, TQT_SIGNAL(signalCompleted()), - this, TQT_SIGNAL(signalRebuildThumbsDone())); + connect(d->thumbJob, TQ_SIGNAL(signalCompleted()), + this, TQ_SIGNAL(signalRebuildThumbsDone())); } void BatchThumbsGenerator::slotRebuildThumbDone(const KURL& url, const TQPixmap& pix) diff --git a/digikam/utilities/batch/imageinfoalbumsjob.cpp b/digikam/utilities/batch/imageinfoalbumsjob.cpp index 49bf3dc6..4d0e3c55 100644 --- a/digikam/utilities/batch/imageinfoalbumsjob.cpp +++ b/digikam/utilities/batch/imageinfoalbumsjob.cpp @@ -59,11 +59,11 @@ ImageInfoAlbumsJob::ImageInfoAlbumsJob() { d = new ImageInfoAlbumsJobPriv; - connect(&d->imageInfoJob, TQT_SIGNAL(signalItemsInfo(const ImageInfoList&)), - this, TQT_SLOT(slotItemsInfo(const ImageInfoList&))); + connect(&d->imageInfoJob, TQ_SIGNAL(signalItemsInfo(const ImageInfoList&)), + this, TQ_SLOT(slotItemsInfo(const ImageInfoList&))); - connect(&d->imageInfoJob, TQT_SIGNAL(signalCompleted()), - this, TQT_SLOT(slotComplete())); + connect(&d->imageInfoJob, TQ_SIGNAL(signalCompleted()), + this, TQ_SLOT(slotComplete())); } ImageInfoAlbumsJob::~ImageInfoAlbumsJob() diff --git a/digikam/utilities/batch/imageinfojob.cpp b/digikam/utilities/batch/imageinfojob.cpp index 5d07c9a0..58660697 100644 --- a/digikam/utilities/batch/imageinfojob.cpp +++ b/digikam/utilities/batch/imageinfojob.cpp @@ -98,11 +98,11 @@ void ImageInfoJob::allItemsFromAlbum(Album *album) d->job = new TDEIO::TransferJob(album->kurl(), TDEIO::CMD_SPECIAL, ba, TQByteArray(), false); - connect(d->job, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotResult(TDEIO::Job*))); + connect(d->job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotResult(TDEIO::Job*))); - connect(d->job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), - this, TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); + connect(d->job, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + this, TQ_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); } void ImageInfoJob::stop() diff --git a/digikam/utilities/cameragui/albumselectdialog.cpp b/digikam/utilities/cameragui/albumselectdialog.cpp index 71e0d109..486c4711 100644 --- a/digikam/utilities/cameragui/albumselectdialog.cpp +++ b/digikam/utilities/cameragui/albumselectdialog.cpp @@ -173,23 +173,23 @@ AlbumSelectDialog::AlbumSelectDialog(TQWidget* parent, PAlbum* albumToSelect, // ------------------------------------------------------------- - connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumAdded(Album*)), - this, TQT_SLOT(slotAlbumAdded(Album*))); + connect(AlbumManager::instance(), TQ_SIGNAL(signalAlbumAdded(Album*)), + this, TQ_SLOT(slotAlbumAdded(Album*))); - connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumDeleted(Album*)), - this, TQT_SLOT(slotAlbumDeleted(Album*))); + connect(AlbumManager::instance(), TQ_SIGNAL(signalAlbumDeleted(Album*)), + this, TQ_SLOT(slotAlbumDeleted(Album*))); - connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumsCleared()), - this, TQT_SLOT(slotAlbumsCleared())); + connect(AlbumManager::instance(), TQ_SIGNAL(signalAlbumsCleared()), + this, TQ_SLOT(slotAlbumsCleared())); - connect(d->folderView, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotSelectionChanged())); + connect(d->folderView, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotSelectionChanged())); - connect(d->folderView, TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT(slotContextMenu(TQListViewItem*, const TQPoint&, int))); + connect(d->folderView, TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT(slotContextMenu(TQListViewItem*, const TQPoint&, int))); - connect(d->searchBar, TQT_SIGNAL(signalTextChanged(const TQString&)), - this, TQT_SLOT(slotSearchTextChanged(const TQString&))); + connect(d->searchBar, TQ_SIGNAL(signalTextChanged(const TQString&)), + this, TQ_SLOT(slotSearchTextChanged(const TQString&))); // ------------------------------------------------------------- @@ -277,7 +277,7 @@ void AlbumSelectDialog::slotContextMenu(TQListViewItem *, const TQPoint &, int) TQPopupMenu popmenu(d->folderView); TDEAction *action = new TDEAction(i18n( "Create New Album" ), "albumfolder-new", 0, this, - TQT_SLOT( slotUser1() ), + TQ_SLOT( slotUser1() ), &popmenu); action->plug(&popmenu); popmenu.exec(TQCursor::pos()); diff --git a/digikam/utilities/cameragui/animwidget.cpp b/digikam/utilities/cameragui/animwidget.cpp index 9d9f8399..1d869cd9 100644 --- a/digikam/utilities/cameragui/animwidget.cpp +++ b/digikam/utilities/cameragui/animwidget.cpp @@ -68,8 +68,8 @@ AnimWidget::AnimWidget(TQWidget* parent, int size) d->timer = new TQTimer(this); - connect(d->timer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotTimeout())); + connect(d->timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotTimeout())); } AnimWidget::~AnimWidget() diff --git a/digikam/utilities/cameragui/cameracontroller.cpp b/digikam/utilities/cameragui/cameracontroller.cpp index 78fcbc60..34afa8ab 100644 --- a/digikam/utilities/cameragui/cameracontroller.cpp +++ b/digikam/utilities/cameragui/cameracontroller.cpp @@ -649,8 +649,8 @@ CameraController::CameraController(TQWidget* parent, const TQString& title, cons d->thread = new CameraThread(this); d->timer = new TQTimer(this); - connect(d->timer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotProcessNext())); + connect(d->timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotProcessNext())); d->timer->start(50, false); } diff --git a/digikam/utilities/cameragui/camerafolderdialog.cpp b/digikam/utilities/cameragui/camerafolderdialog.cpp index 441492d2..93feb0ab 100644 --- a/digikam/utilities/cameragui/camerafolderdialog.cpp +++ b/digikam/utilities/cameragui/camerafolderdialog.cpp @@ -95,8 +95,8 @@ CameraFolderDialog::CameraFolderDialog(TQWidget *parent, CameraIconView *cameraV } } - connect(m_folderView, TQT_SIGNAL(signalFolderChanged(CameraFolderItem*)), - this, TQT_SLOT(slotFolderPathSelectionChanged(CameraFolderItem*))); + connect(m_folderView, TQ_SIGNAL(signalFolderChanged(CameraFolderItem*)), + this, TQ_SLOT(slotFolderPathSelectionChanged(CameraFolderItem*))); resize(500, 500); } diff --git a/digikam/utilities/cameragui/camerafolderview.cpp b/digikam/utilities/cameragui/camerafolderview.cpp index bfa95e8b..877c4b51 100644 --- a/digikam/utilities/cameragui/camerafolderview.cpp +++ b/digikam/utilities/cameragui/camerafolderview.cpp @@ -64,11 +64,11 @@ CameraFolderView::CameraFolderView(TQWidget* parent) setResizeMode( TQListView::AllColumns ); setSelectionMode(TQListView::Single); - connect(this, TQT_SIGNAL(currentChanged(TQListViewItem*)), - this, TQT_SLOT(slotCurrentChanged(TQListViewItem*))); + connect(this, TQ_SIGNAL(currentChanged(TQListViewItem*)), + this, TQ_SLOT(slotCurrentChanged(TQListViewItem*))); - connect(this, TQT_SIGNAL(clicked(TQListViewItem*)), - this, TQT_SLOT(slotCurrentChanged(TQListViewItem*))); + connect(this, TQ_SIGNAL(clicked(TQListViewItem*)), + this, TQ_SLOT(slotCurrentChanged(TQListViewItem*))); } CameraFolderView::~CameraFolderView() diff --git a/digikam/utilities/cameragui/cameraiconview.cpp b/digikam/utilities/cameragui/cameraiconview.cpp index e0f76a5a..ba496217 100644 --- a/digikam/utilities/cameragui/cameraiconview.cpp +++ b/digikam/utilities/cameragui/cameraiconview.cpp @@ -237,23 +237,23 @@ CameraIconView::CameraIconView(CameraUI* ui, TQWidget* parent) // ---------------------------------------------------------------- - connect(this, TQT_SIGNAL(signalSelectionChanged()), - this, TQT_SLOT(slotSelectionChanged())); + connect(this, TQ_SIGNAL(signalSelectionChanged()), + this, TQ_SLOT(slotSelectionChanged())); - connect(this, TQT_SIGNAL(signalNewSelection(bool)), - this, TQT_SLOT(slotUpdateDownloadNames(bool))); + connect(this, TQ_SIGNAL(signalNewSelection(bool)), + this, TQ_SLOT(slotUpdateDownloadNames(bool))); - connect(this, TQT_SIGNAL(signalRightButtonClicked(IconItem*, const TQPoint&)), - this, TQT_SLOT(slotContextMenu(IconItem*, const TQPoint&))); + connect(this, TQ_SIGNAL(signalRightButtonClicked(IconItem*, const TQPoint&)), + this, TQ_SLOT(slotContextMenu(IconItem*, const TQPoint&))); - connect(this, TQT_SIGNAL(signalRightButtonClicked(const TQPoint &)), - this, TQT_SLOT(slotRightButtonClicked(const TQPoint &))); + connect(this, TQ_SIGNAL(signalRightButtonClicked(const TQPoint &)), + this, TQ_SLOT(slotRightButtonClicked(const TQPoint &))); - connect(this, TQT_SIGNAL(signalDoubleClicked(IconItem*)), - this, TQT_SLOT(slotDoubleClicked(IconItem*))); + connect(this, TQ_SIGNAL(signalDoubleClicked(IconItem*)), + this, TQ_SLOT(slotDoubleClicked(IconItem*))); - connect(ThemeEngine::instance(), TQT_SIGNAL(signalThemeChanged()), - this, TQT_SLOT(slotThemeChanged())); + connect(ThemeEngine::instance(), TQ_SIGNAL(signalThemeChanged()), + this, TQ_SLOT(slotThemeChanged())); // ---------------------------------------------------------------- @@ -291,8 +291,8 @@ void CameraIconView::setRenameCustomizer(RenameCustomizer* renamer) { d->renamer = renamer; - connect(d->renamer, TQT_SIGNAL(signalChanged()), - this, TQT_SLOT(slotDownloadNameChanged())); + connect(d->renamer, TQ_SIGNAL(signalChanged()), + this, TQ_SLOT(slotDownloadNameChanged())); } void CameraIconView::addItem(const GPItemInfo& info) diff --git a/digikam/utilities/cameragui/cameraui.cpp b/digikam/utilities/cameragui/cameraui.cpp index cdabd06c..8b531ea2 100644 --- a/digikam/utilities/cameragui/cameraui.cpp +++ b/digikam/utilities/cameragui/cameraui.cpp @@ -408,33 +408,33 @@ CameraUI::CameraUI(TQWidget* /*parent*/, const TQString& cameraTitle, // ------------------------------------------------------------------------- d->imageMenu = new TQPopupMenu(this); - d->imageMenu->insertItem(i18n("Select &All"), d->view, TQT_SLOT(slotSelectAll()), CTRL+Key_A, 0); - d->imageMenu->insertItem(i18n("Select N&one"), d->view, TQT_SLOT(slotSelectNone()), CTRL+Key_U, 1); - d->imageMenu->insertItem(i18n("&Invert Selection"), d->view, TQT_SLOT(slotSelectInvert()), CTRL+Key_Asterisk, 2); + d->imageMenu->insertItem(i18n("Select &All"), d->view, TQ_SLOT(slotSelectAll()), CTRL+Key_A, 0); + d->imageMenu->insertItem(i18n("Select N&one"), d->view, TQ_SLOT(slotSelectNone()), CTRL+Key_U, 1); + d->imageMenu->insertItem(i18n("&Invert Selection"), d->view, TQ_SLOT(slotSelectInvert()), CTRL+Key_Asterisk, 2); d->imageMenu->insertSeparator(); - d->imageMenu->insertItem(i18n("Select &New Items"), d->view, TQT_SLOT(slotSelectNew()), 0, 3); + d->imageMenu->insertItem(i18n("Select &New Items"), d->view, TQ_SLOT(slotSelectNew()), 0, 3); d->imageMenu->insertSeparator(); - d->imageMenu->insertItem(i18n("Increase Thumbnail Size"), this, TQT_SLOT(slotIncreaseThumbSize()), CTRL+Key_Plus, 4); - d->imageMenu->insertItem(i18n("Decrease Thumbnail Size"), this, TQT_SLOT(slotDecreaseThumbSize()), CTRL+Key_Minus, 5); + d->imageMenu->insertItem(i18n("Increase Thumbnail Size"), this, TQ_SLOT(slotIncreaseThumbSize()), CTRL+Key_Plus, 4); + d->imageMenu->insertItem(i18n("Decrease Thumbnail Size"), this, TQ_SLOT(slotDecreaseThumbSize()), CTRL+Key_Minus, 5); d->imageMenu->insertSeparator(); - d->imageMenu->insertItem(i18n("Toggle Lock"), this, TQT_SLOT(slotToggleLock()), 0, 6); + d->imageMenu->insertItem(i18n("Toggle Lock"), this, TQ_SLOT(slotToggleLock()), 0, 6); actionButton(User3)->setPopup(d->imageMenu); // ------------------------------------------------------------------------- d->downloadMenu = new TQPopupMenu(this); d->downloadMenu->insertItem(i18n("Download Selected"), - this, TQT_SLOT(slotDownloadSelected()), 0, 0); + this, TQ_SLOT(slotDownloadSelected()), 0, 0); d->downloadMenu->insertItem(i18n("Download All"), - this, TQT_SLOT(slotDownloadAll()), 0, 1); + this, TQ_SLOT(slotDownloadAll()), 0, 1); d->downloadMenu->insertSeparator(); d->downloadMenu->insertItem(i18n("Download/Delete Selected"), - this, TQT_SLOT(slotDownloadAndDeleteSelected()), 0, 2); + this, TQ_SLOT(slotDownloadAndDeleteSelected()), 0, 2); d->downloadMenu->insertItem(i18n("Download/Delete All"), - this, TQT_SLOT(slotDownloadAndDeleteAll()), 0, 3); + this, TQ_SLOT(slotDownloadAndDeleteAll()), 0, 3); d->downloadMenu->insertSeparator(); d->downloadMenu->insertItem(i18n("Upload..."), - this, TQT_SLOT(slotUpload()), 0, 4); + this, TQ_SLOT(slotUpload()), 0, 4); d->downloadMenu->setItemEnabled(0, false); d->downloadMenu->setItemEnabled(2, false); actionButton(User2)->setPopup(d->downloadMenu); @@ -442,8 +442,8 @@ CameraUI::CameraUI(TQWidget* /*parent*/, const TQString& cameraTitle, // ------------------------------------------------------------------------- d->deleteMenu = new TQPopupMenu(this); - d->deleteMenu->insertItem(i18n("Delete Selected"), this, TQT_SLOT(slotDeleteSelected()), 0, 0); - d->deleteMenu->insertItem(i18n("Delete All"), this, TQT_SLOT(slotDeleteAll()), 0, 1); + d->deleteMenu->insertItem(i18n("Delete Selected"), this, TQ_SLOT(slotDeleteSelected()), 0, 0); + d->deleteMenu->insertItem(i18n("Delete All"), this, TQ_SLOT(slotDeleteAll()), 0, 1); d->deleteMenu->setItemEnabled(0, false); actionButton(User1)->setPopup(d->deleteMenu); @@ -452,76 +452,76 @@ CameraUI::CameraUI(TQWidget* /*parent*/, const TQString& cameraTitle, TQPushButton *helpButton = actionButton( Help ); d->helpMenu = new KHelpMenu(this, kapp->aboutData(), false); d->helpMenu->menu()->insertItem(SmallIcon("camera-photo"), i18n("Camera Information"), - this, TQT_SLOT(slotInformations()), 0, CAMERA_INFO_MENU_ID, 0); + this, TQ_SLOT(slotInformations()), 0, CAMERA_INFO_MENU_ID, 0); helpButton->setPopup( d->helpMenu->menu() ); // ------------------------------------------------------------------------- - connect(d->autoAlbumDateCheck, TQT_SIGNAL(toggled(bool)), - d->folderDateFormat, TQT_SLOT(setEnabled(bool))); + connect(d->autoAlbumDateCheck, TQ_SIGNAL(toggled(bool)), + d->folderDateFormat, TQ_SLOT(setEnabled(bool))); - connect(d->autoAlbumDateCheck, TQT_SIGNAL(toggled(bool)), - d->folderDateLabel, TQT_SLOT(setEnabled(bool))); + connect(d->autoAlbumDateCheck, TQ_SIGNAL(toggled(bool)), + d->folderDateLabel, TQ_SLOT(setEnabled(bool))); - connect(d->convertJpegCheck, TQT_SIGNAL(toggled(bool)), - d->losslessFormat, TQT_SLOT(setEnabled(bool))); + connect(d->convertJpegCheck, TQ_SIGNAL(toggled(bool)), + d->losslessFormat, TQ_SLOT(setEnabled(bool))); - connect(d->convertJpegCheck, TQT_SIGNAL(toggled(bool)), - d->formatLabel, TQT_SLOT(setEnabled(bool))); + connect(d->convertJpegCheck, TQ_SIGNAL(toggled(bool)), + d->formatLabel, TQ_SLOT(setEnabled(bool))); - connect(d->convertJpegCheck, TQT_SIGNAL(toggled(bool)), - d->view, TQT_SLOT(slotDownloadNameChanged())); + connect(d->convertJpegCheck, TQ_SIGNAL(toggled(bool)), + d->view, TQ_SLOT(slotDownloadNameChanged())); - connect(d->fixDateTimeCheck, TQT_SIGNAL(toggled(bool)), - d->dateTimeEdit, TQT_SLOT(setEnabled(bool))); + connect(d->fixDateTimeCheck, TQ_SIGNAL(toggled(bool)), + d->dateTimeEdit, TQ_SLOT(setEnabled(bool))); - connect(pixmapLogo, TQT_SIGNAL(leftClickedURL(const TQString&)), - this, TQT_SLOT(slotProcessURL(const TQString&))); + connect(pixmapLogo, TQ_SIGNAL(leftClickedURL(const TQString&)), + this, TQ_SLOT(slotProcessURL(const TQString&))); // ------------------------------------------------------------------------- - connect(d->view, TQT_SIGNAL(signalSelected(CameraIconViewItem*, bool)), - this, TQT_SLOT(slotItemsSelected(CameraIconViewItem*, bool))); + connect(d->view, TQ_SIGNAL(signalSelected(CameraIconViewItem*, bool)), + this, TQ_SLOT(slotItemsSelected(CameraIconViewItem*, bool))); - connect(d->view, TQT_SIGNAL(signalFileView(CameraIconViewItem*)), - this, TQT_SLOT(slotFileView(CameraIconViewItem*))); + connect(d->view, TQ_SIGNAL(signalFileView(CameraIconViewItem*)), + this, TQ_SLOT(slotFileView(CameraIconViewItem*))); - connect(d->view, TQT_SIGNAL(signalUpload(const KURL::List&)), - this, TQT_SLOT(slotUploadItems(const KURL::List&))); + connect(d->view, TQ_SIGNAL(signalUpload(const KURL::List&)), + this, TQ_SLOT(slotUploadItems(const KURL::List&))); - connect(d->view, TQT_SIGNAL(signalDownload()), - this, TQT_SLOT(slotDownloadSelected())); + connect(d->view, TQ_SIGNAL(signalDownload()), + this, TQ_SLOT(slotDownloadSelected())); - connect(d->view, TQT_SIGNAL(signalDownloadAndDelete()), - this, TQT_SLOT(slotDownloadAndDeleteSelected())); + connect(d->view, TQ_SIGNAL(signalDownloadAndDelete()), + this, TQ_SLOT(slotDownloadAndDeleteSelected())); - connect(d->view, TQT_SIGNAL(signalDelete()), - this, TQT_SLOT(slotDeleteSelected())); + connect(d->view, TQ_SIGNAL(signalDelete()), + this, TQ_SLOT(slotDeleteSelected())); - connect(d->view, TQT_SIGNAL(signalToggleLock()), - this, TQT_SLOT(slotToggleLock())); + connect(d->view, TQ_SIGNAL(signalToggleLock()), + this, TQ_SLOT(slotToggleLock())); - connect(d->view, TQT_SIGNAL(signalNewSelection(bool)), - this, TQT_SLOT(slotNewSelection(bool))); + connect(d->view, TQ_SIGNAL(signalNewSelection(bool)), + this, TQ_SLOT(slotNewSelection(bool))); // ------------------------------------------------------------------------- - connect(d->rightSidebar, TQT_SIGNAL(signalFirstItem()), - this, TQT_SLOT(slotFirstItem())); + connect(d->rightSidebar, TQ_SIGNAL(signalFirstItem()), + this, TQ_SLOT(slotFirstItem())); - connect(d->rightSidebar, TQT_SIGNAL(signalNextItem()), - this, TQT_SLOT(slotNextItem())); + connect(d->rightSidebar, TQ_SIGNAL(signalNextItem()), + this, TQ_SLOT(slotNextItem())); - connect(d->rightSidebar, TQT_SIGNAL(signalPrevItem()), - this, TQT_SLOT(slotPrevItem())); + connect(d->rightSidebar, TQ_SIGNAL(signalPrevItem()), + this, TQ_SLOT(slotPrevItem())); - connect(d->rightSidebar, TQT_SIGNAL(signalLastItem()), - this, TQT_SLOT(slotLastItem())); + connect(d->rightSidebar, TQ_SIGNAL(signalLastItem()), + this, TQ_SLOT(slotLastItem())); // ------------------------------------------------------------------------- - connect(d->cancelBtn, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotCancelButton())); + connect(d->cancelBtn, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotCancelButton())); // -- Read settings & Check free space availability on album root path ----- @@ -531,55 +531,55 @@ CameraUI::CameraUI(TQWidget* /*parent*/, const TQString& cameraTitle, d->controller = new CameraController(this, d->cameraTitle, model, port, path); - connect(d->controller, TQT_SIGNAL(signalConnected(bool)), - this, TQT_SLOT(slotConnected(bool))); + connect(d->controller, TQ_SIGNAL(signalConnected(bool)), + this, TQ_SLOT(slotConnected(bool))); - connect(d->controller, TQT_SIGNAL(signalInfoMsg(const TQString&)), - d->status, TQT_SLOT(setText(const TQString&))); + connect(d->controller, TQ_SIGNAL(signalInfoMsg(const TQString&)), + d->status, TQ_SLOT(setText(const TQString&))); - connect(d->controller, TQT_SIGNAL(signalErrorMsg(const TQString&)), - this, TQT_SLOT(slotErrorMsg(const TQString&))); + connect(d->controller, TQ_SIGNAL(signalErrorMsg(const TQString&)), + this, TQ_SLOT(slotErrorMsg(const TQString&))); - connect(d->controller, TQT_SIGNAL(signalCameraInformations(const TQString&, const TQString&, const TQString&)), - this, TQT_SLOT(slotCameraInformations(const TQString&, const TQString&, const TQString&))); + connect(d->controller, TQ_SIGNAL(signalCameraInformations(const TQString&, const TQString&, const TQString&)), + this, TQ_SLOT(slotCameraInformations(const TQString&, const TQString&, const TQString&))); - connect(d->controller, TQT_SIGNAL(signalBusy(bool)), - this, TQT_SLOT(slotBusy(bool))); + connect(d->controller, TQ_SIGNAL(signalBusy(bool)), + this, TQ_SLOT(slotBusy(bool))); - connect(d->controller, TQT_SIGNAL(signalFolderList(const TQStringList&)), - this, TQT_SLOT(slotFolderList(const TQStringList&))); + connect(d->controller, TQ_SIGNAL(signalFolderList(const TQStringList&)), + this, TQ_SLOT(slotFolderList(const TQStringList&))); - connect(d->controller, TQT_SIGNAL(signalFileList(const GPItemInfoList&)), - this, TQT_SLOT(slotFileList(const GPItemInfoList&))); + connect(d->controller, TQ_SIGNAL(signalFileList(const GPItemInfoList&)), + this, TQ_SLOT(slotFileList(const GPItemInfoList&))); - connect(d->controller, TQT_SIGNAL(signalThumbnail(const TQString&, const TQString&, const TQImage&)), - this, TQT_SLOT(slotThumbnail(const TQString&, const TQString&, const TQImage&))); + connect(d->controller, TQ_SIGNAL(signalThumbnail(const TQString&, const TQString&, const TQImage&)), + this, TQ_SLOT(slotThumbnail(const TQString&, const TQString&, const TQImage&))); - connect(d->controller, TQT_SIGNAL(signalDownloaded(const TQString&, const TQString&, int)), - this, TQT_SLOT(slotDownloaded(const TQString&, const TQString&, int))); + connect(d->controller, TQ_SIGNAL(signalDownloaded(const TQString&, const TQString&, int)), + this, TQ_SLOT(slotDownloaded(const TQString&, const TQString&, int))); - connect(d->controller, TQT_SIGNAL(signalSkipped(const TQString&, const TQString&)), - this, TQT_SLOT(slotSkipped(const TQString&, const TQString&))); + connect(d->controller, TQ_SIGNAL(signalSkipped(const TQString&, const TQString&)), + this, TQ_SLOT(slotSkipped(const TQString&, const TQString&))); - connect(d->controller, TQT_SIGNAL(signalDeleted(const TQString&, const TQString&, bool)), - this, TQT_SLOT(slotDeleted(const TQString&, const TQString&, bool))); + connect(d->controller, TQ_SIGNAL(signalDeleted(const TQString&, const TQString&, bool)), + this, TQ_SLOT(slotDeleted(const TQString&, const TQString&, bool))); - connect(d->controller, TQT_SIGNAL(signalLocked(const TQString&, const TQString&, bool)), - this, TQT_SLOT(slotLocked(const TQString&, const TQString&, bool))); + connect(d->controller, TQ_SIGNAL(signalLocked(const TQString&, const TQString&, bool)), + this, TQ_SLOT(slotLocked(const TQString&, const TQString&, bool))); - connect(d->controller, TQT_SIGNAL(signalExifFromFile(const TQString&, const TQString&)), - this, TQT_SLOT(slotExifFromFile(const TQString&, const TQString&))); + connect(d->controller, TQ_SIGNAL(signalExifFromFile(const TQString&, const TQString&)), + this, TQ_SLOT(slotExifFromFile(const TQString&, const TQString&))); - connect(d->controller, TQT_SIGNAL(signalExifData(const TQByteArray&)), - this, TQT_SLOT(slotExifFromData(const TQByteArray&))); + connect(d->controller, TQ_SIGNAL(signalExifData(const TQByteArray&)), + this, TQ_SLOT(slotExifFromData(const TQByteArray&))); - connect(d->controller, TQT_SIGNAL(signalUploaded(const GPItemInfo&)), - this, TQT_SLOT(slotUploaded(const GPItemInfo&))); + connect(d->controller, TQ_SIGNAL(signalUploaded(const GPItemInfo&)), + this, TQ_SLOT(slotUploaded(const GPItemInfo&))); // ------------------------------------------------------------------------- d->view->setFocus(); - TQTimer::singleShot(0, d->controller, TQT_SLOT(slotConnect())); + TQTimer::singleShot(0, d->controller, TQ_SLOT(slotConnect())); } CameraUI::~CameraUI() @@ -679,7 +679,7 @@ void CameraUI::slotCancelButton() { d->status->setText(i18n("Cancelling current operation, please wait...")); d->progress->hide(); - TQTimer::singleShot(0, d->controller, TQT_SLOT(slotCancel())); + TQTimer::singleShot(0, d->controller, TQ_SLOT(slotCancel())); d->currentlyDeleting.clear(); } @@ -868,7 +868,7 @@ void CameraUI::slotConnected(bool val) i18n("Retry"), i18n("Abort")) == KMessageBox::Yes) - TQTimer::singleShot(0, d->controller, TQT_SLOT(slotConnect())); + TQTimer::singleShot(0, d->controller, TQ_SLOT(slotConnect())); else close(); } diff --git a/digikam/utilities/cameragui/freespacewidget.cpp b/digikam/utilities/cameragui/freespacewidget.cpp index 4921c5a4..0d7a26b1 100644 --- a/digikam/utilities/cameragui/freespacewidget.cpp +++ b/digikam/utilities/cameragui/freespacewidget.cpp @@ -92,8 +92,8 @@ FreeSpaceWidget::FreeSpaceWidget(TQWidget* parent, int width) d->timer = new TQTimer(this); - connect(d->timer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotTimeout())); + connect(d->timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotTimeout())); d->timer->start(10000); } @@ -229,9 +229,9 @@ void FreeSpaceWidget::slotTimeout() { TQString mountPoint = TDEIO::findPathMountPoint(AlbumSettings::instance()->getAlbumLibraryPath()); KDiskFreeSp *job = new KDiskFreeSp; - connect(job, TQT_SIGNAL(foundMountPoint(const unsigned long&, const unsigned long&, + connect(job, TQ_SIGNAL(foundMountPoint(const unsigned long&, const unsigned long&, const unsigned long&, const TQString&)), - this, TQT_SLOT(slotAvailableFreeSpace(const unsigned long&, const unsigned long&, + this, TQ_SLOT(slotAvailableFreeSpace(const unsigned long&, const unsigned long&, const unsigned long&, const TQString&))); job->readDF(mountPoint); } diff --git a/digikam/utilities/cameragui/renamecustomizer.cpp b/digikam/utilities/cameragui/renamecustomizer.cpp index bc7b4c6d..a906ccb1 100644 --- a/digikam/utilities/cameragui/renamecustomizer.cpp +++ b/digikam/utilities/cameragui/renamecustomizer.cpp @@ -254,41 +254,41 @@ RenameCustomizer::RenameCustomizer(TQWidget* parent, const TQString& cameraTitle // -- setup connections ------------------------------------------------- - connect(this, TQT_SIGNAL(clicked(int)), - this, TQT_SLOT(slotRadioButtonClicked(int))); + connect(this, TQ_SIGNAL(clicked(int)), + this, TQ_SLOT(slotRadioButtonClicked(int))); - connect(d->renameCustomPrefix, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotRenameOptionsChanged())); + connect(d->renameCustomPrefix, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotRenameOptionsChanged())); - connect(d->renameCustomSuffix, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotRenameOptionsChanged())); + connect(d->renameCustomSuffix, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotRenameOptionsChanged())); - connect(d->addDateTimeBox, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotRenameOptionsChanged())); + connect(d->addDateTimeBox, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotRenameOptionsChanged())); - connect(d->addCameraNameBox, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotRenameOptionsChanged())); + connect(d->addCameraNameBox, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotRenameOptionsChanged())); - connect(d->addSeqNumberBox, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotRenameOptionsChanged())); + connect(d->addSeqNumberBox, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotRenameOptionsChanged())); - connect(d->renameDefaultCaseType, TQT_SIGNAL(activated(const TQString&)), - this, TQT_SLOT(slotRenameOptionsChanged())); + connect(d->renameDefaultCaseType, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(slotRenameOptionsChanged())); - connect(d->startIndexInput, TQT_SIGNAL(valueChanged (int)), - this, TQT_SLOT(slotRenameOptionsChanged())); + connect(d->startIndexInput, TQ_SIGNAL(valueChanged (int)), + this, TQ_SLOT(slotRenameOptionsChanged())); - connect(d->changedTimer, TQT_SIGNAL(timeout()), - this, TQT_SIGNAL(signalChanged())); + connect(d->changedTimer, TQ_SIGNAL(timeout()), + this, TQ_SIGNAL(signalChanged())); - connect(d->dateTimeButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotDateTimeButtonClicked())); + connect(d->dateTimeButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotDateTimeButtonClicked())); - connect(d->dateTimeFormat, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotDateTimeFormatChanged(int))); + connect(d->dateTimeFormat, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotDateTimeFormatChanged(int))); - connect(d->addDateTimeBox, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotDateTimeBoxToggled(bool))); + connect(d->addDateTimeBox, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotDateTimeBoxToggled(bool))); // -- initial values --------------------------------------------------- diff --git a/digikam/utilities/imageeditor/canvas/canvas.cpp b/digikam/utilities/imageeditor/canvas/canvas.cpp index 128a0da0..89758c3d 100644 --- a/digikam/utilities/imageeditor/canvas/canvas.cpp +++ b/digikam/utilities/imageeditor/canvas/canvas.cpp @@ -174,35 +174,35 @@ Canvas::Canvas(TQWidget *parent) // ------------------------------------------------------------ - connect(this, TQT_SIGNAL(signalZoomChanged(double)), - this, TQT_SLOT(slotZoomChanged(double))); + connect(this, TQ_SIGNAL(signalZoomChanged(double)), + this, TQ_SLOT(slotZoomChanged(double))); - connect(d->cornerButton, TQT_SIGNAL(pressed()), - this, TQT_SLOT(slotCornerButtonPressed())); + connect(d->cornerButton, TQ_SIGNAL(pressed()), + this, TQ_SLOT(slotCornerButtonPressed())); - connect(d->im, TQT_SIGNAL(signalModified()), - this, TQT_SLOT(slotModified())); + connect(d->im, TQ_SIGNAL(signalModified()), + this, TQ_SLOT(slotModified())); - connect(d->im, TQT_SIGNAL(signalUndoStateChanged(bool, bool, bool)), - this, TQT_SIGNAL(signalUndoStateChanged(bool, bool, bool))); + connect(d->im, TQ_SIGNAL(signalUndoStateChanged(bool, bool, bool)), + this, TQ_SIGNAL(signalUndoStateChanged(bool, bool, bool))); - connect(d->im, TQT_SIGNAL(signalLoadingStarted(const TQString&)), - this, TQT_SIGNAL(signalLoadingStarted(const TQString&))); + connect(d->im, TQ_SIGNAL(signalLoadingStarted(const TQString&)), + this, TQ_SIGNAL(signalLoadingStarted(const TQString&))); - connect(d->im, TQT_SIGNAL(signalImageLoaded(const TQString&, bool)), - this, TQT_SLOT(slotImageLoaded(const TQString&, bool))); + connect(d->im, TQ_SIGNAL(signalImageLoaded(const TQString&, bool)), + this, TQ_SLOT(slotImageLoaded(const TQString&, bool))); - connect(d->im, TQT_SIGNAL(signalImageSaved(const TQString&, bool)), - this, TQT_SLOT(slotImageSaved(const TQString&, bool))); + connect(d->im, TQ_SIGNAL(signalImageSaved(const TQString&, bool)), + this, TQ_SLOT(slotImageSaved(const TQString&, bool))); - connect(d->im, TQT_SIGNAL(signalLoadingProgress(const TQString&, float)), - this, TQT_SIGNAL(signalLoadingProgress(const TQString&, float))); + connect(d->im, TQ_SIGNAL(signalLoadingProgress(const TQString&, float)), + this, TQ_SIGNAL(signalLoadingProgress(const TQString&, float))); - connect(d->im, TQT_SIGNAL(signalSavingProgress(const TQString&, float)), - this, TQT_SIGNAL(signalSavingProgress(const TQString&, float))); + connect(d->im, TQ_SIGNAL(signalSavingProgress(const TQString&, float)), + this, TQ_SIGNAL(signalSavingProgress(const TQString&, float))); - connect(this, TQT_SIGNAL(signalSelected(bool)), - this, TQT_SLOT(slotSelected())); + connect(this, TQ_SIGNAL(signalSelected(bool)), + this, TQ_SLOT(slotSelected())); } Canvas::~Canvas() @@ -1349,11 +1349,11 @@ void Canvas::slotCornerButtonPressed() pan->setRegionSelection(r); pan->setMouseFocus(); - connect(pan, TQT_SIGNAL(signalSelectionMoved(const TQRect&, bool)), - this, TQT_SLOT(slotPanIconSelectionMoved(const TQRect&, bool))); + connect(pan, TQ_SIGNAL(signalSelectionMoved(const TQRect&, bool)), + this, TQ_SLOT(slotPanIconSelectionMoved(const TQRect&, bool))); - connect(pan, TQT_SIGNAL(signalHiden()), - this, TQT_SLOT(slotPanIconHiden())); + connect(pan, TQ_SIGNAL(signalHiden()), + this, TQ_SLOT(slotPanIconHiden())); TQPoint g = mapToGlobal(viewport()->pos()); g.setX(g.x()+ viewport()->size().width()); diff --git a/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp b/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp index 1d098b22..1403773f 100644 --- a/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp +++ b/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp @@ -144,14 +144,14 @@ ColorCorrectionDlg::ColorCorrectionDlg(TQWidget* parent, DImg *preview, // -------------------------------------------------------------------- - connect(currentProfInfo, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotCurrentProfInfo()) ); + connect(currentProfInfo, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotCurrentProfInfo()) ); - connect(embeddedProfInfo, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotEmbeddedProfInfo()) ); + connect(embeddedProfInfo, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotEmbeddedProfInfo()) ); - connect(this, TQT_SIGNAL(applyClicked()), - this, TQT_SLOT(slotApplyClicked())); + connect(this, TQ_SIGNAL(applyClicked()), + this, TQ_SLOT(slotApplyClicked())); } ColorCorrectionDlg::~ColorCorrectionDlg() diff --git a/digikam/utilities/imageeditor/canvas/dimginterface.cpp b/digikam/utilities/imageeditor/canvas/dimginterface.cpp index b7062bfb..8ce1c114 100644 --- a/digikam/utilities/imageeditor/canvas/dimginterface.cpp +++ b/digikam/utilities/imageeditor/canvas/dimginterface.cpp @@ -162,17 +162,17 @@ DImgInterface::DImgInterface() d->undoMan = new UndoManager(this); d->thread = new SharedLoadSaveThread; - connect( d->thread, TQT_SIGNAL(signalImageLoaded(const LoadingDescription &, const DImg&)), - this, TQT_SLOT(slotImageLoaded(const LoadingDescription &, const DImg&)) ); + connect( d->thread, TQ_SIGNAL(signalImageLoaded(const LoadingDescription &, const DImg&)), + this, TQ_SLOT(slotImageLoaded(const LoadingDescription &, const DImg&)) ); - connect( d->thread, TQT_SIGNAL(signalImageSaved(const TQString&, bool)), - this, TQT_SLOT(slotImageSaved(const TQString&, bool)) ); + connect( d->thread, TQ_SIGNAL(signalImageSaved(const TQString&, bool)), + this, TQ_SLOT(slotImageSaved(const TQString&, bool)) ); - connect( d->thread, TQT_SIGNAL(signalLoadingProgress(const LoadingDescription &, float)), - this, TQT_SLOT(slotLoadingProgress(const LoadingDescription &, float)) ); + connect( d->thread, TQ_SIGNAL(signalLoadingProgress(const LoadingDescription &, float)), + this, TQ_SLOT(slotLoadingProgress(const LoadingDescription &, float)) ); - connect( d->thread, TQT_SIGNAL(signalSavingProgress(const TQString&, float)), - this, TQT_SLOT(slotSavingProgress(const TQString&, float)) ); + connect( d->thread, TQ_SIGNAL(signalSavingProgress(const TQString&, float)), + this, TQ_SLOT(slotSavingProgress(const TQString&, float)) ); } DImgInterface::~DImgInterface() @@ -201,11 +201,11 @@ void DImgInterface::load(const TQString& filename, IOFileSettingsContainer *iofi RawImport *rawImport = new RawImport(KURL(d->filename), this); EditorToolIface::editorToolIface()->loadTool(rawImport); - connect(rawImport, TQT_SIGNAL(okClicked()), - this, TQT_SLOT(slotUseRawImportSettings())); + connect(rawImport, TQ_SIGNAL(okClicked()), + this, TQ_SLOT(slotUseRawImportSettings())); - connect(rawImport, TQT_SIGNAL(cancelClicked()), - this, TQT_SLOT(slotUseDefaultSettings())); + connect(rawImport, TQ_SIGNAL(cancelClicked()), + this, TQ_SLOT(slotUseDefaultSettings())); } else { diff --git a/digikam/utilities/imageeditor/canvas/imageplugin.cpp b/digikam/utilities/imageeditor/canvas/imageplugin.cpp index c7ae00c7..b330cb5a 100644 --- a/digikam/utilities/imageeditor/canvas/imageplugin.cpp +++ b/digikam/utilities/imageeditor/canvas/imageplugin.cpp @@ -53,11 +53,11 @@ void ImagePlugin::loadTool(EditorTool* tool) { EditorToolIface::editorToolIface()->loadTool(tool); - connect(tool, TQT_SIGNAL(okClicked()), - this, TQT_SLOT(slotToolDone())); + connect(tool, TQ_SIGNAL(okClicked()), + this, TQ_SLOT(slotToolDone())); - connect(tool, TQT_SIGNAL(cancelClicked()), - this, TQT_SLOT(slotToolDone())); + connect(tool, TQ_SIGNAL(cancelClicked()), + this, TQ_SLOT(slotToolDone())); } void ImagePlugin::slotToolDone() diff --git a/digikam/utilities/imageeditor/editor/editorstackview.cpp b/digikam/utilities/imageeditor/editor/editorstackview.cpp index 27fc2ef0..61550300 100644 --- a/digikam/utilities/imageeditor/editor/editorstackview.cpp +++ b/digikam/utilities/imageeditor/editor/editorstackview.cpp @@ -66,8 +66,8 @@ void EditorStackView::setCanvas(Canvas* canvas) d->canvas = canvas; addWidget(d->canvas, CanvasMode); - connect(d->canvas, TQT_SIGNAL(signalZoomChanged(double)), - this, TQT_SLOT(slotZoomChanged(double))); + connect(d->canvas, TQ_SIGNAL(signalZoomChanged(double)), + this, TQ_SLOT(slotZoomChanged(double))); } Canvas* EditorStackView::canvas() const @@ -88,8 +88,8 @@ void EditorStackView::setToolView(TQWidget* view) PreviewWidget *preview = previewWidget(); if (preview) { - connect(preview, TQT_SIGNAL(signalZoomFactorChanged(double)), - this, TQT_SLOT(slotZoomChanged(double))); + connect(preview, TQ_SIGNAL(signalZoomFactorChanged(double)), + this, TQ_SLOT(slotZoomChanged(double))); } } diff --git a/digikam/utilities/imageeditor/editor/editortool.cpp b/digikam/utilities/imageeditor/editor/editortool.cpp index 55c17890..b840e673 100644 --- a/digikam/utilities/imageeditor/editor/editortool.cpp +++ b/digikam/utilities/imageeditor/editor/editortool.cpp @@ -75,8 +75,8 @@ EditorTool::EditorTool(TQObject *parent) d = new EditorToolPriv; d->timer = new TQTimer(this); - connect(d->timer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotEffect())); + connect(d->timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotEffect())); } EditorTool::~EditorTool() @@ -86,7 +86,7 @@ EditorTool::~EditorTool() void EditorTool::init() { - TQTimer::singleShot(0, this, TQT_SLOT(slotInit())); + TQTimer::singleShot(0, this, TQ_SLOT(slotInit())); } TQPixmap EditorTool::toolIcon() const @@ -131,23 +131,23 @@ void EditorTool::setToolSettings(EditorToolSettings *settings) { d->settings = settings; - connect(d->settings, TQT_SIGNAL(signalOkClicked()), - this, TQT_SLOT(slotOk())); + connect(d->settings, TQ_SIGNAL(signalOkClicked()), + this, TQ_SLOT(slotOk())); - connect(d->settings, TQT_SIGNAL(signalCancelClicked()), - this, TQT_SLOT(slotCancel())); + connect(d->settings, TQ_SIGNAL(signalCancelClicked()), + this, TQ_SLOT(slotCancel())); - connect(d->settings, TQT_SIGNAL(signalDefaultClicked()), - this, TQT_SLOT(slotResetSettings())); + connect(d->settings, TQ_SIGNAL(signalDefaultClicked()), + this, TQ_SLOT(slotResetSettings())); - connect(d->settings, TQT_SIGNAL(signalSaveAsClicked()), - this, TQT_SLOT(slotSaveAsSettings())); + connect(d->settings, TQ_SIGNAL(signalSaveAsClicked()), + this, TQ_SLOT(slotSaveAsSettings())); - connect(d->settings, TQT_SIGNAL(signalLoadClicked()), - this, TQT_SLOT(slotLoadSettings())); + connect(d->settings, TQ_SIGNAL(signalLoadClicked()), + this, TQ_SLOT(slotLoadSettings())); - connect(d->settings, TQT_SIGNAL(signalTryClicked()), - this, TQT_SLOT(slotEffect())); + connect(d->settings, TQ_SIGNAL(signalTryClicked()), + this, TQ_SLOT(slotEffect())); // Will be unblocked in slotInit() // This will prevent signals emit during tool init. @@ -279,7 +279,7 @@ void EditorToolThreaded::slotResized() filter()->stopComputation(); } - TQTimer::singleShot(0, this, TQT_SLOT(slotEffect())); + TQTimer::singleShot(0, this, TQ_SLOT(slotEffect())); } void EditorToolThreaded::slotAbort() @@ -368,8 +368,8 @@ void EditorToolThreaded::setToolView(TQWidget *view) if (dynamic_cast<ImageWidget*>(view) || dynamic_cast<ImageGuideWidget*>(view) || dynamic_cast<ImagePanelWidget*>(view)) { - connect(view, TQT_SIGNAL(signalResized()), - this, TQT_SLOT(slotResized())); + connect(view, TQ_SIGNAL(signalResized()), + this, TQ_SLOT(slotResized())); } } diff --git a/digikam/utilities/imageeditor/editor/editortoolsettings.cpp b/digikam/utilities/imageeditor/editor/editortoolsettings.cpp index a9296847..3ac45ccf 100644 --- a/digikam/utilities/imageeditor/editor/editortoolsettings.cpp +++ b/digikam/utilities/imageeditor/editor/editortoolsettings.cpp @@ -217,29 +217,29 @@ EditorToolSettings::EditorToolSettings(int buttonMask, int toolMask, TQWidget *p // --------------------------------------------------------------- - connect(d->okBtn, TQT_SIGNAL(clicked()), - this, TQT_SIGNAL(signalOkClicked())); + connect(d->okBtn, TQ_SIGNAL(clicked()), + this, TQ_SIGNAL(signalOkClicked())); - connect(d->cancelBtn, TQT_SIGNAL(clicked()), - this, TQT_SIGNAL(signalCancelClicked())); + connect(d->cancelBtn, TQ_SIGNAL(clicked()), + this, TQ_SIGNAL(signalCancelClicked())); - connect(d->tryBtn, TQT_SIGNAL(clicked()), - this, TQT_SIGNAL(signalTryClicked())); + connect(d->tryBtn, TQ_SIGNAL(clicked()), + this, TQ_SIGNAL(signalTryClicked())); - connect(d->defaultBtn, TQT_SIGNAL(clicked()), - this, TQT_SIGNAL(signalDefaultClicked())); + connect(d->defaultBtn, TQ_SIGNAL(clicked()), + this, TQ_SIGNAL(signalDefaultClicked())); - connect(d->saveAsBtn, TQT_SIGNAL(clicked()), - this, TQT_SIGNAL(signalSaveAsClicked())); + connect(d->saveAsBtn, TQ_SIGNAL(clicked()), + this, TQ_SIGNAL(signalSaveAsClicked())); - connect(d->loadBtn, TQT_SIGNAL(clicked()), - this, TQT_SIGNAL(signalLoadClicked())); + connect(d->loadBtn, TQ_SIGNAL(clicked()), + this, TQ_SIGNAL(signalLoadClicked())); - connect(d->guideColorBt, TQT_SIGNAL(changed(const TQColor&)), - this, TQT_SIGNAL(signalColorGuideChanged())); + connect(d->guideColorBt, TQ_SIGNAL(changed(const TQColor&)), + this, TQ_SIGNAL(signalColorGuideChanged())); - connect(d->guideSize, TQT_SIGNAL(valueChanged(int)), - this, TQT_SIGNAL(signalColorGuideChanged())); + connect(d->guideSize, TQ_SIGNAL(valueChanged(int)), + this, TQ_SIGNAL(signalColorGuideChanged())); } EditorToolSettings::~EditorToolSettings() diff --git a/digikam/utilities/imageeditor/editor/editorwindow.cpp b/digikam/utilities/imageeditor/editor/editorwindow.cpp index c901d61c..eed7cfea 100644 --- a/digikam/utilities/imageeditor/editor/editorwindow.cpp +++ b/digikam/utilities/imageeditor/editor/editorwindow.cpp @@ -183,104 +183,104 @@ void EditorWindow::setupStandardConnections() { // -- Canvas connections ------------------------------------------------ - connect(m_canvas, TQT_SIGNAL(signalToggleOffFitToWindow()), - this, TQT_SLOT(slotToggleOffFitToWindow())); + connect(m_canvas, TQ_SIGNAL(signalToggleOffFitToWindow()), + this, TQ_SLOT(slotToggleOffFitToWindow())); - connect(m_canvas, TQT_SIGNAL(signalShowNextImage()), - this, TQT_SLOT(slotForward())); + connect(m_canvas, TQ_SIGNAL(signalShowNextImage()), + this, TQ_SLOT(slotForward())); - connect(m_canvas, TQT_SIGNAL(signalShowPrevImage()), - this, TQT_SLOT(slotBackward())); + connect(m_canvas, TQ_SIGNAL(signalShowPrevImage()), + this, TQ_SLOT(slotBackward())); - connect(m_canvas, TQT_SIGNAL(signalRightButtonClicked()), - this, TQT_SLOT(slotContextMenu())); + connect(m_canvas, TQ_SIGNAL(signalRightButtonClicked()), + this, TQ_SLOT(slotContextMenu())); - connect(m_stackView, TQT_SIGNAL(signalZoomChanged(bool, bool, double)), - this, TQT_SLOT(slotZoomChanged(bool, bool, double))); + connect(m_stackView, TQ_SIGNAL(signalZoomChanged(bool, bool, double)), + this, TQ_SLOT(slotZoomChanged(bool, bool, double))); - connect(m_canvas, TQT_SIGNAL(signalChanged()), - this, TQT_SLOT(slotChanged())); + connect(m_canvas, TQ_SIGNAL(signalChanged()), + this, TQ_SLOT(slotChanged())); - connect(m_canvas, TQT_SIGNAL(signalUndoStateChanged(bool, bool, bool)), - this, TQT_SLOT(slotUndoStateChanged(bool, bool, bool))); + connect(m_canvas, TQ_SIGNAL(signalUndoStateChanged(bool, bool, bool)), + this, TQ_SLOT(slotUndoStateChanged(bool, bool, bool))); - connect(m_canvas, TQT_SIGNAL(signalSelected(bool)), - this, TQT_SLOT(slotSelected(bool))); + connect(m_canvas, TQ_SIGNAL(signalSelected(bool)), + this, TQ_SLOT(slotSelected(bool))); - connect(m_canvas, TQT_SIGNAL(signalPrepareToLoad()), - this, TQT_SLOT(slotPrepareToLoad())); + connect(m_canvas, TQ_SIGNAL(signalPrepareToLoad()), + this, TQ_SLOT(slotPrepareToLoad())); - connect(m_canvas, TQT_SIGNAL(signalLoadingStarted(const TQString &)), - this, TQT_SLOT(slotLoadingStarted(const TQString &))); + connect(m_canvas, TQ_SIGNAL(signalLoadingStarted(const TQString &)), + this, TQ_SLOT(slotLoadingStarted(const TQString &))); - connect(m_canvas, TQT_SIGNAL(signalLoadingFinished(const TQString &, bool)), - this, TQT_SLOT(slotLoadingFinished(const TQString &, bool))); + connect(m_canvas, TQ_SIGNAL(signalLoadingFinished(const TQString &, bool)), + this, TQ_SLOT(slotLoadingFinished(const TQString &, bool))); - connect(m_canvas, TQT_SIGNAL(signalLoadingProgress(const TQString &, float)), - this, TQT_SLOT(slotLoadingProgress(const TQString &, float))); + connect(m_canvas, TQ_SIGNAL(signalLoadingProgress(const TQString &, float)), + this, TQ_SLOT(slotLoadingProgress(const TQString &, float))); - connect(m_canvas, TQT_SIGNAL(signalSavingStarted(const TQString&)), - this, TQT_SLOT(slotSavingStarted(const TQString&))); + connect(m_canvas, TQ_SIGNAL(signalSavingStarted(const TQString&)), + this, TQ_SLOT(slotSavingStarted(const TQString&))); - connect(m_canvas, TQT_SIGNAL(signalSavingFinished(const TQString&, bool)), - this, TQT_SLOT(slotSavingFinished(const TQString&, bool))); + connect(m_canvas, TQ_SIGNAL(signalSavingFinished(const TQString&, bool)), + this, TQ_SLOT(slotSavingFinished(const TQString&, bool))); - connect(m_canvas, TQT_SIGNAL(signalSavingProgress(const TQString&, float)), - this, TQT_SLOT(slotSavingProgress(const TQString&, float))); + connect(m_canvas, TQ_SIGNAL(signalSavingProgress(const TQString&, float)), + this, TQ_SLOT(slotSavingProgress(const TQString&, float))); - connect(m_canvas, TQT_SIGNAL(signalSelectionChanged(const TQRect&)), - this, TQT_SLOT(slotSelectionChanged(const TQRect&))); + connect(m_canvas, TQ_SIGNAL(signalSelectionChanged(const TQRect&)), + this, TQ_SLOT(slotSelectionChanged(const TQRect&))); // -- if rotating/flipping set the rotatedflipped flag to true ----------- - connect(d->rotateLeftAction, TQT_SIGNAL(activated()), - this, TQT_SLOT(slotRotatedOrFlipped())); + connect(d->rotateLeftAction, TQ_SIGNAL(activated()), + this, TQ_SLOT(slotRotatedOrFlipped())); - connect(d->rotateRightAction, TQT_SIGNAL(activated()), - this, TQT_SLOT(slotRotatedOrFlipped())); + connect(d->rotateRightAction, TQ_SIGNAL(activated()), + this, TQ_SLOT(slotRotatedOrFlipped())); - connect(d->flipHorizAction, TQT_SIGNAL(activated()), - this, TQT_SLOT(slotRotatedOrFlipped())); + connect(d->flipHorizAction, TQ_SIGNAL(activated()), + this, TQ_SLOT(slotRotatedOrFlipped())); - connect(d->flipVertAction, TQT_SIGNAL(activated()), - this, TQT_SLOT(slotRotatedOrFlipped())); + connect(d->flipVertAction, TQ_SIGNAL(activated()), + this, TQ_SLOT(slotRotatedOrFlipped())); // -- status bar connections -------------------------------------- - connect(m_nameLabel, TQT_SIGNAL(signalCancelButtonPressed()), - this, TQT_SLOT(slotNameLabelCancelButtonPressed())); + connect(m_nameLabel, TQ_SIGNAL(signalCancelButtonPressed()), + this, TQ_SLOT(slotNameLabelCancelButtonPressed())); - connect(m_nameLabel, TQT_SIGNAL(signalCancelButtonPressed()), - d->toolIface, TQT_SLOT(slotToolAborted())); + connect(m_nameLabel, TQ_SIGNAL(signalCancelButtonPressed()), + d->toolIface, TQ_SLOT(slotToolAborted())); } void EditorWindow::setupStandardActions() { // -- Standard 'File' menu actions --------------------------------------------- - m_backwardAction = KStdAction::back(this, TQT_SLOT(slotBackward()), + m_backwardAction = KStdAction::back(this, TQ_SLOT(slotBackward()), actionCollection(), "editorwindow_backward"); - m_forwardAction = KStdAction::forward(this, TQT_SLOT(slotForward()), + m_forwardAction = KStdAction::forward(this, TQ_SLOT(slotForward()), actionCollection(), "editorwindow_forward"); m_firstAction = new TDEAction(i18n("&First"), "go-first", TDEStdAccel::shortcut( TDEStdAccel::Home), - this, TQT_SLOT(slotFirst()), + this, TQ_SLOT(slotFirst()), actionCollection(), "editorwindow_first"); m_lastAction = new TDEAction(i18n("&Last"), "go-last", TDEStdAccel::shortcut( TDEStdAccel::End), - this, TQT_SLOT(slotLast()), + this, TQ_SLOT(slotLast()), actionCollection(), "editorwindow_last"); - m_saveAction = KStdAction::save(this, TQT_SLOT(slotSave()), + m_saveAction = KStdAction::save(this, TQ_SLOT(slotSave()), actionCollection(), "editorwindow_save"); - m_saveAsAction = KStdAction::saveAs(this, TQT_SLOT(slotSaveAs()), + m_saveAsAction = KStdAction::saveAs(this, TQ_SLOT(slotSaveAs()), actionCollection(), "editorwindow_saveas"); - m_revertAction = KStdAction::revert(this, TQT_SLOT(slotRevert()), + m_revertAction = KStdAction::revert(this, TQ_SLOT(slotRevert()), actionCollection(), "editorwindow_revert"); m_saveAction->setEnabled(false); @@ -289,46 +289,46 @@ void EditorWindow::setupStandardActions() d->filePrintAction = new TDEAction(i18n("Print Image..."), "document-print", CTRL+Key_P, - this, TQT_SLOT(slotFilePrint()), + this, TQ_SLOT(slotFilePrint()), actionCollection(), "editorwindow_print"); m_fileDeleteAction = new TDEAction(i18n("Move to Trash"), "edittrash", Key_Delete, - this, TQT_SLOT(slotDeleteCurrentItem()), + this, TQ_SLOT(slotDeleteCurrentItem()), actionCollection(), "editorwindow_delete"); - KStdAction::close(this, TQT_SLOT(close()), actionCollection(), "editorwindow_close"); + KStdAction::close(this, TQ_SLOT(close()), actionCollection(), "editorwindow_close"); // -- Standard 'Edit' menu actions --------------------------------------------- - d->copyAction = KStdAction::copy(m_canvas, TQT_SLOT(slotCopy()), + d->copyAction = KStdAction::copy(m_canvas, TQ_SLOT(slotCopy()), actionCollection(), "editorwindow_copy"); d->copyAction->setEnabled(false); m_undoAction = new TDEToolBarPopupAction(i18n("Undo"), "edit-undo", TDEStdAccel::shortcut(TDEStdAccel::Undo), - m_canvas, TQT_SLOT(slotUndo()), + m_canvas, TQ_SLOT(slotUndo()), actionCollection(), "editorwindow_undo"); - connect(m_undoAction->popupMenu(), TQT_SIGNAL(aboutToShow()), - this, TQT_SLOT(slotAboutToShowUndoMenu())); + connect(m_undoAction->popupMenu(), TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(slotAboutToShowUndoMenu())); - connect(m_undoAction->popupMenu(), TQT_SIGNAL(activated(int)), - m_canvas, TQT_SLOT(slotUndo(int))); + connect(m_undoAction->popupMenu(), TQ_SIGNAL(activated(int)), + m_canvas, TQ_SLOT(slotUndo(int))); m_undoAction->setEnabled(false); m_redoAction = new TDEToolBarPopupAction(i18n("Redo"), "edit-redo", TDEStdAccel::shortcut(TDEStdAccel::Redo), - m_canvas, TQT_SLOT(slotRedo()), + m_canvas, TQ_SLOT(slotRedo()), actionCollection(), "editorwindow_redo"); - connect(m_redoAction->popupMenu(), TQT_SIGNAL(aboutToShow()), - this, TQT_SLOT(slotAboutToShowRedoMenu())); + connect(m_redoAction->popupMenu(), TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(slotAboutToShowRedoMenu())); - connect(m_redoAction->popupMenu(), TQT_SIGNAL(activated(int)), - m_canvas, TQT_SLOT(slotRedo(int))); + connect(m_redoAction->popupMenu(), TQ_SIGNAL(activated(int)), + m_canvas, TQ_SLOT(slotRedo(int))); m_redoAction->setEnabled(false); @@ -336,7 +336,7 @@ void EditorWindow::setupStandardActions() 0, CTRL+Key_A, m_canvas, - TQT_SLOT(slotSelectAll()), + TQ_SLOT(slotSelectAll()), actionCollection(), "editorwindow_selectAll"); @@ -344,31 +344,31 @@ void EditorWindow::setupStandardActions() 0, CTRL+SHIFT+Key_A, m_canvas, - TQT_SLOT(slotSelectNone()), + TQ_SLOT(slotSelectNone()), actionCollection(), "editorwindow_selectNone"); // -- Standard 'View' menu actions --------------------------------------------- - d->zoomPlusAction = KStdAction::zoomIn(this, TQT_SLOT(slotIncreaseZoom()), + d->zoomPlusAction = KStdAction::zoomIn(this, TQ_SLOT(slotIncreaseZoom()), actionCollection(), "editorwindow_zoomplus"); - d->zoomMinusAction = KStdAction::zoomOut(this, TQT_SLOT(slotDecreaseZoom()), + d->zoomMinusAction = KStdAction::zoomOut(this, TQ_SLOT(slotDecreaseZoom()), actionCollection(), "editorwindow_zoomminus"); d->zoomTo100percents = new TDEAction(i18n("Zoom to 100%"), "zoom-original", ALT+CTRL+Key_0, // NOTE: Photoshop 7 use ALT+CTRL+0. - this, TQT_SLOT(slotZoomTo100Percents()), + this, TQ_SLOT(slotZoomTo100Percents()), actionCollection(), "editorwindow_zoomto100percents"); d->zoomFitToWindowAction = new TDEToggleAction(i18n("Fit to &Window"), "view_fit_window", CTRL+SHIFT+Key_E, // NOTE: Gimp 2 use CTRL+SHIFT+E. - this, TQT_SLOT(slotToggleFitToWindow()), + this, TQ_SLOT(slotToggleFitToWindow()), actionCollection(), "editorwindow_zoomfit2window"); d->zoomFitToSelectAction = new TDEAction(i18n("Fit to &Selection"), "zoom-fit-best", - ALT+CTRL+Key_S, this, TQT_SLOT(slotFitToSelect()), + ALT+CTRL+Key_S, this, TQ_SLOT(slotFitToSelect()), actionCollection(), "editorwindow_zoomfit2select"); d->zoomFitToSelectAction->setEnabled(false); d->zoomFitToSelectAction->setWhatsThis(i18n("This option can be used to zoom the image to the " @@ -394,47 +394,47 @@ void EditorWindow::setupStandardActions() d->zoomCombo->insertItem(TQString("800%")); d->zoomCombo->insertItem(TQString("1200%")); - connect(d->zoomCombo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotZoomSelected()) ); + connect(d->zoomCombo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotZoomSelected()) ); - connect(d->zoomCombo, TQT_SIGNAL(returnPressed(const TQString&)), - this, TQT_SLOT(slotZoomTextChanged(const TQString &)) ); + connect(d->zoomCombo, TQ_SIGNAL(returnPressed(const TQString&)), + this, TQ_SLOT(slotZoomTextChanged(const TQString &)) ); // Do not use std KDE action for full screen because action text is too large for app. toolbar. m_fullScreenAction = new TDEToggleAction(i18n("Full Screen"), "view-fullscreen", CTRL+SHIFT+Key_F, this, - TQT_SLOT(slotToggleFullScreen()), + TQ_SLOT(slotToggleFullScreen()), actionCollection(), "editorwindow_fullscreen"); m_fullScreenAction->setWhatsThis(i18n("Toggle the window to full screen mode")); d->slideShowAction = new TDEAction(i18n("Slideshow"), "slideshow", Key_F9, - this, TQT_SLOT(slotToggleSlideShow()), + this, TQ_SLOT(slotToggleSlideShow()), actionCollection(),"editorwindow_slideshow"); d->viewUnderExpoAction = new TDEToggleAction(i18n("Under-Exposure Indicator"), "underexposure", Key_F10, this, - TQT_SLOT(slotToggleUnderExposureIndicator()), + TQ_SLOT(slotToggleUnderExposureIndicator()), actionCollection(),"editorwindow_underexposure"); d->viewOverExpoAction = new TDEToggleAction(i18n("Over-Exposure Indicator"), "overexposure", Key_F11, this, - TQT_SLOT(slotToggleOverExposureIndicator()), + TQ_SLOT(slotToggleOverExposureIndicator()), actionCollection(),"editorwindow_overexposure"); d->viewCMViewAction = new TDEToggleAction(i18n("Color Managed View"), "tv", Key_F12, this, - TQT_SLOT(slotToggleColorManagedView()), + TQ_SLOT(slotToggleColorManagedView()), actionCollection(),"editorwindow_cmview"); // -- Standard 'Transform' menu actions --------------------------------------------- d->resizeAction = new TDEAction(i18n("&Resize..."), "resize_image", 0, - this, TQT_SLOT(slotResize()), + this, TQ_SLOT(slotResize()), actionCollection(), "editorwindow_resize"); d->cropAction = new TDEAction(i18n("Crop"), "crop", CTRL+Key_X, - m_canvas, TQT_SLOT(slotCrop()), + m_canvas, TQ_SLOT(slotCrop()), actionCollection(), "editorwindow_crop"); d->cropAction->setEnabled(false); @@ -444,12 +444,12 @@ void EditorWindow::setupStandardActions() // -- Standard 'Flip' menu actions --------------------------------------------- d->flipHorizAction = new TDEAction(i18n("Flip Horizontally"), "mirror", CTRL+Key_Asterisk, - m_canvas, TQT_SLOT(slotFlipHoriz()), + m_canvas, TQ_SLOT(slotFlipHoriz()), actionCollection(), "editorwindow_flip_horiz"); d->flipHorizAction->setEnabled(false); d->flipVertAction = new TDEAction(i18n("Flip Vertically"), "flip", CTRL+Key_Slash, - m_canvas, TQT_SLOT(slotFlipVert()), + m_canvas, TQ_SLOT(slotFlipVert()), actionCollection(), "editorwindow_flip_vert"); d->flipVertAction->setEnabled(false); @@ -457,47 +457,47 @@ void EditorWindow::setupStandardActions() d->rotateLeftAction = new TDEAction(i18n("Rotate Left"), "object-rotate-left", SHIFT+CTRL+Key_Left, - m_canvas, TQT_SLOT(slotRotate270()), + m_canvas, TQ_SLOT(slotRotate270()), actionCollection(), "editorwindow_rotate_left"); d->rotateLeftAction->setEnabled(false); d->rotateRightAction = new TDEAction(i18n("Rotate Right"), "object-rotate-right", SHIFT+CTRL+Key_Right, - m_canvas, TQT_SLOT(slotRotate90()), + m_canvas, TQ_SLOT(slotRotate90()), actionCollection(), "editorwindow_rotate_right"); d->rotateRightAction->setEnabled(false); // -- Standard 'Configure' menu actions ---------------------------------------- - d->showMenuBarAction = KStdAction::showMenubar(this, TQT_SLOT(slotShowMenuBar()), actionCollection()); + d->showMenuBarAction = KStdAction::showMenubar(this, TQ_SLOT(slotShowMenuBar()), actionCollection()); - KStdAction::keyBindings(this, TQT_SLOT(slotEditKeys()), actionCollection()); - KStdAction::configureToolbars(this, TQT_SLOT(slotConfToolbars()), actionCollection()); - KStdAction::preferences(this, TQT_SLOT(slotSetup()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(slotEditKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(slotConfToolbars()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(slotSetup()), actionCollection()); // ----------------------------------------------------------------------------------------- m_themeMenuAction = new TDESelectAction(i18n("&Themes"), 0, actionCollection(), "theme_menu"); m_themeMenuAction->setItems(ThemeEngine::instance()->themeNames()); - connect(m_themeMenuAction, TQT_SIGNAL(activated(const TQString&)), - this, TQT_SLOT(slotChangeTheme(const TQString&))); + connect(m_themeMenuAction, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(slotChangeTheme(const TQString&))); - connect(ThemeEngine::instance(), TQT_SIGNAL(signalThemeChanged()), - this, TQT_SLOT(slotThemeChanged())); + connect(ThemeEngine::instance(), TQ_SIGNAL(signalThemeChanged()), + this, TQ_SLOT(slotThemeChanged())); // -- Standard 'Help' menu actions --------------------------------------------- d->donateMoneyAction = new TDEAction(i18n("Donate..."), 0, 0, - this, TQT_SLOT(slotDonateMoney()), + this, TQ_SLOT(slotDonateMoney()), actionCollection(), "editorwindow_donatemoney"); d->contributeAction = new TDEAction(i18n("Contribute..."), 0, 0, - this, TQT_SLOT(slotContribute()), + this, TQ_SLOT(slotContribute()), actionCollection(), "editorwindow_contribute"); @@ -505,7 +505,7 @@ void EditorWindow::setupStandardActions() "kdcraw", 0, this, - TQT_SLOT(slotRawCameraList()), + TQ_SLOT(slotRawCameraList()), actionCollection(), "editorwindow_rawcameralist"); } @@ -516,47 +516,47 @@ void EditorWindow::setupStandardAccelerators() d->accelerators->insert("Exit fullscreen", i18n("Exit Fullscreen mode"), i18n("Exit out of the fullscreen mode"), - Key_Escape, this, TQT_SLOT(slotEscapePressed()), + Key_Escape, this, TQ_SLOT(slotEscapePressed()), false, true); d->accelerators->insert("Next Image Key_Space", i18n("Next Image"), i18n("Load Next Image"), - Key_Space, this, TQT_SLOT(slotForward()), + Key_Space, this, TQ_SLOT(slotForward()), false, true); d->accelerators->insert("Previous Image SHIFT+Key_Space", i18n("Previous Image"), i18n("Load Previous Image"), - SHIFT+Key_Space, this, TQT_SLOT(slotBackward()), + SHIFT+Key_Space, this, TQ_SLOT(slotBackward()), false, true); d->accelerators->insert("Previous Image Key_Backspace", i18n("Previous Image"), i18n("Load Previous Image"), - Key_Backspace, this, TQT_SLOT(slotBackward()), + Key_Backspace, this, TQ_SLOT(slotBackward()), false, true); d->accelerators->insert("Next Image Key_Next", i18n("Next Image"), i18n("Load Next Image"), - Key_Next, this, TQT_SLOT(slotForward()), + Key_Next, this, TQ_SLOT(slotForward()), false, true); d->accelerators->insert("Previous Image Key_Prior", i18n("Previous Image"), i18n("Load Previous Image"), - Key_Prior, this, TQT_SLOT(slotBackward()), + Key_Prior, this, TQ_SLOT(slotBackward()), false, true); d->accelerators->insert("Zoom Plus Key_Plus", i18n("Zoom In"), i18n("Zoom in on Image"), - Key_Plus, this, TQT_SLOT(slotIncreaseZoom()), + Key_Plus, this, TQ_SLOT(slotIncreaseZoom()), false, true); d->accelerators->insert("Zoom Plus Key_Minus", i18n("Zoom Out"), i18n("Zoom out of Image"), - Key_Minus, this, TQT_SLOT(slotDecreaseZoom()), + Key_Minus, this, TQ_SLOT(slotDecreaseZoom()), false, true); d->accelerators->insert("Redo CTRL+Key_Y", i18n("Redo"), i18n("Redo Last action"), - CTRL+Key_Y, m_canvas, TQT_SLOT(slotRedo()), + CTRL+Key_Y, m_canvas, TQ_SLOT(slotRedo()), false, true); } @@ -594,14 +594,14 @@ void EditorWindow::setupStatusBar() d->cmViewIndicator->setToggleButton(true); statusBar()->addWidget(d->cmViewIndicator, 1); - connect(d->underExposureIndicator, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotToggleUnderExposureIndicator())); + connect(d->underExposureIndicator, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotToggleUnderExposureIndicator())); - connect(d->overExposureIndicator, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotToggleOverExposureIndicator())); + connect(d->overExposureIndicator, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotToggleOverExposureIndicator())); - connect(d->cmViewIndicator, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotToggleColorManagedView())); + connect(d->cmViewIndicator, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotToggleColorManagedView())); } void EditorWindow::printImage(KURL url) @@ -702,8 +702,8 @@ void EditorWindow::slotConfToolbars() saveMainWindowSettings(TDEGlobal::config(), "ImageViewer Settings"); KEditToolbar dlg(factory(), this); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), - this, TQT_SLOT(slotNewToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), + this, TQ_SLOT(slotNewToolbarConfig())); dlg.exec(); } @@ -795,7 +795,7 @@ void EditorWindow::plugActionAccel(TDEAction* action) action->whatsThis(), action->shortcut(), action, - TQT_SLOT(activate())); + TQ_SLOT(activate())); } void EditorWindow::unplugActionAccel(TDEAction* action) @@ -1543,11 +1543,11 @@ bool EditorWindow::startingSaveAs(const KURL& url) false, options); - connect(&imageFileSaveDialog, TQT_SIGNAL(filterChanged(const TQString &)), - options, TQT_SLOT(slotImageFileFormatChanged(const TQString &))); + connect(&imageFileSaveDialog, TQ_SIGNAL(filterChanged(const TQString &)), + options, TQ_SLOT(slotImageFileFormatChanged(const TQString &))); - connect(&imageFileSaveDialog, TQT_SIGNAL(fileSelected(const TQString &)), - options, TQT_SLOT(slotImageFileSelected(const TQString &))); + connect(&imageFileSaveDialog, TQ_SIGNAL(fileSelected(const TQString &)), + options, TQ_SLOT(slotImageFileSelected(const TQString &))); ImageDialogPreview *preview = new ImageDialogPreview(&imageFileSaveDialog); imageFileSaveDialog.setPreviewWidget(preview); diff --git a/digikam/utilities/imageeditor/editor/imagewindow.cpp b/digikam/utilities/imageeditor/editor/imagewindow.cpp index f4a5177d..2c10a6f6 100644 --- a/digikam/utilities/imageeditor/editor/imagewindow.cpp +++ b/digikam/utilities/imageeditor/editor/imagewindow.cpp @@ -253,22 +253,22 @@ void ImageWindow::setupConnections() // To toggle properly keyboards shortcuts from comments & tags side bar tab. - connect(d->rightSidebar, TQT_SIGNAL(signalNextItem()), - this, TQT_SLOT(slotForward())); + connect(d->rightSidebar, TQ_SIGNAL(signalNextItem()), + this, TQ_SLOT(slotForward())); - connect(d->rightSidebar, TQT_SIGNAL(signalPrevItem()), - this, TQT_SLOT(slotBackward())); + connect(d->rightSidebar, TQ_SIGNAL(signalPrevItem()), + this, TQ_SLOT(slotBackward())); - connect(this, TQT_SIGNAL(signalSelectionChanged( const TQRect &)), - d->rightSidebar, TQT_SLOT(slotImageSelectionChanged( const TQRect &))); + connect(this, TQ_SIGNAL(signalSelectionChanged( const TQRect &)), + d->rightSidebar, TQ_SLOT(slotImageSelectionChanged( const TQRect &))); - connect(this, TQT_SIGNAL(signalNoCurrentItem()), - d->rightSidebar, TQT_SLOT(slotNoCurrentItem())); + connect(this, TQ_SIGNAL(signalNoCurrentItem()), + d->rightSidebar, TQ_SLOT(slotNoCurrentItem())); ImageAttributesWatch *watch = ImageAttributesWatch::instance(); - connect(watch, TQT_SIGNAL(signalFileMetadataChanged(const KURL &)), - this, TQT_SLOT(slotFileMetadataChanged(const KURL &))); + connect(watch, TQ_SIGNAL(signalFileMetadataChanged(const KURL &)), + this, TQ_SLOT(slotFileMetadataChanged(const KURL &))); } void ImageWindow::setupUserArea() @@ -312,22 +312,22 @@ void ImageWindow::setupActions() // -- Rating actions --------------------------------------------------------------- d->star0 = new TDEAction(i18n("Assign Rating \"No Stars\""), CTRL+Key_0, - this, TQT_SLOT(slotAssignRatingNoStar()), + this, TQ_SLOT(slotAssignRatingNoStar()), actionCollection(), "imageview_ratenostar"); d->star1 = new TDEAction(i18n("Assign Rating \"One Star\""), CTRL+Key_1, - this, TQT_SLOT(slotAssignRatingOneStar()), + this, TQ_SLOT(slotAssignRatingOneStar()), actionCollection(), "imageview_rateonestar"); d->star2 = new TDEAction(i18n("Assign Rating \"Two Stars\""), CTRL+Key_2, - this, TQT_SLOT(slotAssignRatingTwoStar()), + this, TQ_SLOT(slotAssignRatingTwoStar()), actionCollection(), "imageview_ratetwostar"); d->star3 = new TDEAction(i18n("Assign Rating \"Three Stars\""), CTRL+Key_3, - this, TQT_SLOT(slotAssignRatingThreeStar()), + this, TQ_SLOT(slotAssignRatingThreeStar()), actionCollection(), "imageview_ratethreestar"); d->star4 = new TDEAction(i18n("Assign Rating \"Four Stars\""), CTRL+Key_4, - this, TQT_SLOT(slotAssignRatingFourStar()), + this, TQ_SLOT(slotAssignRatingFourStar()), actionCollection(), "imageview_ratefourstar"); d->star5 = new TDEAction(i18n("Assign Rating \"Five Stars\""), CTRL+Key_5, - this, TQT_SLOT(slotAssignRatingFiveStar()), + this, TQ_SLOT(slotAssignRatingFiveStar()), actionCollection(), "imageview_ratefivestar"); // -- Special Delete actions --------------------------------------------------------------- @@ -337,7 +337,7 @@ void ImageWindow::setupActions() "edit-delete", SHIFT+Key_Delete, this, - TQT_SLOT(slotDeleteCurrentItemPermanently()), + TQ_SLOT(slotDeleteCurrentItemPermanently()), actionCollection(), "image_delete_permanently"); @@ -347,7 +347,7 @@ void ImageWindow::setupActions() "edit-delete", 0, this, - TQT_SLOT(slotDeleteCurrentItemPermanentlyDirectly()), + TQ_SLOT(slotDeleteCurrentItemPermanentlyDirectly()), actionCollection(), "image_delete_permanently_directly"); @@ -355,7 +355,7 @@ void ImageWindow::setupActions() "edittrash", 0, this, - TQT_SLOT(slotTrashCurrentItemDirectly()), + TQ_SLOT(slotTrashCurrentItemDirectly()), actionCollection(), "image_trash_directly"); @@ -455,7 +455,7 @@ void ImageWindow::loadCurrentList(const TQString& caption, bool allowSaving) m_undoAction->setEnabled(false); m_redoAction->setEnabled(false); - TQTimer::singleShot(0, this, TQT_SLOT(slotLoadCurrent())); + TQTimer::singleShot(0, this, TQ_SLOT(slotLoadCurrent())); } void ImageWindow::slotLoadCurrent() @@ -568,11 +568,11 @@ void ImageWindow::slotContextMenu() m_contextMenu->insertItem(i18n("Assign Tag"), assignTagsMenu); int i = m_contextMenu->insertItem(i18n("Remove Tag"), removeTagsMenu); - connect(assignTagsMenu, TQT_SIGNAL(signalTagActivated(int)), - this, TQT_SLOT(slotAssignTag(int))); + connect(assignTagsMenu, TQ_SIGNAL(signalTagActivated(int)), + this, TQ_SLOT(slotAssignTag(int))); - connect(removeTagsMenu, TQT_SIGNAL(signalTagActivated(int)), - this, TQT_SLOT(slotRemoveTag(int))); + connect(removeTagsMenu, TQ_SIGNAL(signalTagActivated(int)), + this, TQ_SLOT(slotRemoveTag(int))); AlbumDB* db = AlbumManager::instance()->albumDB(); if (!db->hasTags( idList )) @@ -584,8 +584,8 @@ void ImageWindow::slotContextMenu() ratingMenu = new RatingPopupMenu(); - connect(ratingMenu, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotAssignRating(int))); + connect(ratingMenu, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotAssignRating(int))); m_contextMenu->insertItem(i18n("Assign Rating"), ratingMenu); } diff --git a/digikam/utilities/imageeditor/rawimport/rawimport.cpp b/digikam/utilities/imageeditor/rawimport/rawimport.cpp index 7bc1e7a5..a9254ce8 100644 --- a/digikam/utilities/imageeditor/rawimport/rawimport.cpp +++ b/digikam/utilities/imageeditor/rawimport/rawimport.cpp @@ -95,32 +95,32 @@ void RawImport::slotInit() // --------------------------------------------------------------- - connect(d->previewWidget, TQT_SIGNAL(signalLoadingStarted()), - this, TQT_SLOT(slotLoadingStarted())); + connect(d->previewWidget, TQ_SIGNAL(signalLoadingStarted()), + this, TQ_SLOT(slotLoadingStarted())); - connect(d->previewWidget, TQT_SIGNAL(signalDemosaicedImage()), - this, TQT_SLOT(slotDemosaicedImage())); + connect(d->previewWidget, TQ_SIGNAL(signalDemosaicedImage()), + this, TQ_SLOT(slotDemosaicedImage())); - connect(d->previewWidget, TQT_SIGNAL(signalLoadingStarted()), - this, TQT_SLOT(slotLoadingStarted())); + connect(d->previewWidget, TQ_SIGNAL(signalLoadingStarted()), + this, TQ_SLOT(slotLoadingStarted())); - connect(d->previewWidget, TQT_SIGNAL(signalLoadingProgress(float)), - this, TQT_SLOT(slotLoadingProgress(float))); + connect(d->previewWidget, TQ_SIGNAL(signalLoadingProgress(float)), + this, TQ_SLOT(slotLoadingProgress(float))); - connect(d->previewWidget, TQT_SIGNAL(signalLoadingFailed()), - this, TQT_SLOT(slotLoadingFailed())); + connect(d->previewWidget, TQ_SIGNAL(signalLoadingFailed()), + this, TQ_SLOT(slotLoadingFailed())); - connect(d->settingsBox, TQT_SIGNAL(signalDemosaicingChanged()), - this, TQT_SLOT(slotDemosaicingChanged())); + connect(d->settingsBox, TQ_SIGNAL(signalDemosaicingChanged()), + this, TQ_SLOT(slotDemosaicingChanged())); - connect(d->settingsBox, TQT_SIGNAL(signalPostProcessingChanged()), - this, TQT_SLOT(slotTimer())); + connect(d->settingsBox, TQ_SIGNAL(signalPostProcessingChanged()), + this, TQ_SLOT(slotTimer())); - connect(d->settingsBox, TQT_SIGNAL(signalUpdatePreview()), - this, TQT_SLOT(slotUpdatePreview())); + connect(d->settingsBox, TQ_SIGNAL(signalUpdatePreview()), + this, TQ_SLOT(slotUpdatePreview())); - connect(d->settingsBox, TQT_SIGNAL(signalAbortPreview()), - this, TQT_SLOT(slotAbort())); + connect(d->settingsBox, TQ_SIGNAL(signalAbortPreview()), + this, TQ_SLOT(slotAbort())); // --------------------------------------------------------------- diff --git a/digikam/utilities/imageeditor/rawimport/rawpreview.cpp b/digikam/utilities/imageeditor/rawimport/rawpreview.cpp index d4b409e6..3207ba14 100644 --- a/digikam/utilities/imageeditor/rawimport/rawpreview.cpp +++ b/digikam/utilities/imageeditor/rawimport/rawpreview.cpp @@ -103,17 +103,17 @@ RawPreview::RawPreview(const KURL& url, TQWidget *parent) // ------------------------------------------------------------ - connect(d->thread, TQT_SIGNAL(signalImageLoaded(const LoadingDescription&, const DImg&)), - this, TQT_SLOT(slotImageLoaded(const LoadingDescription&, const DImg&))); + connect(d->thread, TQ_SIGNAL(signalImageLoaded(const LoadingDescription&, const DImg&)), + this, TQ_SLOT(slotImageLoaded(const LoadingDescription&, const DImg&))); - connect(d->thread, TQT_SIGNAL(signalLoadingProgress(const LoadingDescription&, float)), - this, TQT_SLOT(slotLoadingProgress(const LoadingDescription&, float))); + connect(d->thread, TQ_SIGNAL(signalLoadingProgress(const LoadingDescription&, float)), + this, TQ_SLOT(slotLoadingProgress(const LoadingDescription&, float))); - connect(d->cornerButton, TQT_SIGNAL(pressed()), - this, TQT_SLOT(slotCornerButtonPressed())); + connect(d->cornerButton, TQ_SIGNAL(pressed()), + this, TQ_SLOT(slotCornerButtonPressed())); - connect(ThemeEngine::instance(), TQT_SIGNAL(signalThemeChanged()), - this, TQT_SLOT(slotThemeChanged())); + connect(ThemeEngine::instance(), TQ_SIGNAL(signalThemeChanged()), + this, TQ_SLOT(slotThemeChanged())); // ------------------------------------------------------------ @@ -224,11 +224,11 @@ void RawPreview::slotCornerButtonPressed() pan->setRegionSelection(r); pan->setMouseFocus(); - connect(pan, TQT_SIGNAL(signalSelectionMoved(const TQRect&, bool)), - this, TQT_SLOT(slotPanIconSelectionMoved(const TQRect&, bool))); + connect(pan, TQ_SIGNAL(signalSelectionMoved(const TQRect&, bool)), + this, TQ_SLOT(slotPanIconSelectionMoved(const TQRect&, bool))); - connect(pan, TQT_SIGNAL(signalHiden()), - this, TQT_SLOT(slotPanIconHiden())); + connect(pan, TQ_SIGNAL(signalHiden()), + this, TQ_SLOT(slotPanIconHiden())); TQPoint g = mapToGlobal(viewport()->pos()); g.setX(g.x()+ viewport()->size().width()); diff --git a/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp b/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp index b02a98e6..bf0ee67e 100644 --- a/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp +++ b/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp @@ -409,44 +409,44 @@ RawSettingsBox::RawSettingsBox(const KURL& url, TQWidget *parent) // --------------------------------------------------------------- - connect(d->channelCB, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotChannelChanged(int))); + connect(d->channelCB, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotChannelChanged(int))); - connect(d->scaleBG, TQT_SIGNAL(released(int)), - this, TQT_SLOT(slotScaleChanged(int))); + connect(d->scaleBG, TQ_SIGNAL(released(int)), + this, TQ_SLOT(slotScaleChanged(int))); - connect(d->colorsCB, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotColorsChanged(int))); + connect(d->colorsCB, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotColorsChanged(int))); - connect(d->resetCurveBtn, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotResetCurve())); + connect(d->resetCurveBtn, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotResetCurve())); - connect(d->updateBtn, TQT_SIGNAL(clicked()), - this, TQT_SIGNAL(signalUpdatePreview())); + connect(d->updateBtn, TQ_SIGNAL(clicked()), + this, TQ_SIGNAL(signalUpdatePreview())); - connect(d->abortBtn, TQT_SIGNAL(clicked()), - this, TQT_SIGNAL(signalAbortPreview())); + connect(d->abortBtn, TQ_SIGNAL(clicked()), + this, TQ_SIGNAL(signalAbortPreview())); - connect(d->decodingSettingsBox, TQT_SIGNAL(signalSettingsChanged()), - this, TQT_SIGNAL(signalDemosaicingChanged())); + connect(d->decodingSettingsBox, TQ_SIGNAL(signalSettingsChanged()), + this, TQ_SIGNAL(signalDemosaicingChanged())); - connect(d->curveWidget, TQT_SIGNAL(signalCurvesChanged()), - this, TQT_SIGNAL(signalPostProcessingChanged())); + connect(d->curveWidget, TQ_SIGNAL(signalCurvesChanged()), + this, TQ_SIGNAL(signalPostProcessingChanged())); - connect(d->brightnessInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SIGNAL(signalPostProcessingChanged())); + connect(d->brightnessInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SIGNAL(signalPostProcessingChanged())); - connect(d->contrastInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SIGNAL(signalPostProcessingChanged())); + connect(d->contrastInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SIGNAL(signalPostProcessingChanged())); - connect(d->gammaInput, TQT_SIGNAL(valueChanged(double)), - this, TQT_SIGNAL(signalPostProcessingChanged())); + connect(d->gammaInput, TQ_SIGNAL(valueChanged(double)), + this, TQ_SIGNAL(signalPostProcessingChanged())); - connect(d->saturationInput, TQT_SIGNAL(valueChanged(double)), - this, TQT_SIGNAL(signalPostProcessingChanged())); + connect(d->saturationInput, TQ_SIGNAL(valueChanged(double)), + this, TQ_SIGNAL(signalPostProcessingChanged())); - connect(d->fineExposureInput, TQT_SIGNAL(valueChanged(double)), - this, TQT_SIGNAL(signalPostProcessingChanged())); + connect(d->fineExposureInput, TQ_SIGNAL(valueChanged(double)), + this, TQ_SIGNAL(signalPostProcessingChanged())); } RawSettingsBox::~RawSettingsBox() diff --git a/digikam/utilities/imageeditor/tools/imageprint.cpp b/digikam/utilities/imageeditor/tools/imageprint.cpp index ece28f6c..5cab236b 100644 --- a/digikam/utilities/imageeditor/tools/imageprint.cpp +++ b/digikam/utilities/imageeditor/tools/imageprint.cpp @@ -460,26 +460,26 @@ ImageEditorPrintDialogPage::ImageEditorPrintDialogPage(DImg& image, TQWidget *pa // ------------------------------------------------------------------------ - connect( d->colorManaged, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotAlertSettings( bool )) ); + connect( d->colorManaged, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotAlertSettings( bool )) ); - connect( d->cmPreferences, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSetupDlg()) ); + connect( d->cmPreferences, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSetupDlg()) ); - connect( d->scale, TQT_SIGNAL( toggled( bool )), - this, TQT_SLOT( toggleScaling( bool ))); + connect( d->scale, TQ_SIGNAL( toggled( bool )), + this, TQ_SLOT( toggleScaling( bool ))); - connect(d->width, TQT_SIGNAL( valueChanged( double )), - this, TQT_SLOT( slotWidthChanged( double ))); + connect(d->width, TQ_SIGNAL( valueChanged( double )), + this, TQ_SLOT( slotWidthChanged( double ))); - connect(d->height, TQT_SIGNAL( valueChanged( double )), - this, TQT_SLOT( slotHeightChanged( double ))); + connect(d->height, TQ_SIGNAL( valueChanged( double )), + this, TQ_SLOT( slotHeightChanged( double ))); - connect(d->keepRatio, TQT_SIGNAL( toggled( bool )), - this, TQT_SLOT( toggleRatio( bool ))); + connect(d->keepRatio, TQ_SIGNAL( toggled( bool )), + this, TQ_SLOT( toggleRatio( bool ))); - connect(d->units, TQT_SIGNAL(activated(const TQString &)), - this, TQT_SLOT(slotUnitChanged(const TQString& ))); + connect(d->units, TQ_SIGNAL(activated(const TQString &)), + this, TQ_SLOT(slotUnitChanged(const TQString& ))); } ImageEditorPrintDialogPage::~ImageEditorPrintDialogPage() diff --git a/digikam/utilities/imageeditor/tools/imageresize.cpp b/digikam/utilities/imageeditor/tools/imageresize.cpp index cfefad86..c779b71e 100644 --- a/digikam/utilities/imageeditor/tools/imageresize.cpp +++ b/digikam/utilities/imageeditor/tools/imageresize.cpp @@ -255,27 +255,27 @@ ImageResize::ImageResize(TQWidget* parent) adjustSize(); disableResize(); - TQTimer::singleShot(0, this, TQT_SLOT(readUserSettings())); + TQTimer::singleShot(0, this, TQ_SLOT(readUserSettings())); // ------------------------------------------------------------- - connect(d->cimgLogoLabel, TQT_SIGNAL(leftClickedURL(const TQString&)), - this, TQT_SLOT(processCImgURL(const TQString&))); + connect(d->cimgLogoLabel, TQ_SIGNAL(leftClickedURL(const TQString&)), + this, TQ_SLOT(processCImgURL(const TQString&))); - connect(d->wInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotValuesChanged())); + connect(d->wInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotValuesChanged())); - connect(d->hInput, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotValuesChanged())); + connect(d->hInput, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotValuesChanged())); - connect(d->wpInput, TQT_SIGNAL(valueChanged(double)), - this, TQT_SLOT(slotValuesChanged())); + connect(d->wpInput, TQ_SIGNAL(valueChanged(double)), + this, TQ_SLOT(slotValuesChanged())); - connect(d->hpInput, TQT_SIGNAL(valueChanged(double)), - this, TQT_SLOT(slotValuesChanged())); + connect(d->hpInput, TQ_SIGNAL(valueChanged(double)), + this, TQ_SLOT(slotValuesChanged())); - connect(d->useGreycstorationBox, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotRestorationToggled(bool)) ); + connect(d->useGreycstorationBox, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotRestorationToggled(bool)) ); // ------------------------------------------------------------- diff --git a/digikam/utilities/lighttable/lighttablebar.cpp b/digikam/utilities/lighttable/lighttablebar.cpp index 7149018e..cfb935ab 100644 --- a/digikam/utilities/lighttable/lighttablebar.cpp +++ b/digikam/utilities/lighttable/lighttablebar.cpp @@ -120,14 +120,14 @@ LightTableBar::LightTableBar(TQWidget* parent, int orientation, bool exifRotate) ImageAttributesWatch *watch = ImageAttributesWatch::instance(); - connect(watch, TQT_SIGNAL(signalImageRatingChanged(TQ_LLONG)), - this, TQT_SLOT(slotImageRatingChanged(TQ_LLONG))); + connect(watch, TQ_SIGNAL(signalImageRatingChanged(TQ_LLONG)), + this, TQ_SLOT(slotImageRatingChanged(TQ_LLONG))); - connect(ThemeEngine::instance(), TQT_SIGNAL(signalThemeChanged()), - this, TQT_SLOT(slotThemeChanged())); + connect(ThemeEngine::instance(), TQ_SIGNAL(signalThemeChanged()), + this, TQ_SLOT(slotThemeChanged())); - connect(this, TQT_SIGNAL(signalItemSelected(ThumbBarItem*)), - this, TQT_SLOT(slotItemSelected(ThumbBarItem*))); + connect(this, TQ_SIGNAL(signalItemSelected(ThumbBarItem*)), + this, TQ_SLOT(slotItemSelected(ThumbBarItem*))); } LightTableBar::~LightTableBar() @@ -197,8 +197,8 @@ void LightTableBar::contentsMouseReleaseEvent(TQMouseEvent *e) ratingMenu = new RatingPopupMenu(); - connect(ratingMenu, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotAssignRating(int))); + connect(ratingMenu, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotAssignRating(int))); popmenu.insertItem(i18n("Assign Rating"), ratingMenu); } diff --git a/digikam/utilities/lighttable/lighttablepreview.cpp b/digikam/utilities/lighttable/lighttablepreview.cpp index 23d1cbc8..100427ec 100644 --- a/digikam/utilities/lighttable/lighttablepreview.cpp +++ b/digikam/utilities/lighttable/lighttablepreview.cpp @@ -150,14 +150,14 @@ LightTablePreview::LightTablePreview(TQWidget *parent) // ------------------------------------------------------------ - connect(d->cornerButton, TQT_SIGNAL(pressed()), - this, TQT_SLOT(slotCornerButtonPressed())); + connect(d->cornerButton, TQ_SIGNAL(pressed()), + this, TQ_SLOT(slotCornerButtonPressed())); - connect(this, TQT_SIGNAL(signalRightButtonClicked()), - this, TQT_SLOT(slotContextMenu())); + connect(this, TQ_SIGNAL(signalRightButtonClicked()), + this, TQ_SLOT(slotContextMenu())); - connect(ThemeEngine::instance(), TQT_SIGNAL(signalThemeChanged()), - this, TQT_SLOT(slotThemeChanged())); + connect(ThemeEngine::instance(), TQ_SIGNAL(signalThemeChanged()), + this, TQ_SLOT(slotThemeChanged())); // ------------------------------------------------------------ @@ -248,14 +248,14 @@ void LightTablePreview::setImagePath(const TQString& path) if (!d->previewThread) { d->previewThread = new PreviewLoadThread(); - connect(d->previewThread, TQT_SIGNAL(signalImageLoaded(const LoadingDescription &, const DImg &)), - this, TQT_SLOT(slotGotImagePreview(const LoadingDescription &, const DImg&))); + connect(d->previewThread, TQ_SIGNAL(signalImageLoaded(const LoadingDescription &, const DImg &)), + this, TQ_SLOT(slotGotImagePreview(const LoadingDescription &, const DImg&))); } if (!d->previewPreloadThread) { d->previewPreloadThread = new PreviewLoadThread(); - connect(d->previewPreloadThread, TQT_SIGNAL(signalImageLoaded(const LoadingDescription &, const DImg &)), - this, TQT_SLOT(slotNextPreload())); + connect(d->previewPreloadThread, TQ_SIGNAL(signalImageLoaded(const LoadingDescription &, const DImg &)), + this, TQ_SLOT(slotNextPreload())); } if (d->loadFullImageSize) @@ -405,11 +405,11 @@ void LightTablePreview::slotContextMenu() popmenu.insertItem(i18n("Assign Tag"), assignTagsMenu); int i = popmenu.insertItem(i18n("Remove Tag"), removeTagsMenu); - connect(assignTagsMenu, TQT_SIGNAL(signalTagActivated(int)), - this, TQT_SLOT(slotAssignTag(int))); + connect(assignTagsMenu, TQ_SIGNAL(signalTagActivated(int)), + this, TQ_SLOT(slotAssignTag(int))); - connect(removeTagsMenu, TQT_SIGNAL(signalTagActivated(int)), - this, TQT_SLOT(slotRemoveTag(int))); + connect(removeTagsMenu, TQ_SIGNAL(signalTagActivated(int)), + this, TQ_SLOT(slotRemoveTag(int))); AlbumDB* db = AlbumManager::instance()->albumDB(); if (!db->hasTags( idList )) @@ -421,8 +421,8 @@ void LightTablePreview::slotContextMenu() ratingMenu = new RatingPopupMenu(); - connect(ratingMenu, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotAssignRating(int))); + connect(ratingMenu, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotAssignRating(int))); popmenu.insertItem(i18n("Assign Rating"), ratingMenu); @@ -547,11 +547,11 @@ void LightTablePreview::slotCornerButtonPressed() pan->setRegionSelection(r); pan->setMouseFocus(); - connect(pan, TQT_SIGNAL(signalSelectionMoved(const TQRect&, bool)), - this, TQT_SLOT(slotPanIconSelectionMoved(const TQRect&, bool))); + connect(pan, TQ_SIGNAL(signalSelectionMoved(const TQRect&, bool)), + this, TQ_SLOT(slotPanIconSelectionMoved(const TQRect&, bool))); - connect(pan, TQT_SIGNAL(signalHiden()), - this, TQT_SLOT(slotPanIconHiden())); + connect(pan, TQ_SIGNAL(signalHiden()), + this, TQ_SLOT(slotPanIconHiden())); TQPoint g = mapToGlobal(viewport()->pos()); g.setX(g.x()+ viewport()->size().width()); diff --git a/digikam/utilities/lighttable/lighttableview.cpp b/digikam/utilities/lighttable/lighttableview.cpp index 70bd0007..51f45ab5 100644 --- a/digikam/utilities/lighttable/lighttableview.cpp +++ b/digikam/utilities/lighttable/lighttableview.cpp @@ -87,55 +87,55 @@ LightTableView::LightTableView(TQWidget *parent) // Left panel connections ------------------------------------------------ - connect(d->leftPreview, TQT_SIGNAL(signalZoomFactorChanged(double)), - this, TQT_SIGNAL(signalLeftZoomFactorChanged(double))); + connect(d->leftPreview, TQ_SIGNAL(signalZoomFactorChanged(double)), + this, TQ_SIGNAL(signalLeftZoomFactorChanged(double))); - connect(d->leftPreview, TQT_SIGNAL(contentsMoving(int, int)), - this, TQT_SLOT(slotLeftContentsMoved(int, int))); + connect(d->leftPreview, TQ_SIGNAL(contentsMoving(int, int)), + this, TQ_SLOT(slotLeftContentsMoved(int, int))); - connect(d->leftPreview, TQT_SIGNAL(signalSlideShow()), - this, TQT_SIGNAL(signalSlideShow())); + connect(d->leftPreview, TQ_SIGNAL(signalSlideShow()), + this, TQ_SIGNAL(signalSlideShow())); - connect(d->leftPreview, TQT_SIGNAL(signalDeleteItem(ImageInfo*)), - this, TQT_SIGNAL(signalDeleteItem(ImageInfo*))); + connect(d->leftPreview, TQ_SIGNAL(signalDeleteItem(ImageInfo*)), + this, TQ_SIGNAL(signalDeleteItem(ImageInfo*))); - connect(d->leftPreview, TQT_SIGNAL(signalEditItem(ImageInfo*)), - this, TQT_SIGNAL(signalEditItem(ImageInfo*))); + connect(d->leftPreview, TQ_SIGNAL(signalEditItem(ImageInfo*)), + this, TQ_SIGNAL(signalEditItem(ImageInfo*))); - connect(d->leftPreview, TQT_SIGNAL(signalDroppedItems(const ImageInfoList&)), - this, TQT_SIGNAL(signalLeftDroppedItems(const ImageInfoList&))); + connect(d->leftPreview, TQ_SIGNAL(signalDroppedItems(const ImageInfoList&)), + this, TQ_SIGNAL(signalLeftDroppedItems(const ImageInfoList&))); - connect(d->leftPreview, TQT_SIGNAL(signalPreviewLoaded(bool)), - this, TQT_SLOT(slotLeftPreviewLoaded(bool))); + connect(d->leftPreview, TQ_SIGNAL(signalPreviewLoaded(bool)), + this, TQ_SLOT(slotLeftPreviewLoaded(bool))); - connect(d->leftPreview, TQT_SIGNAL(signalLeftButtonClicked()), - this, TQT_SIGNAL(signalLeftPanelLeftButtonClicked())); + connect(d->leftPreview, TQ_SIGNAL(signalLeftButtonClicked()), + this, TQ_SIGNAL(signalLeftPanelLeftButtonClicked())); // Right panel connections ------------------------------------------------ - connect(d->rightPreview, TQT_SIGNAL(signalZoomFactorChanged(double)), - this, TQT_SIGNAL(signalRightZoomFactorChanged(double))); + connect(d->rightPreview, TQ_SIGNAL(signalZoomFactorChanged(double)), + this, TQ_SIGNAL(signalRightZoomFactorChanged(double))); - connect(d->rightPreview, TQT_SIGNAL(contentsMoving(int, int)), - this, TQT_SLOT(slotRightContentsMoved(int, int))); + connect(d->rightPreview, TQ_SIGNAL(contentsMoving(int, int)), + this, TQ_SLOT(slotRightContentsMoved(int, int))); - connect(d->rightPreview, TQT_SIGNAL(signalDeleteItem(ImageInfo*)), - this, TQT_SIGNAL(signalDeleteItem(ImageInfo*))); + connect(d->rightPreview, TQ_SIGNAL(signalDeleteItem(ImageInfo*)), + this, TQ_SIGNAL(signalDeleteItem(ImageInfo*))); - connect(d->rightPreview, TQT_SIGNAL(signalEditItem(ImageInfo*)), - this, TQT_SIGNAL(signalEditItem(ImageInfo*))); + connect(d->rightPreview, TQ_SIGNAL(signalEditItem(ImageInfo*)), + this, TQ_SIGNAL(signalEditItem(ImageInfo*))); - connect(d->rightPreview, TQT_SIGNAL(signalDroppedItems(const ImageInfoList&)), - this, TQT_SIGNAL(signalRightDroppedItems(const ImageInfoList&))); + connect(d->rightPreview, TQ_SIGNAL(signalDroppedItems(const ImageInfoList&)), + this, TQ_SIGNAL(signalRightDroppedItems(const ImageInfoList&))); - connect(d->rightPreview, TQT_SIGNAL(signalSlideShow()), - this, TQT_SIGNAL(signalSlideShow())); + connect(d->rightPreview, TQ_SIGNAL(signalSlideShow()), + this, TQ_SIGNAL(signalSlideShow())); - connect(d->rightPreview, TQT_SIGNAL(signalPreviewLoaded(bool)), - this, TQT_SLOT(slotRightPreviewLoaded(bool))); + connect(d->rightPreview, TQ_SIGNAL(signalPreviewLoaded(bool)), + this, TQ_SLOT(slotRightPreviewLoaded(bool))); - connect(d->rightPreview, TQT_SIGNAL(signalLeftButtonClicked()), - this, TQT_SIGNAL(signalRightPanelLeftButtonClicked())); + connect(d->rightPreview, TQ_SIGNAL(signalLeftButtonClicked()), + this, TQ_SIGNAL(signalRightPanelLeftButtonClicked())); } LightTableView::~LightTableView() @@ -324,21 +324,21 @@ void LightTableView::slotLeftContentsMoved(int x, int y) { if (d->syncPreview && !d->leftLoading) { - disconnect(d->rightPreview, TQT_SIGNAL(signalZoomFactorChanged(double)), - this, TQT_SIGNAL(signalRightZoomFactorChanged(double))); + disconnect(d->rightPreview, TQ_SIGNAL(signalZoomFactorChanged(double)), + this, TQ_SIGNAL(signalRightZoomFactorChanged(double))); - disconnect(d->rightPreview, TQT_SIGNAL(contentsMoving(int, int)), - this, TQT_SLOT(slotRightContentsMoved(int, int))); + disconnect(d->rightPreview, TQ_SIGNAL(contentsMoving(int, int)), + this, TQ_SLOT(slotRightContentsMoved(int, int))); setRightZoomFactor(d->leftPreview->zoomFactor()); emit signalRightZoomFactorChanged(d->leftPreview->zoomFactor()); d->rightPreview->setContentsPos(x, y); - connect(d->rightPreview, TQT_SIGNAL(signalZoomFactorChanged(double)), - this, TQT_SIGNAL(signalRightZoomFactorChanged(double))); + connect(d->rightPreview, TQ_SIGNAL(signalZoomFactorChanged(double)), + this, TQ_SIGNAL(signalRightZoomFactorChanged(double))); - connect(d->rightPreview, TQT_SIGNAL(contentsMoving(int, int)), - this, TQT_SLOT(slotRightContentsMoved(int, int))); + connect(d->rightPreview, TQ_SIGNAL(contentsMoving(int, int)), + this, TQ_SLOT(slotRightContentsMoved(int, int))); } } @@ -346,22 +346,22 @@ void LightTableView::slotRightContentsMoved(int x, int y) { if (d->syncPreview && !d->rightLoading) { - disconnect(d->leftPreview, TQT_SIGNAL(signalZoomFactorChanged(double)), - this, TQT_SIGNAL(signalLeftZoomFactorChanged(double))); + disconnect(d->leftPreview, TQ_SIGNAL(signalZoomFactorChanged(double)), + this, TQ_SIGNAL(signalLeftZoomFactorChanged(double))); - disconnect(d->leftPreview, TQT_SIGNAL(contentsMoving(int, int)), - this, TQT_SLOT(slotLeftContentsMoved(int, int))); + disconnect(d->leftPreview, TQ_SIGNAL(contentsMoving(int, int)), + this, TQ_SLOT(slotLeftContentsMoved(int, int))); setLeftZoomFactor(d->rightPreview->zoomFactor()); emit signalLeftZoomFactorChanged(d->rightPreview->zoomFactor()); d->leftPreview->setContentsPos(x, y); - connect(d->leftPreview, TQT_SIGNAL(signalZoomFactorChanged(double)), - this, TQT_SIGNAL(signalLeftZoomFactorChanged(double))); + connect(d->leftPreview, TQ_SIGNAL(signalZoomFactorChanged(double)), + this, TQ_SIGNAL(signalLeftZoomFactorChanged(double))); - connect(d->leftPreview, TQT_SIGNAL(contentsMoving(int, int)), - this, TQT_SLOT(slotLeftContentsMoved(int, int))); + connect(d->leftPreview, TQ_SIGNAL(contentsMoving(int, int)), + this, TQ_SLOT(slotLeftContentsMoved(int, int))); } } diff --git a/digikam/utilities/lighttable/lighttablewindow.cpp b/digikam/utilities/lighttable/lighttablewindow.cpp index 57e965f1..58409aef 100644 --- a/digikam/utilities/lighttable/lighttablewindow.cpp +++ b/digikam/utilities/lighttable/lighttablewindow.cpp @@ -236,210 +236,210 @@ void LightTableWindow::setupStatusBar() void LightTableWindow::setupConnections() { - connect(d->statusProgressBar, TQT_SIGNAL(signalCancelButtonPressed()), - this, TQT_SLOT(slotProgressBarCancelButtonPressed())); + connect(d->statusProgressBar, TQ_SIGNAL(signalCancelButtonPressed()), + this, TQ_SLOT(slotProgressBarCancelButtonPressed())); - connect(ThemeEngine::instance(), TQT_SIGNAL(signalThemeChanged()), - this, TQT_SLOT(slotThemeChanged())); + connect(ThemeEngine::instance(), TQ_SIGNAL(signalThemeChanged()), + this, TQ_SLOT(slotThemeChanged())); // Thumbs bar connections --------------------------------------- - connect(d->barView, TQT_SIGNAL(signalSetItemOnLeftPanel(ImageInfo*)), - this, TQT_SLOT(slotSetItemOnLeftPanel(ImageInfo*))); + connect(d->barView, TQ_SIGNAL(signalSetItemOnLeftPanel(ImageInfo*)), + this, TQ_SLOT(slotSetItemOnLeftPanel(ImageInfo*))); - connect(d->barView, TQT_SIGNAL(signalSetItemOnRightPanel(ImageInfo*)), - this, TQT_SLOT(slotSetItemOnRightPanel(ImageInfo*))); + connect(d->barView, TQ_SIGNAL(signalSetItemOnRightPanel(ImageInfo*)), + this, TQ_SLOT(slotSetItemOnRightPanel(ImageInfo*))); - connect(d->barView, TQT_SIGNAL(signalRemoveItem(ImageInfo*)), - this, TQT_SLOT(slotRemoveItem(ImageInfo*))); + connect(d->barView, TQ_SIGNAL(signalRemoveItem(ImageInfo*)), + this, TQ_SLOT(slotRemoveItem(ImageInfo*))); - connect(d->barView, TQT_SIGNAL(signalEditItem(ImageInfo*)), - this, TQT_SLOT(slotEditItem(ImageInfo*))); + connect(d->barView, TQ_SIGNAL(signalEditItem(ImageInfo*)), + this, TQ_SLOT(slotEditItem(ImageInfo*))); - connect(d->barView, TQT_SIGNAL(signalClearAll()), - this, TQT_SLOT(slotClearItemsList())); + connect(d->barView, TQ_SIGNAL(signalClearAll()), + this, TQ_SLOT(slotClearItemsList())); - connect(d->barView, TQT_SIGNAL(signalLightTableBarItemSelected(ImageInfo*)), - this, TQT_SLOT(slotItemSelected(ImageInfo*))); + connect(d->barView, TQ_SIGNAL(signalLightTableBarItemSelected(ImageInfo*)), + this, TQ_SLOT(slotItemSelected(ImageInfo*))); - connect(d->barView, TQT_SIGNAL(signalDroppedItems(const ImageInfoList&)), - this, TQT_SLOT(slotThumbbarDroppedItems(const ImageInfoList&))); + connect(d->barView, TQ_SIGNAL(signalDroppedItems(const ImageInfoList&)), + this, TQ_SLOT(slotThumbbarDroppedItems(const ImageInfoList&))); // Zoom bars connections ----------------------------------------- - connect(d->leftZoomBar, TQT_SIGNAL(signalZoomMinusClicked()), - d->previewView, TQT_SLOT(slotDecreaseLeftZoom())); + connect(d->leftZoomBar, TQ_SIGNAL(signalZoomMinusClicked()), + d->previewView, TQ_SLOT(slotDecreaseLeftZoom())); - connect(d->leftZoomBar, TQT_SIGNAL(signalZoomPlusClicked()), - d->previewView, TQT_SLOT(slotIncreaseLeftZoom())); + connect(d->leftZoomBar, TQ_SIGNAL(signalZoomPlusClicked()), + d->previewView, TQ_SLOT(slotIncreaseLeftZoom())); - connect(d->leftZoomBar, TQT_SIGNAL(signalZoomSliderChanged(int)), - d->previewView, TQT_SLOT(slotLeftZoomSliderChanged(int))); + connect(d->leftZoomBar, TQ_SIGNAL(signalZoomSliderChanged(int)), + d->previewView, TQ_SLOT(slotLeftZoomSliderChanged(int))); - connect(d->rightZoomBar, TQT_SIGNAL(signalZoomMinusClicked()), - d->previewView, TQT_SLOT(slotDecreaseRightZoom())); + connect(d->rightZoomBar, TQ_SIGNAL(signalZoomMinusClicked()), + d->previewView, TQ_SLOT(slotDecreaseRightZoom())); - connect(d->rightZoomBar, TQT_SIGNAL(signalZoomPlusClicked()), - d->previewView, TQT_SLOT(slotIncreaseRightZoom())); + connect(d->rightZoomBar, TQ_SIGNAL(signalZoomPlusClicked()), + d->previewView, TQ_SLOT(slotIncreaseRightZoom())); - connect(d->rightZoomBar, TQT_SIGNAL(signalZoomSliderChanged(int)), - d->previewView, TQT_SLOT(slotRightZoomSliderChanged(int))); + connect(d->rightZoomBar, TQ_SIGNAL(signalZoomSliderChanged(int)), + d->previewView, TQ_SLOT(slotRightZoomSliderChanged(int))); // View connections --------------------------------------------- - connect(d->previewView, TQT_SIGNAL(signalLeftZoomFactorChanged(double)), - this, TQT_SLOT(slotLeftZoomFactorChanged(double))); + connect(d->previewView, TQ_SIGNAL(signalLeftZoomFactorChanged(double)), + this, TQ_SLOT(slotLeftZoomFactorChanged(double))); - connect(d->previewView, TQT_SIGNAL(signalRightZoomFactorChanged(double)), - this, TQT_SLOT(slotRightZoomFactorChanged(double))); + connect(d->previewView, TQ_SIGNAL(signalRightZoomFactorChanged(double)), + this, TQ_SLOT(slotRightZoomFactorChanged(double))); - connect(d->previewView, TQT_SIGNAL(signalEditItem(ImageInfo*)), - this, TQT_SLOT(slotEditItem(ImageInfo*))); + connect(d->previewView, TQ_SIGNAL(signalEditItem(ImageInfo*)), + this, TQ_SLOT(slotEditItem(ImageInfo*))); - connect(d->previewView, TQT_SIGNAL(signalDeleteItem(ImageInfo*)), - this, TQT_SLOT(slotDeleteItem(ImageInfo*))); + connect(d->previewView, TQ_SIGNAL(signalDeleteItem(ImageInfo*)), + this, TQ_SLOT(slotDeleteItem(ImageInfo*))); - connect(d->previewView, TQT_SIGNAL(signalSlideShow()), - this, TQT_SLOT(slotToggleSlideShow())); + connect(d->previewView, TQ_SIGNAL(signalSlideShow()), + this, TQ_SLOT(slotToggleSlideShow())); - connect(d->previewView, TQT_SIGNAL(signalLeftDroppedItems(const ImageInfoList&)), - this, TQT_SLOT(slotLeftDroppedItems(const ImageInfoList&))); + connect(d->previewView, TQ_SIGNAL(signalLeftDroppedItems(const ImageInfoList&)), + this, TQ_SLOT(slotLeftDroppedItems(const ImageInfoList&))); - connect(d->previewView, TQT_SIGNAL(signalRightDroppedItems(const ImageInfoList&)), - this, TQT_SLOT(slotRightDroppedItems(const ImageInfoList&))); + connect(d->previewView, TQ_SIGNAL(signalRightDroppedItems(const ImageInfoList&)), + this, TQ_SLOT(slotRightDroppedItems(const ImageInfoList&))); - connect(d->previewView, TQT_SIGNAL(signalToggleOnSyncPreview(bool)), - this, TQT_SLOT(slotToggleOnSyncPreview(bool))); + connect(d->previewView, TQ_SIGNAL(signalToggleOnSyncPreview(bool)), + this, TQ_SLOT(slotToggleOnSyncPreview(bool))); - connect(d->previewView, TQT_SIGNAL(signalLeftPreviewLoaded(bool)), - this, TQT_SLOT(slotLeftPreviewLoaded(bool))); + connect(d->previewView, TQ_SIGNAL(signalLeftPreviewLoaded(bool)), + this, TQ_SLOT(slotLeftPreviewLoaded(bool))); - connect(d->previewView, TQT_SIGNAL(signalRightPreviewLoaded(bool)), - this, TQT_SLOT(slotRightPreviewLoaded(bool))); + connect(d->previewView, TQ_SIGNAL(signalRightPreviewLoaded(bool)), + this, TQ_SLOT(slotRightPreviewLoaded(bool))); - connect(d->previewView, TQT_SIGNAL(signalLeftPanelLeftButtonClicked()), - this, TQT_SLOT(slotLeftPanelLeftButtonClicked())); + connect(d->previewView, TQ_SIGNAL(signalLeftPanelLeftButtonClicked()), + this, TQ_SLOT(slotLeftPanelLeftButtonClicked())); - connect(d->previewView, TQT_SIGNAL(signalRightPanelLeftButtonClicked()), - this, TQT_SLOT(slotRightPanelLeftButtonClicked())); + connect(d->previewView, TQ_SIGNAL(signalRightPanelLeftButtonClicked()), + this, TQ_SLOT(slotRightPanelLeftButtonClicked())); } void LightTableWindow::setupActions() { // -- Standard 'File' menu actions --------------------------------------------- - d->backwardAction = KStdAction::back(this, TQT_SLOT(slotBackward()), + d->backwardAction = KStdAction::back(this, TQ_SLOT(slotBackward()), actionCollection(), "lighttable_backward"); d->backwardAction->setEnabled(false); - d->forwardAction = KStdAction::forward(this, TQT_SLOT(slotForward()), + d->forwardAction = KStdAction::forward(this, TQ_SLOT(slotForward()), actionCollection(), "lighttable_forward"); d->forwardAction->setEnabled(false); d->firstAction = new TDEAction(i18n("&First"), "go-first", TDEStdAccel::shortcut( TDEStdAccel::Home), - this, TQT_SLOT(slotFirst()), + this, TQ_SLOT(slotFirst()), actionCollection(), "lighttable_first"); d->firstAction->setEnabled(false); d->lastAction = new TDEAction(i18n("&Last"), "go-last", TDEStdAccel::shortcut( TDEStdAccel::End), - this, TQT_SLOT(slotLast()), + this, TQ_SLOT(slotLast()), actionCollection(), "lighttable_last"); d->lastAction->setEnabled(false); d->setItemLeftAction = new TDEAction(i18n("On Left"), "go-previous", - CTRL+Key_L, this, TQT_SLOT(slotSetItemLeft()), + CTRL+Key_L, this, TQ_SLOT(slotSetItemLeft()), actionCollection(), "lighttable_setitemleft"); d->setItemLeftAction->setEnabled(false); d->setItemLeftAction->setWhatsThis(i18n("Show item on left panel")); d->setItemRightAction = new TDEAction(i18n("On Right"), "go-next", - CTRL+Key_R, this, TQT_SLOT(slotSetItemRight()), + CTRL+Key_R, this, TQ_SLOT(slotSetItemRight()), actionCollection(), "lighttable_setitemright"); d->setItemRightAction->setEnabled(false); d->setItemRightAction->setWhatsThis(i18n("Show item on right panel")); d->editItemAction = new TDEAction(i18n("Edit"), "editimage", - Key_F4, this, TQT_SLOT(slotEditItem()), + Key_F4, this, TQ_SLOT(slotEditItem()), actionCollection(), "lighttable_edititem"); d->editItemAction->setEnabled(false); d->removeItemAction = new TDEAction(i18n("Remove item from LightTable"), "window-close", - CTRL+Key_K, this, TQT_SLOT(slotRemoveItem()), + CTRL+Key_K, this, TQ_SLOT(slotRemoveItem()), actionCollection(), "lighttable_removeitem"); d->removeItemAction->setEnabled(false); d->clearListAction = new TDEAction(i18n("Remove all items from LightTable"), "editshred", - CTRL+SHIFT+Key_K, this, TQT_SLOT(slotClearItemsList()), + CTRL+SHIFT+Key_K, this, TQ_SLOT(slotClearItemsList()), actionCollection(), "lighttable_clearlist"); d->clearListAction->setEnabled(false); d->fileDeleteAction = new TDEAction(i18n("Move to Trash"), "edittrash", Key_Delete, - this, TQT_SLOT(slotDeleteItem()), + this, TQ_SLOT(slotDeleteItem()), actionCollection(), "lighttable_filedelete"); d->fileDeleteAction->setEnabled(false); - KStdAction::close(this, TQT_SLOT(close()), actionCollection(), "lighttable_close"); + KStdAction::close(this, TQ_SLOT(close()), actionCollection(), "lighttable_close"); // -- Standard 'View' menu actions --------------------------------------------- d->syncPreviewAction = new TDEToggleAction(i18n("Synchronize"), "goto", CTRL+SHIFT+Key_Y, this, - TQT_SLOT(slotToggleSyncPreview()), + TQ_SLOT(slotToggleSyncPreview()), actionCollection(), "lighttable_syncpreview"); d->syncPreviewAction->setEnabled(false); d->syncPreviewAction->setWhatsThis(i18n("Synchronize preview from left and right panels")); d->navigateByPairAction = new TDEToggleAction(i18n("By Pair"), "preferences-system", CTRL+SHIFT+Key_P, this, - TQT_SLOT(slotToggleNavigateByPair()), + TQ_SLOT(slotToggleNavigateByPair()), actionCollection(), "lighttable_navigatebypair"); d->navigateByPairAction->setEnabled(false); d->navigateByPairAction->setWhatsThis(i18n("Navigate by pair with all items")); - d->zoomPlusAction = KStdAction::zoomIn(d->previewView, TQT_SLOT(slotIncreaseZoom()), + d->zoomPlusAction = KStdAction::zoomIn(d->previewView, TQ_SLOT(slotIncreaseZoom()), actionCollection(), "lighttable_zoomplus"); d->zoomPlusAction->setEnabled(false); - d->zoomMinusAction = KStdAction::zoomOut(d->previewView, TQT_SLOT(slotDecreaseZoom()), + d->zoomMinusAction = KStdAction::zoomOut(d->previewView, TQ_SLOT(slotDecreaseZoom()), actionCollection(), "lighttable_zoomminus"); d->zoomMinusAction->setEnabled(false); d->zoomTo100percents = new TDEAction(i18n("Zoom to 100%"), "zoom-original", ALT+CTRL+Key_0, // NOTE: Photoshop 7 use ALT+CTRL+0. - this, TQT_SLOT(slotZoomTo100Percents()), + this, TQ_SLOT(slotZoomTo100Percents()), actionCollection(), "lighttable_zoomto100percents"); d->zoomFitToWindowAction = new TDEAction(i18n("Fit to &Window"), "view_fit_window", - CTRL+SHIFT+Key_E, this, TQT_SLOT(slotFitToWindow()), + CTRL+SHIFT+Key_E, this, TQ_SLOT(slotFitToWindow()), actionCollection(), "lighttable_zoomfit2window"); // Do not use std KDE action for full screen because action text is too large for app. toolbar. d->fullScreenAction = new TDEToggleAction(i18n("Full Screen"), "view-fullscreen", CTRL+SHIFT+Key_F, this, - TQT_SLOT(slotToggleFullScreen()), + TQ_SLOT(slotToggleFullScreen()), actionCollection(), "lighttable_fullscreen"); d->fullScreenAction->setWhatsThis(i18n("Toggle the window to full screen mode")); d->slideShowAction = new TDEAction(i18n("Slideshow"), "slideshow", Key_F9, - this, TQT_SLOT(slotToggleSlideShow()), + this, TQ_SLOT(slotToggleSlideShow()), actionCollection(),"lighttable_slideshow"); // -- Standard 'Configure' menu actions ---------------------------------------- - d->showMenuBarAction = KStdAction::showMenubar(this, TQT_SLOT(slotShowMenuBar()), actionCollection()); + d->showMenuBarAction = KStdAction::showMenubar(this, TQ_SLOT(slotShowMenuBar()), actionCollection()); - KStdAction::keyBindings(this, TQT_SLOT(slotEditKeys()), actionCollection()); - KStdAction::configureToolbars(this, TQT_SLOT(slotConfToolbars()), actionCollection()); - KStdAction::preferences(this, TQT_SLOT(slotSetup()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(slotEditKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(slotConfToolbars()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(slotSetup()), actionCollection()); // ----------------------------------------------------------------------------------------- d->themeMenuAction = new TDESelectAction(i18n("&Themes"), 0, actionCollection(), "theme_menu"); - connect(d->themeMenuAction, TQT_SIGNAL(activated(const TQString&)), - this, TQT_SLOT(slotChangeTheme(const TQString&))); + connect(d->themeMenuAction, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(slotChangeTheme(const TQString&))); d->themeMenuAction->setItems(ThemeEngine::instance()->themeNames()); slotThemeChanged(); @@ -449,13 +449,13 @@ void LightTableWindow::setupActions() d->donateMoneyAction = new TDEAction(i18n("Donate..."), 0, 0, - this, TQT_SLOT(slotDonateMoney()), + this, TQ_SLOT(slotDonateMoney()), actionCollection(), "lighttable_donatemoney"); d->contributeAction = new TDEAction(i18n("Contribute..."), 0, 0, - this, TQT_SLOT(slotContribute()), + this, TQ_SLOT(slotContribute()), actionCollection(), "lighttable_contribute"); @@ -463,7 +463,7 @@ void LightTableWindow::setupActions() "kdcraw", 0, this, - TQT_SLOT(slotRawCameraList()), + TQ_SLOT(slotRawCameraList()), actionCollection(), "lighttable_rawcameralist"); @@ -477,22 +477,22 @@ void LightTableWindow::setupActions() // -- Rating actions --------------------------------------------------------------- d->star0 = new TDEAction(i18n("Assign Rating \"No Stars\""), CTRL+Key_0, - d->barView, TQT_SLOT(slotAssignRatingNoStar()), + d->barView, TQ_SLOT(slotAssignRatingNoStar()), actionCollection(), "lighttable_ratenostar"); d->star1 = new TDEAction(i18n("Assign Rating \"One Star\""), CTRL+Key_1, - d->barView, TQT_SLOT(slotAssignRatingOneStar()), + d->barView, TQ_SLOT(slotAssignRatingOneStar()), actionCollection(), "lighttable_rateonestar"); d->star2 = new TDEAction(i18n("Assign Rating \"Two Stars\""), CTRL+Key_2, - d->barView, TQT_SLOT(slotAssignRatingTwoStar()), + d->barView, TQ_SLOT(slotAssignRatingTwoStar()), actionCollection(), "lighttable_ratetwostar"); d->star3 = new TDEAction(i18n("Assign Rating \"Three Stars\""), CTRL+Key_3, - d->barView, TQT_SLOT(slotAssignRatingThreeStar()), + d->barView, TQ_SLOT(slotAssignRatingThreeStar()), actionCollection(), "lighttable_ratethreestar"); d->star4 = new TDEAction(i18n("Assign Rating \"Four Stars\""), CTRL+Key_4, - d->barView, TQT_SLOT(slotAssignRatingFourStar()), + d->barView, TQ_SLOT(slotAssignRatingFourStar()), actionCollection(), "lighttable_ratefourstar"); d->star5 = new TDEAction(i18n("Assign Rating \"Five Stars\""), CTRL+Key_5, - d->barView, TQT_SLOT(slotAssignRatingFiveStar()), + d->barView, TQ_SLOT(slotAssignRatingFiveStar()), actionCollection(), "lighttable_ratefivestar"); // --------------------------------------------------------------------------------- @@ -508,42 +508,42 @@ void LightTableWindow::setupAccelerators() d->accelerators->insert("Exit fullscreen", i18n("Exit Fullscreen mode"), i18n("Exit fullscreen viewing mode"), - Key_Escape, this, TQT_SLOT(slotEscapePressed()), + Key_Escape, this, TQ_SLOT(slotEscapePressed()), false, true); d->accelerators->insert("Next Image Key_Space", i18n("Next Image"), i18n("Load Next Image"), - Key_Space, this, TQT_SLOT(slotForward()), + Key_Space, this, TQ_SLOT(slotForward()), false, true); d->accelerators->insert("Previous Image SHIFT+Key_Space", i18n("Previous Image"), i18n("Load Previous Image"), - SHIFT+Key_Space, this, TQT_SLOT(slotBackward()), + SHIFT+Key_Space, this, TQ_SLOT(slotBackward()), false, true); d->accelerators->insert("Previous Image Key_Backspace", i18n("Previous Image"), i18n("Load Previous Image"), - Key_Backspace, this, TQT_SLOT(slotBackward()), + Key_Backspace, this, TQ_SLOT(slotBackward()), false, true); d->accelerators->insert("Next Image Key_Next", i18n("Next Image"), i18n("Load Next Image"), - Key_Next, this, TQT_SLOT(slotForward()), + Key_Next, this, TQ_SLOT(slotForward()), false, true); d->accelerators->insert("Previous Image Key_Prior", i18n("Previous Image"), i18n("Load Previous Image"), - Key_Prior, this, TQT_SLOT(slotBackward()), + Key_Prior, this, TQ_SLOT(slotBackward()), false, true); d->accelerators->insert("Zoom Plus Key_Plus", i18n("Zoom in"), i18n("Zoom in on image"), - Key_Plus, d->previewView, TQT_SLOT(slotIncreaseZoom()), + Key_Plus, d->previewView, TQ_SLOT(slotIncreaseZoom()), false, true); d->accelerators->insert("Zoom Plus Key_Minus", i18n("Zoom out"), i18n("Zoom out from image"), - Key_Minus, d->previewView, TQT_SLOT(slotDecreaseZoom()), + Key_Minus, d->previewView, TQ_SLOT(slotDecreaseZoom()), false, true); } @@ -1481,7 +1481,7 @@ void LightTableWindow::plugActionAccel(TDEAction* action) action->whatsThis(), action->shortcut(), action, - TQT_SLOT(activate())); + TQ_SLOT(activate())); } void LightTableWindow::unplugActionAccel(TDEAction* action) @@ -1511,8 +1511,8 @@ void LightTableWindow::slotConfToolbars() saveMainWindowSettings(TDEGlobal::config(), "LightTable Settings"); KEditToolbar dlg(factory(), this); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), - this, TQT_SLOT(slotNewToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), + this, TQ_SLOT(slotNewToolbarConfig())); dlg.exec(); } diff --git a/digikam/utilities/setup/cameraselection.cpp b/digikam/utilities/setup/cameraselection.cpp index e1bd9fe6..2cf2635c 100644 --- a/digikam/utilities/setup/cameraselection.cpp +++ b/digikam/utilities/setup/cameraselection.cpp @@ -218,29 +218,29 @@ CameraSelection::CameraSelection( TQWidget* parent ) // Connections -------------------------------------------------- - disconnect(link, TQT_SIGNAL(linkClicked(const TQString &)), - link, TQT_SLOT(openLink(const TQString &))); + disconnect(link, TQ_SIGNAL(linkClicked(const TQString &)), + link, TQ_SLOT(openLink(const TQString &))); - connect(link, TQT_SIGNAL(linkClicked(const TQString &)), - this, TQT_SLOT(slotUMSCameraLinkUsed())); + connect(link, TQ_SIGNAL(linkClicked(const TQString &)), + this, TQ_SLOT(slotUMSCameraLinkUsed())); - disconnect(link2, TQT_SIGNAL(linkClicked(const TQString &)), - link2, TQT_SLOT(openLink(const TQString &))); + disconnect(link2, TQ_SIGNAL(linkClicked(const TQString &)), + link2, TQ_SLOT(openLink(const TQString &))); - connect(link2, TQT_SIGNAL(linkClicked(const TQString &)), - this, TQT_SLOT(slotPTPCameraLinkUsed())); + connect(link2, TQ_SIGNAL(linkClicked(const TQString &)), + this, TQ_SLOT(slotPTPCameraLinkUsed())); - connect(d->listView, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - this, TQT_SLOT(slotSelectionChanged(TQListViewItem *))); + connect(d->listView, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + this, TQ_SLOT(slotSelectionChanged(TQListViewItem *))); - connect(d->portButtonGroup, TQT_SIGNAL(clicked(int)), - this, TQT_SLOT(slotPortChanged())); + connect(d->portButtonGroup, TQ_SIGNAL(clicked(int)), + this, TQ_SLOT(slotPortChanged())); - connect(this, TQT_SIGNAL(okClicked()), - this, TQT_SLOT(slotOkClicked())); + connect(this, TQ_SIGNAL(okClicked()), + this, TQ_SLOT(slotOkClicked())); - connect(d->searchBar, TQT_SIGNAL(signalTextChanged(const TQString&)), - this, TQT_SLOT(slotSearchTextChanged(const TQString&))); + connect(d->searchBar, TQ_SIGNAL(signalTextChanged(const TQString&)), + this, TQ_SLOT(slotSearchTextChanged(const TQString&))); // Initialize -------------------------------------------------- diff --git a/digikam/utilities/setup/setup.cpp b/digikam/utilities/setup/setup.cpp index 7450d608..bd47796f 100644 --- a/digikam/utilities/setup/setup.cpp +++ b/digikam/utilities/setup/setup.cpp @@ -199,8 +199,8 @@ Setup::Setup(TQWidget* parent, const char* name, Setup::Page page) BarIcon("misc", TDEIcon::SizeMedium)); d->miscPage = new SetupMisc(d->page_misc); - connect(this, TQT_SIGNAL(okClicked()), - this, TQT_SLOT(slotOkClicked()) ); + connect(this, TQ_SIGNAL(okClicked()), + this, TQ_SLOT(slotOkClicked()) ); if (page != LastPageUsed) showPage((int) page); diff --git a/digikam/utilities/setup/setupcamera.cpp b/digikam/utilities/setup/setupcamera.cpp index f6a3b7b7..1b8d0bb8 100644 --- a/digikam/utilities/setup/setupcamera.cpp +++ b/digikam/utilities/setup/setupcamera.cpp @@ -135,23 +135,23 @@ SetupCamera::SetupCamera( TQWidget* parent ) // ------------------------------------------------------------- - connect(gphotoLogoLabel, TQT_SIGNAL(leftClickedURL(const TQString&)), - this, TQT_SLOT(processGphotoURL(const TQString&))); + connect(gphotoLogoLabel, TQ_SIGNAL(leftClickedURL(const TQString&)), + this, TQ_SLOT(processGphotoURL(const TQString&))); - connect(d->listView, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotSelectionChanged())); + connect(d->listView, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotSelectionChanged())); - connect(d->addButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotAddCamera())); + connect(d->addButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotAddCamera())); - connect(d->removeButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotRemoveCamera())); + connect(d->removeButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRemoveCamera())); - connect(d->editButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotEditCamera())); + connect(d->editButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotEditCamera())); - connect(d->autoDetectButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotAutoDetectCamera())); + connect(d->autoDetectButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotAutoDetectCamera())); // Add cameras -------------------------------------- @@ -200,9 +200,9 @@ void SetupCamera::slotAddCamera() { CameraSelection *select = new CameraSelection; - connect(select, TQT_SIGNAL(signalOkClicked(const TQString&, const TQString&, + connect(select, TQ_SIGNAL(signalOkClicked(const TQString&, const TQString&, const TQString&, const TQString&)), - this, TQT_SLOT(slotAddedCamera(const TQString&, const TQString&, + this, TQ_SLOT(slotAddedCamera(const TQString&, const TQString&, const TQString&, const TQString&))); select->show(); @@ -224,9 +224,9 @@ void SetupCamera::slotEditCamera() CameraSelection *select = new CameraSelection; select->setCamera(item->text(0), item->text(1), item->text(2), item->text(3)); - connect(select, TQT_SIGNAL(signalOkClicked(const TQString&, const TQString&, + connect(select, TQ_SIGNAL(signalOkClicked(const TQString&, const TQString&, const TQString&, const TQString&)), - this, TQT_SLOT(slotEditedCamera(const TQString&, const TQString&, + this, TQ_SLOT(slotEditedCamera(const TQString&, const TQString&, const TQString&, const TQString&))); select->show(); diff --git a/digikam/utilities/setup/setupcollections.cpp b/digikam/utilities/setup/setupcollections.cpp index d63db17d..10a25c31 100644 --- a/digikam/utilities/setup/setupcollections.cpp +++ b/digikam/utilities/setup/setupcollections.cpp @@ -114,14 +114,14 @@ SetupCollections::SetupCollections(TQWidget* parent ) // -------------------------------------------------------- - connect(d->albumCollectionBox, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotCollectionSelectionChanged())); + connect(d->albumCollectionBox, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotCollectionSelectionChanged())); - connect(d->addCollectionButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotAddCollection())); + connect(d->addCollectionButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotAddCollection())); - connect(d->delCollectionButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotDelCollection())); + connect(d->delCollectionButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotDelCollection())); // -------------------------------------------------------- diff --git a/digikam/utilities/setup/setupdcraw.cpp b/digikam/utilities/setup/setupdcraw.cpp index 929e1d4f..57f9cb2d 100644 --- a/digikam/utilities/setup/setupdcraw.cpp +++ b/digikam/utilities/setup/setupdcraw.cpp @@ -82,8 +82,8 @@ SetupDcraw::SetupDcraw(TQWidget* parent ) layout->addWidget(d->dcrawSettings); layout->addStretch(); - connect(d->dcrawSettings, TQT_SIGNAL(signalSixteenBitsImageToggled(bool)), - this, TQT_SLOT(slotSixteenBitsImageToggled(bool))); + connect(d->dcrawSettings, TQ_SIGNAL(signalSixteenBitsImageToggled(bool)), + this, TQ_SLOT(slotSixteenBitsImageToggled(bool))); readSettings(); } diff --git a/digikam/utilities/setup/setupeditor.cpp b/digikam/utilities/setup/setupeditor.cpp index 56f72e17..337b5655 100644 --- a/digikam/utilities/setup/setupeditor.cpp +++ b/digikam/utilities/setup/setupeditor.cpp @@ -130,8 +130,8 @@ SetupEditor::SetupEditor(TQWidget* parent ) // -------------------------------------------------------- - connect(d->themebackgroundColor, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotThemeBackgroundColor(bool))); + connect(d->themebackgroundColor, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotThemeBackgroundColor(bool))); readSettings(); } diff --git a/digikam/utilities/setup/setupgeneral.cpp b/digikam/utilities/setup/setupgeneral.cpp index 0ea33960..2a8db22c 100644 --- a/digikam/utilities/setup/setupgeneral.cpp +++ b/digikam/utilities/setup/setupgeneral.cpp @@ -119,11 +119,11 @@ SetupGeneral::SetupGeneral(TQWidget* parent, KDialogBase* dialog ) "<p>Write access is required for this path and do not use a " "remote path here, like an NFS mounted file system.")); - connect(d->albumPathEdit, TQT_SIGNAL(urlSelected(const TQString &)), - this, TQT_SLOT(slotChangeAlbumPath(const TQString &))); + connect(d->albumPathEdit, TQ_SIGNAL(urlSelected(const TQString &)), + this, TQ_SLOT(slotChangeAlbumPath(const TQString &))); - connect(d->albumPathEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotPathEdited(const TQString&)) ); + connect(d->albumPathEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotPathEdited(const TQString&)) ); layout->addWidget(albumPathBox); diff --git a/digikam/utilities/setup/setupicc.cpp b/digikam/utilities/setup/setupicc.cpp index fcba0d40..b08750c1 100644 --- a/digikam/utilities/setup/setupicc.cpp +++ b/digikam/utilities/setup/setupicc.cpp @@ -339,29 +339,29 @@ SetupICC::SetupICC(TQWidget* parent, KDialogBase* dialog ) // -------------------------------------------------------- - connect(d->managedView, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotToggleManagedView(bool))); + connect(d->managedView, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotToggleManagedView(bool))); - connect(lcmsLogoLabel, TQT_SIGNAL(leftClickedURL(const TQString&)), - this, TQT_SLOT(processLCMSURL(const TQString&))); + connect(lcmsLogoLabel, TQ_SIGNAL(leftClickedURL(const TQString&)), + this, TQ_SLOT(processLCMSURL(const TQString&))); - connect(d->enableColorManagement, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotToggledWidgets(bool))); + connect(d->enableColorManagement, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotToggledWidgets(bool))); - connect(d->infoProofProfiles, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotClickedProof()) ); + connect(d->infoProofProfiles, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotClickedProof()) ); - connect(d->infoInProfiles, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotClickedIn()) ); + connect(d->infoInProfiles, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotClickedIn()) ); - connect(d->infoMonitorProfiles, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotClickedMonitor()) ); + connect(d->infoMonitorProfiles, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotClickedMonitor()) ); - connect(d->infoWorkProfiles, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotClickedWork())); + connect(d->infoWorkProfiles, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotClickedWork())); - connect(d->defaultPathKU, TQT_SIGNAL(urlSelected(const TQString&)), - this, TQT_SLOT(slotFillCombos(const TQString&))); + connect(d->defaultPathKU, TQ_SIGNAL(urlSelected(const TQString&)), + this, TQ_SLOT(slotFillCombos(const TQString&))); // -------------------------------------------------------- diff --git a/digikam/utilities/setup/setupmetadata.cpp b/digikam/utilities/setup/setupmetadata.cpp index 41878bcb..e4f74ede 100644 --- a/digikam/utilities/setup/setupmetadata.cpp +++ b/digikam/utilities/setup/setupmetadata.cpp @@ -172,11 +172,11 @@ SetupMetadata::SetupMetadata(TQWidget* parent ) // -------------------------------------------------------- - connect(exiv2LogoLabel, TQT_SIGNAL(leftClickedURL(const TQString&)), - this, TQT_SLOT(processExiv2URL(const TQString&))); + connect(exiv2LogoLabel, TQ_SIGNAL(leftClickedURL(const TQString&)), + this, TQ_SLOT(processExiv2URL(const TQString&))); - connect(d->ExifRotateBox, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotExifAutoRotateToggled(bool))); + connect(d->ExifRotateBox, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotExifAutoRotateToggled(bool))); } SetupMetadata::~SetupMetadata() diff --git a/digikam/utilities/setup/setupmime.cpp b/digikam/utilities/setup/setupmime.cpp index 1d54c825..6ac069e3 100644 --- a/digikam/utilities/setup/setupmime.cpp +++ b/digikam/utilities/setup/setupmime.cpp @@ -208,17 +208,17 @@ SetupMime::SetupMime(TQWidget* parent ) // -------------------------------------------------------- - connect(d->revertImageFileFilterBtn, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotRevertImageFileFilter())); + connect(d->revertImageFileFilterBtn, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRevertImageFileFilter())); - connect(d->revertMovieFileFilterBtn, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotRevertMovieFileFilter())); + connect(d->revertMovieFileFilterBtn, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRevertMovieFileFilter())); - connect(d->revertAudioFileFilterBtn, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotRevertAudioFileFilter())); + connect(d->revertAudioFileFilterBtn, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRevertAudioFileFilter())); - connect(d->revertRawFileFilterBtn, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotRevertRawFileFilter())); + connect(d->revertRawFileFilterBtn, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRevertRawFileFilter())); // -------------------------------------------------------- diff --git a/digikam/utilities/setup/setuptooltip.cpp b/digikam/utilities/setup/setuptooltip.cpp index d4f00dda..2a5c62c8 100644 --- a/digikam/utilities/setup/setuptooltip.cpp +++ b/digikam/utilities/setup/setuptooltip.cpp @@ -187,14 +187,14 @@ SetupToolTip::SetupToolTip(TQWidget* parent) // -------------------------------------------------------- - connect(d->showToolTipsBox, TQT_SIGNAL(toggled(bool)), - d->fileSettingBox, TQT_SLOT(setEnabled(bool))); + connect(d->showToolTipsBox, TQ_SIGNAL(toggled(bool)), + d->fileSettingBox, TQ_SLOT(setEnabled(bool))); - connect(d->showToolTipsBox, TQT_SIGNAL(toggled(bool)), - d->photoSettingBox, TQT_SLOT(setEnabled(bool))); + connect(d->showToolTipsBox, TQ_SIGNAL(toggled(bool)), + d->photoSettingBox, TQ_SLOT(setEnabled(bool))); - connect(d->showToolTipsBox, TQT_SIGNAL(toggled(bool)), - d->digikamSettingBox, TQT_SLOT(setEnabled(bool))); + connect(d->showToolTipsBox, TQ_SIGNAL(toggled(bool)), + d->digikamSettingBox, TQ_SLOT(setEnabled(bool))); // -------------------------------------------------------- diff --git a/digikam/utilities/slideshow/slideshow.cpp b/digikam/utilities/slideshow/slideshow.cpp index a97ad193..33cf9edc 100644 --- a/digikam/utilities/slideshow/slideshow.cpp +++ b/digikam/utilities/slideshow/slideshow.cpp @@ -128,20 +128,20 @@ SlideShow::SlideShow(const SlideShowSettings& settings) if (!d->settings.loop) d->toolBar->setEnabledPrev(false); - connect(d->toolBar, TQT_SIGNAL(signalPause()), - this, TQT_SLOT(slotPause())); + connect(d->toolBar, TQ_SIGNAL(signalPause()), + this, TQ_SLOT(slotPause())); - connect(d->toolBar, TQT_SIGNAL(signalPlay()), - this, TQT_SLOT(slotPlay())); + connect(d->toolBar, TQ_SIGNAL(signalPlay()), + this, TQ_SLOT(slotPlay())); - connect(d->toolBar, TQT_SIGNAL(signalNext()), - this, TQT_SLOT(slotNext())); + connect(d->toolBar, TQ_SIGNAL(signalNext()), + this, TQ_SLOT(slotNext())); - connect(d->toolBar, TQT_SIGNAL(signalPrev()), - this, TQT_SLOT(slotPrev())); + connect(d->toolBar, TQ_SIGNAL(signalPrev()), + this, TQ_SLOT(slotPrev())); - connect(d->toolBar, TQT_SIGNAL(signalClose()), - this, TQT_SLOT(slotClose())); + connect(d->toolBar, TQ_SIGNAL(signalClose()), + this, TQ_SLOT(slotClose())); // --------------------------------------------------------------- @@ -150,14 +150,14 @@ SlideShow::SlideShow(const SlideShowSettings& settings) d->timer = new TQTimer(this); d->mouseMoveTimer = new TQTimer(this); - connect(d->previewThread, TQT_SIGNAL(signalImageLoaded(const LoadingDescription &, const DImg &)), - this, TQT_SLOT(slotGotImagePreview(const LoadingDescription &, const DImg&))); + connect(d->previewThread, TQ_SIGNAL(signalImageLoaded(const LoadingDescription &, const DImg &)), + this, TQ_SLOT(slotGotImagePreview(const LoadingDescription &, const DImg&))); - connect(d->mouseMoveTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotMouseMoveTimeOut())); + connect(d->mouseMoveTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotMouseMoveTimeOut())); - connect(d->timer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotTimeOut())); + connect(d->timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotTimeOut())); d->timer->start(10, true); diff --git a/digikam/utilities/slideshow/toolbar.cpp b/digikam/utilities/slideshow/toolbar.cpp index 9f7023ae..dbecd4ad 100644 --- a/digikam/utilities/slideshow/toolbar.cpp +++ b/digikam/utilities/slideshow/toolbar.cpp @@ -90,23 +90,23 @@ ToolBar::ToolBar(TQWidget* parent) adjustSize(); setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); - connect(d->playBtn, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotPlayBtnToggled())); + connect(d->playBtn, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotPlayBtnToggled())); - connect(d->nextBtn, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotNexPrevClicked())); + connect(d->nextBtn, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotNexPrevClicked())); - connect(d->prevBtn, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotNexPrevClicked())); + connect(d->prevBtn, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotNexPrevClicked())); - connect(d->nextBtn, TQT_SIGNAL(clicked()), - this, TQT_SIGNAL(signalNext())); + connect(d->nextBtn, TQ_SIGNAL(clicked()), + this, TQ_SIGNAL(signalNext())); - connect(d->prevBtn, TQT_SIGNAL(clicked()), - this, TQT_SIGNAL(signalPrev())); + connect(d->prevBtn, TQ_SIGNAL(clicked()), + this, TQ_SIGNAL(signalPrev())); - connect(d->stopBtn, TQT_SIGNAL(clicked()), - this, TQT_SIGNAL(signalClose())); + connect(d->stopBtn, TQ_SIGNAL(clicked()), + this, TQ_SIGNAL(signalClose())); } ToolBar::~ToolBar() |
