TDE
/
digikam
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/digikam
0
0
Fork 0
Code Issues Releases Wiki Activity

Replaced various '#define' with actual strings - part 6

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/19/head
Michele Calgaro 1 year ago
parent 94a2d6ebb4
commit 375a163957
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
24 changed files with 341 additions and 341 deletions
Show Stats Download Patch File Download Diff File

6
digikam/digikam/albumiconview.cpp
Unescape Escape View File

@ -524,7 +524,7 @@ void AlbumIconView::slotRightButtonClicked(const TQPoint& pos)
}
TQPopupMenu popmenu(this);
TDEAction *paste = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), 0);
TDEAction *paste = KStdAction::paste(this, TQT_SLOT(slotPaste()), 0);
TQMimeSource *data = kapp->clipboard()->data(TQClipboard::Clipboard);
if(!data || !TQUriDrag::canDecode(data))
@ -682,8 +682,8 @@ void AlbumIconView::slotRightButtonClicked(IconItem *item, const TQPoint& pos)
// --------------------------------------------------------
TDEAction *copy = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), 0);
TDEAction *paste = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), 0);
TDEAction *copy = KStdAction::copy(this, TQT_SLOT(slotCopy()), 0);
TDEAction *paste = KStdAction::paste(this, TQT_SLOT(slotPaste()), 0);
TQMimeSource *data = kapp->clipboard()->data(TQClipboard::Clipboard);
if(!data || !TQUriDrag::canDecode(data))
{

2
digikam/digikam/albumiconviewfilter.cpp
Unescape Escape View File

@ -186,7 +186,7 @@ void AlbumIconViewFilter::slotItemsFilterMatch(bool match)
bool AlbumIconViewFilter::eventFilter(TQObject *object, TQEvent *e)
{
TQWidget *widget = TQT_TQWIDGET(object);
TQWidget *widget = static_cast<TQWidget*>(object);
if (e->type() == TQEvent::MouseButtonRelease)
{

2
digikam/digikam/albumpropsedit.cpp
Unescape Escape View File

@ -141,7 +141,7 @@ AlbumPropsEdit::AlbumPropsEdit(PAlbum* album, bool create)
titleLabel->setBuddy( d->titleEdit );
TQRegExp titleRx("[^/]+");
TQValidator *titleValidator = new TQRegExpValidator(titleRx, TQT_TQOBJECT(this));
TQValidator *titleValidator = new TQRegExpValidator(titleRx, this);
d->titleEdit->setValidator(titleValidator);
TQLabel *collectionLabel = new TQLabel( plainPage( ) );

240
digikam/digikam/digikamapp.cpp
Unescape Escape View File

@ -139,15 +139,15 @@ DigikamApp::DigikamApp()
d->cameraMediaList = new TDEPopupMenu;
connect(d->cameraMediaList, TQT_SIGNAL( aboutToShow() ),
TQT_TQOBJECT(this), TQT_SLOT(slotCameraMediaMenu()));
this, TQT_SLOT(slotCameraMediaMenu()));
d->cameraList = new CameraList(TQT_TQOBJECT(this), locateLocal("appdata", "cameras.xml"));
d->cameraList = new CameraList(this, locateLocal("appdata", "cameras.xml"));
connect(d->cameraList, TQT_SIGNAL(signalCameraAdded(CameraType *)),
TQT_TQOBJECT(this), TQT_SLOT(slotCameraAdded(CameraType *)));
this, TQT_SLOT(slotCameraAdded(CameraType *)));
connect(d->cameraList, TQT_SIGNAL(signalCameraRemoved(CameraType *)),
TQT_TQOBJECT(this), TQT_SLOT(slotCameraRemoved(CameraType *)));
this, TQT_SLOT(slotCameraRemoved(CameraType *)));
setupView();
setupStatusBar();
@ -191,13 +191,13 @@ DigikamApp::DigikamApp()
setAutoSaveSettings();
d->dcopIface = new DCOPIface(TQT_TQOBJECT(this), "camera");
d->dcopIface = new DCOPIface(this, "camera");
connect(d->dcopIface, TQT_SIGNAL(signalCameraAutoDetect()),
TQT_TQOBJECT(this), TQT_SLOT(slotDcopCameraAutoDetect()));
this, TQT_SLOT(slotDcopCameraAutoDetect()));
connect(d->dcopIface, TQT_SIGNAL(signalDownloadImages( const TQString & )),
TQT_TQOBJECT(this), TQT_SLOT(slotDcopDownloadImages(const TQString &)));
this, TQT_SLOT(slotDcopDownloadImages(const TQString &)));
}
DigikamApp::~DigikamApp()
@ -329,7 +329,7 @@ void DigikamApp::autoDetect()
if(d->splashScreen)
d->splashScreen->message(i18n("Auto-detect camera"));
TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotCameraAutoDetect()));
TQTimer::singleShot(0, this, TQT_SLOT(slotCameraAutoDetect()));
}
void DigikamApp::downloadFrom(const TQString &cameraGuiPath)
@ -343,7 +343,7 @@ void DigikamApp::downloadFrom(const TQString &cameraGuiPath)
if(d->splashScreen)
d->splashScreen->message(i18n("Opening Download Dialog"));
TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotDownloadImages()));
TQTimer::singleShot(0, this, TQT_SLOT(slotDownloadImages()));
}
}
@ -367,13 +367,13 @@ void DigikamApp::setupView()
d->view->applySettings();
connect(d->view, TQT_SIGNAL(signalAlbumSelected(bool)),
TQT_TQOBJECT(this), TQT_SLOT(slotAlbumSelected(bool)));
this, TQT_SLOT(slotAlbumSelected(bool)));
connect(d->view, TQT_SIGNAL(signalTagSelected(bool)),
TQT_TQOBJECT(this), TQT_SLOT(slotTagSelected(bool)));
this, TQT_SLOT(slotTagSelected(bool)));
connect(d->view, TQT_SIGNAL(signalImageSelected(const TQPtrList<ImageInfo>&, bool, bool, const KURL::List&)),
TQT_TQOBJECT(this), TQT_SLOT(slotImageSelected(const TQPtrList<ImageInfo>&, bool, bool, const KURL::List&)));
this, TQT_SLOT(slotImageSelected(const TQPtrList<ImageInfo>&, bool, bool, const KURL::List&)));
}
void DigikamApp::setupStatusBar()
@ -404,40 +404,40 @@ void DigikamApp::setupStatusBar()
//------------------------------------------------------------------------------
connect(d->statusZoomBar, TQT_SIGNAL(signalZoomMinusClicked()),
TQT_TQOBJECT(d->view), TQT_SLOT(slotZoomOut()));
d->view, TQT_SLOT(slotZoomOut()));
connect(d->statusZoomBar, TQT_SIGNAL(signalZoomPlusClicked()),
TQT_TQOBJECT(d->view), TQT_SLOT(slotZoomIn()));
d->view, TQT_SLOT(slotZoomIn()));
connect(d->statusZoomBar, TQT_SIGNAL(signalZoomSliderChanged(int)),
TQT_TQOBJECT(this), TQT_SLOT(slotZoomSliderChanged(int)));
this, TQT_SLOT(slotZoomSliderChanged(int)));
connect(d->view, TQT_SIGNAL(signalThumbSizeChanged(int)),
TQT_TQOBJECT(this), TQT_SLOT(slotThumbSizeChanged(int)));
this, TQT_SLOT(slotThumbSizeChanged(int)));
connect(d->view, TQT_SIGNAL(signalZoomChanged(double, int)),
TQT_TQOBJECT(this), TQT_SLOT(slotZoomChanged(double, int)));
this, TQT_SLOT(slotZoomChanged(double, int)));
connect(d->view, TQT_SIGNAL(signalTogglePreview(bool)),
TQT_TQOBJECT(this), TQT_SLOT(slotTogglePreview(bool)));
this, TQT_SLOT(slotTogglePreview(bool)));
connect(d->albumIconViewFilter, TQT_SIGNAL(signalResetTagFilters()),
TQT_TQOBJECT(this), TQT_SIGNAL(signalResetTagFilters()));
this, TQT_SIGNAL(signalResetTagFilters()));
connect(d->statusNavigateBar, TQT_SIGNAL(signalFirstItem()),
TQT_TQOBJECT(d->view), TQT_SLOT(slotFirstItem()));
d->view, TQT_SLOT(slotFirstItem()));
connect(d->statusNavigateBar, TQT_SIGNAL(signalNextItem()),
TQT_TQOBJECT(d->view), TQT_SLOT(slotNextItem()));
d->view, TQT_SLOT(slotNextItem()));
connect(d->statusNavigateBar, TQT_SIGNAL(signalPrevItem()),
TQT_TQOBJECT(d->view), TQT_SLOT(slotPrevItem()));
d->view, TQT_SLOT(slotPrevItem()));
connect(d->statusNavigateBar, TQT_SIGNAL(signalLastItem()),
TQT_TQOBJECT(d->view), TQT_SLOT(slotLastItem()));
d->view, TQT_SLOT(slotLastItem()));
connect(d->statusProgressBar, TQT_SIGNAL(signalCancelButtonPressed()),
TQT_TQOBJECT(this), TQT_SIGNAL(signalCancelButtonPressed()));
this, TQT_SIGNAL(signalCancelButtonPressed()));
}
void DigikamApp::setupAccelerators()
@ -446,52 +446,52 @@ void DigikamApp::setupAccelerators()
d->accelerators->insert("Exit Preview Mode", i18n("Exit Preview"),
i18n("Exit preview mode"),
Key_Escape, TQT_TQOBJECT(this), TQT_SIGNAL(signalEscapePressed()),
Key_Escape, this, TQT_SIGNAL(signalEscapePressed()),
false, true);
d->accelerators->insert("Next Image Key_Space", i18n("Next Image"),
i18n("Next Image"),
Key_Space, TQT_TQOBJECT(this), TQT_SIGNAL(signalNextItem()),
Key_Space, this, TQT_SIGNAL(signalNextItem()),
false, true);
d->accelerators->insert("Previous Image SHIFT+Key_Space", i18n("Previous Image"),
i18n("Previous Image"),
SHIFT+Key_Space, TQT_TQOBJECT(this), TQT_SIGNAL(signalPrevItem()),
SHIFT+Key_Space, this, TQT_SIGNAL(signalPrevItem()),
false, true);
d->accelerators->insert("Previous Image Key_Backspace", i18n("Previous Image"),
i18n("Previous Image"),
Key_Backspace, TQT_TQOBJECT(this), TQT_SIGNAL(signalPrevItem()),
Key_Backspace, this, TQT_SIGNAL(signalPrevItem()),
false, true);
d->accelerators->insert("Next Image Key_Next", i18n("Next Image"),
i18n("Next Image"),
Key_Next, TQT_TQOBJECT(this), TQT_SIGNAL(signalNextItem()),
Key_Next, this, TQT_SIGNAL(signalNextItem()),
false, true);
d->accelerators->insert("Previous Image Key_Prior", i18n("Previous Image"),
i18n("Previous Image"),
Key_Prior, TQT_TQOBJECT(this), TQT_SIGNAL(signalPrevItem()),
Key_Prior, this, TQT_SIGNAL(signalPrevItem()),
false, true);
d->accelerators->insert("First Image Key_Home", i18n("First Image"),
i18n("First Image"),
Key_Home, TQT_TQOBJECT(this), TQT_SIGNAL(signalFirstItem()),
Key_Home, this, TQT_SIGNAL(signalFirstItem()),
false, true);
d->accelerators->insert("Last Image Key_End", i18n("Last Image"),
i18n("Last Image"),
Key_End, TQT_TQOBJECT(this), TQT_SIGNAL(signalLastItem()),
Key_End, this, TQT_SIGNAL(signalLastItem()),
false, true);
d->accelerators->insert("Copy Album Items Selection CTRL+Key_C", i18n("Copy Album Items Selection"),
i18n("Copy Album Items Selection"),
CTRL+Key_C, TQT_TQOBJECT(this), TQT_SIGNAL(signalCopyAlbumItemsSelection()),
CTRL+Key_C, this, TQT_SIGNAL(signalCopyAlbumItemsSelection()),
false, true);
d->accelerators->insert("Paste Album Items Selection CTRL+Key_V", i18n("Paste Album Items Selection"),
i18n("Paste Album Items Selection"),
CTRL+Key_V, TQT_TQOBJECT(this), TQT_SIGNAL(signalPasteAlbumItemsSelection()),
CTRL+Key_V, this, TQT_SIGNAL(signalPasteAlbumItemsSelection()),
false, true);
}
@ -509,47 +509,47 @@ void DigikamApp::setupActions()
d->themeMenuAction = new TDESelectAction(i18n("&Themes"), 0, actionCollection(), "theme_menu");
connect(d->themeMenuAction, TQT_SIGNAL(activated(const TQString&)),
TQT_TQOBJECT(this), TQT_SLOT(slotChangeTheme(const TQString&)));
this, TQT_SLOT(slotChangeTheme(const TQString&)));
connect(ThemeEngine::instance(), TQT_SIGNAL(signalThemeChanged()),
TQT_TQOBJECT(this), TQT_SLOT(slotThemeChanged()));
this, TQT_SLOT(slotThemeChanged()));
// -----------------------------------------------------------------
d->backwardActionMenu = new TDEToolBarPopupAction(i18n("&Back"),
"back",
ALT+Key_Left,
TQT_TQOBJECT(d->view),
d->view,
TQT_SLOT(slotAlbumHistoryBack()),
actionCollection(),
"album_back");
d->backwardActionMenu->setEnabled(false);
connect(d->backwardActionMenu->popupMenu(), TQT_SIGNAL(aboutToShow()),
TQT_TQOBJECT(this), TQT_SLOT(slotAboutToShowBackwardMenu()));
this, TQT_SLOT(slotAboutToShowBackwardMenu()));
connect(d->backwardActionMenu->popupMenu(), TQT_SIGNAL(activated(int)),
TQT_TQOBJECT(d->view), TQT_SLOT(slotAlbumHistoryBack(int)));
d->view, TQT_SLOT(slotAlbumHistoryBack(int)));
d->forwardActionMenu = new TDEToolBarPopupAction(i18n("Forward"),
"forward",
ALT+Key_Right,
TQT_TQOBJECT(d->view),
d->view,
TQT_SLOT(slotAlbumHistoryForward()),
actionCollection(),
"album_forward");
d->forwardActionMenu->setEnabled(false);
connect(d->forwardActionMenu->popupMenu(), TQT_SIGNAL(aboutToShow()),
TQT_TQOBJECT(this), TQT_SLOT(slotAboutToShowForwardMenu()));
this, TQT_SLOT(slotAboutToShowForwardMenu()));
connect(d->forwardActionMenu->popupMenu(), TQT_SIGNAL(activated(int)),
TQT_TQOBJECT(d->view), TQT_SLOT(slotAlbumHistoryForward(int)));
d->view, TQT_SLOT(slotAlbumHistoryForward(int)));
d->newAction = new TDEAction(i18n("&New..."),
"albumfolder-new",
TDEStdAccel::shortcut(TDEStdAccel::New),
TQT_TQOBJECT(d->view),
d->view,
TQT_SLOT(slotNewAlbum()),
actionCollection(),
"album_new");
@ -562,7 +562,7 @@ void DigikamApp::setupActions()
"album_sort");
connect(d->albumSortAction, TQT_SIGNAL(activated(int)),
TQT_TQOBJECT(d->view), TQT_SLOT(slotSortAlbums(int)));
d->view, TQT_SLOT(slotSortAlbums(int)));
// Use same list order as in albumsettings enum
TQStringList sortActionList;
@ -573,7 +573,7 @@ void DigikamApp::setupActions()
d->recurseAlbumsAction = new TDEToggleAction(i18n("Include Album Sub-Tree"),
0,
TQT_TQOBJECT(this),
this,
0,
actionCollection(),
"albums_recursive");
@ -581,11 +581,11 @@ void DigikamApp::setupActions()
"the current album."));
connect(d->recurseAlbumsAction, TQT_SIGNAL(toggled(bool)),
TQT_TQOBJECT(this), TQT_SLOT(slotRecurseAlbums(bool)));
this, TQT_SLOT(slotRecurseAlbums(bool)));
d->recurseTagsAction = new TDEToggleAction(i18n("Include Tag Sub-Tree"),
0,
TQT_TQOBJECT(this),
this,
0,
actionCollection(),
"tags_recursive");
@ -593,12 +593,12 @@ void DigikamApp::setupActions()
"and its all its sub-tags."));
connect(d->recurseTagsAction, TQT_SIGNAL(toggled(bool)),
TQT_TQOBJECT(this), TQT_SLOT(slotRecurseTags(bool)));
this, TQT_SLOT(slotRecurseTags(bool)));
d->deleteAction = new TDEAction(i18n("Delete"),
"edit-delete",
0,
TQT_TQOBJECT(d->view),
d->view,
TQT_SLOT(slotDeleteAlbum()),
actionCollection(),
"album_delete");
@ -606,7 +606,7 @@ void DigikamApp::setupActions()
d->addImagesAction = new TDEAction( i18n("Add Images..."),
"albumfolder-importimages",
CTRL+Key_I,
TQT_TQOBJECT(this),
this,
TQT_SLOT(slotAlbumAddImages()),
actionCollection(),
"album_addImages");
@ -615,7 +615,7 @@ void DigikamApp::setupActions()
d->albumImportAction = new TDEAction( i18n("Add Folders..."),
"albumfolder-importdir",
0,
TQT_TQOBJECT(d->view),
d->view,
TQT_SLOT(slotAlbumImportFolder()),
actionCollection(),
"album_importFolder");
@ -623,7 +623,7 @@ void DigikamApp::setupActions()
d->propsEditAction = new TDEAction( i18n("Properties..."),
"albumfolder-properties",
0,
TQT_TQOBJECT(d->view),
d->view,
TQT_SLOT(slotAlbumPropsEdit()),
actionCollection(),
"album_propsEdit");
@ -632,7 +632,7 @@ void DigikamApp::setupActions()
d->refreshAlbumAction = new TDEAction( i18n("Refresh"),
"rebuild",
Key_F5,
TQT_TQOBJECT(d->view),
d->view,
TQT_SLOT(slotAlbumRefresh()),
actionCollection(),
"album_refresh");
@ -641,7 +641,7 @@ void DigikamApp::setupActions()
d->syncAlbumMetadataAction = new TDEAction( i18n("Synchronize Images with Database"),
"rebuild",
0,
TQT_TQOBJECT(d->view),
d->view,
TQT_SLOT(slotAlbumSyncPicturesMetadata()),
actionCollection(),
"album_syncmetadata");
@ -652,7 +652,7 @@ void DigikamApp::setupActions()
d->openInKonquiAction = new TDEAction( i18n("Open in File Manager"),
"konqueror",
0,
TQT_TQOBJECT(d->view),
d->view,
TQT_SLOT(slotAlbumOpenInKonqui()),
actionCollection(),
"album_openinkonqui");
@ -660,15 +660,15 @@ void DigikamApp::setupActions()
// -----------------------------------------------------------
d->newTagAction = new TDEAction(i18n("New &Tag..."), "tag-new",
0, TQT_TQOBJECT(d->view), TQT_SLOT(slotNewTag()),
0, d->view, TQT_SLOT(slotNewTag()),
actionCollection(), "tag_new");
d->editTagAction = new TDEAction(i18n("Edit Tag Properties..."), "tag-properties",
0, TQT_TQOBJECT(d->view), TQT_SLOT(slotEditTag()),
0, d->view, TQT_SLOT(slotEditTag()),
actionCollection(), "tag_edit");
d->deleteTagAction = new TDEAction(i18n("Delete Tag"), "tag-delete",
0, TQT_TQOBJECT(d->view), TQT_SLOT(slotDeleteTag()),
0, d->view, TQT_SLOT(slotDeleteTag()),
actionCollection(), "tag_delete");
// -----------------------------------------------------------
@ -676,7 +676,7 @@ void DigikamApp::setupActions()
d->imagePreviewAction = new TDEToggleAction(i18n("View..."),
"viewimage",
Key_F3,
TQT_TQOBJECT(d->view),
d->view,
TQT_SLOT(slotImagePreview()),
actionCollection(),
"image_view");
@ -684,7 +684,7 @@ void DigikamApp::setupActions()
d->imageViewAction = new TDEAction(i18n("Edit..."),
"editimage",
Key_F4,
TQT_TQOBJECT(d->view),
d->view,
TQT_SLOT(slotImageEdit()),
actionCollection(),
"image_edit");
@ -693,7 +693,7 @@ void DigikamApp::setupActions()
d->imageLightTableAction = new TDEAction(i18n("Place onto Light Table"),
"lighttable",
CTRL+Key_L,
TQT_TQOBJECT(d->view),
d->view,
TQT_SLOT(slotImageLightTable()),
actionCollection(),
"image_lighttable");
@ -702,7 +702,7 @@ void DigikamApp::setupActions()
d->imageAddLightTableAction = new TDEAction(i18n("Add to Light Table"),
"lighttableadd",
SHIFT+CTRL+Key_L,
TQT_TQOBJECT(d->view),
d->view,
TQT_SLOT(slotImageAddToLightTable()),
actionCollection(),
"image_add_to_lighttable");
@ -711,7 +711,7 @@ void DigikamApp::setupActions()
d->imageRenameAction = new TDEAction(i18n("Rename..."),
"pencil",
Key_F2,
TQT_TQOBJECT(d->view),
d->view,
TQT_SLOT(slotImageRename()),
actionCollection(),
"image_rename");
@ -721,7 +721,7 @@ void DigikamApp::setupActions()
d->imageDeleteAction = new TDEAction(i18n("Delete"),
"edittrash",
Key_Delete,
TQT_TQOBJECT(d->view),
d->view,
TQT_SLOT(slotImageDelete()),
actionCollection(),
"image_delete");
@ -730,7 +730,7 @@ void DigikamApp::setupActions()
d->imageDeletePermanentlyAction = new TDEAction(i18n("Delete permanently"),
"edit-delete",
SHIFT+Key_Delete,
TQT_TQOBJECT(d->view),
d->view,
TQT_SLOT(slotImageDeletePermanently()),
actionCollection(),
"image_delete_permanently");
@ -740,7 +740,7 @@ void DigikamApp::setupActions()
d->imageDeletePermanentlyDirectlyAction = new TDEAction(i18n("Delete permanently without confirmation"),
"edit-delete",
0,
TQT_TQOBJECT(d->view),
d->view,
TQT_SLOT(slotImageDeletePermanentlyDirectly()),
actionCollection(),
"image_delete_permanently_directly");
@ -748,7 +748,7 @@ void DigikamApp::setupActions()
d->imageTrashDirectlyAction = new TDEAction(i18n("Move to trash without confirmation"),
"edittrash",
0,
TQT_TQOBJECT(d->view),
d->view,
TQT_SLOT(slotImageTrashDirectly()),
actionCollection(),
"image_trash_directly");
@ -760,7 +760,7 @@ void DigikamApp::setupActions()
"image_sort");
connect(d->imageSortAction, TQT_SIGNAL(activated(int)),
TQT_TQOBJECT(d->view), TQT_SLOT(slotSortImages(int)));
d->view, TQT_SLOT(slotSortImages(int)));
// Use same list order as in albumsettings enum
TQStringList sortImagesActionList;
@ -773,10 +773,10 @@ void DigikamApp::setupActions()
// -----------------------------------------------------------------
TQSignalMapper *exifOrientationMapper = new TQSignalMapper( TQT_TQOBJECT(d->view) );
TQSignalMapper *exifOrientationMapper = new TQSignalMapper( d->view );
connect(exifOrientationMapper, TQT_SIGNAL(mapped(int) ),
TQT_TQOBJECT(d->view), TQT_SLOT(slotImageExifOrientation(int)));
d->view, TQT_SLOT(slotImageExifOrientation(int)));
d->imageExifOrientationActionMenu = new TDEActionMenu(i18n("Adjust Exif orientation tag"),
actionCollection(),
@ -879,7 +879,7 @@ void DigikamApp::setupActions()
d->selectAllAction = new TDEAction(i18n("Select All"),
0,
CTRL+Key_A,
TQT_TQOBJECT(d->view),
d->view,
TQT_SLOT(slotSelectAll()),
actionCollection(),
"selectAll");
@ -887,7 +887,7 @@ void DigikamApp::setupActions()
d->selectNoneAction = new TDEAction(i18n("Select None"),
0,
CTRL+SHIFT+Key_A,
TQT_TQOBJECT(d->view),
d->view,
TQT_SLOT(slotSelectNone()),
actionCollection(),
"selectNone");
@ -895,25 +895,25 @@ void DigikamApp::setupActions()
d->selectInvertAction = new TDEAction(i18n("Invert Selection"),
0,
CTRL+Key_Asterisk,
TQT_TQOBJECT(d->view),
d->view,
TQT_SLOT(slotSelectInvert()),
actionCollection(),
"selectInvert");
// -----------------------------------------------------------
d->showMenuBarAction = KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(slotShowMenuBar()), actionCollection());
d->showMenuBarAction = KStdAction::showMenubar(this, TQT_SLOT(slotShowMenuBar()), actionCollection());
KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotEditKeys()), actionCollection());
KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfToolbars()), actionCollection());
KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotSetup()), actionCollection());
KStdAction::keyBindings(this, TQT_SLOT(slotEditKeys()), actionCollection());
KStdAction::configureToolbars(this, TQT_SLOT(slotConfToolbars()), actionCollection());
KStdAction::preferences(this, TQT_SLOT(slotSetup()), actionCollection());
// -----------------------------------------------------------
d->zoomPlusAction = new TDEAction(i18n("Zoom In"),
"zoom-in",
CTRL+Key_Plus,
TQT_TQOBJECT(d->view),
d->view,
TQT_SLOT(slotZoomIn()),
actionCollection(),
"album_zoomin");
@ -921,7 +921,7 @@ void DigikamApp::setupActions()
d->zoomMinusAction = new TDEAction(i18n("Zoom Out"),
"zoom-out",
CTRL+Key_Minus,
TQT_TQOBJECT(d->view),
d->view,
TQT_SLOT(slotZoomOut()),
actionCollection(),
"album_zoomout");
@ -929,7 +929,7 @@ void DigikamApp::setupActions()
d->zoomTo100percents = new TDEAction(i18n("Zoom to 100%"),
"zoom-original",
ALT+CTRL+Key_0, // NOTE: Photoshop 7 use ALT+CTRL+0.
TQT_TQOBJECT(d->view),
d->view,
TQT_SLOT(slotZoomTo100Percents()),
actionCollection(),
"album_zoomto100percents");
@ -937,7 +937,7 @@ void DigikamApp::setupActions()
d->zoomFitToWindowAction = new TDEAction(i18n("Fit to &Window"),
"view_fit_window",
CTRL+SHIFT+Key_E,
TQT_TQOBJECT(d->view),
d->view,
TQT_SLOT(slotFitToWindow()),
actionCollection(),
"album_zoomfit2window");
@ -946,7 +946,7 @@ void DigikamApp::setupActions()
d->fullScreenAction = new TDEToggleAction(i18n("Full Screen"),
"view-fullscreen",
CTRL+SHIFT+Key_F,
TQT_TQOBJECT(this),
this,
TQT_SLOT(slotToggleFullScreen()),
actionCollection(),
"full_screen");
@ -958,25 +958,25 @@ void DigikamApp::setupActions()
d->slideShowAction->setDelayed(false);
d->slideShowAllAction = new TDEAction(i18n("All"), 0, Key_F9,
TQT_TQOBJECT(d->view), TQT_SLOT(slotSlideShowAll()),
d->view, TQT_SLOT(slotSlideShowAll()),
actionCollection(), "slideshow_all");
d->slideShowAction->insert(d->slideShowAllAction);
d->slideShowSelectionAction = new TDEAction(i18n("Selection"), 0, ALT+Key_F9,
TQT_TQOBJECT(d->view),
d->view,
TQT_SLOT(slotSlideShowSelection()),
actionCollection(),
"slideshow_selected");
d->slideShowAction->insert(d->slideShowSelectionAction);
d->slideShowRecursiveAction = new TDEAction(i18n("With All Sub-Albums"), 0, SHIFT+Key_F9,
TQT_TQOBJECT(d->view),
d->view,
TQT_SLOT(slotSlideShowRecursive()),
actionCollection(),
"slideshow_recursive");
d->slideShowAction->insert(d->slideShowRecursiveAction);
d->quitAction = KStdAction::quit(TQT_TQOBJECT(this),
d->quitAction = KStdAction::quit(this,
TQT_SLOT(slotExit()),
actionCollection(),
"app_exit");
@ -984,7 +984,7 @@ void DigikamApp::setupActions()
d->rawCameraListAction = new TDEAction(i18n("Supported RAW Cameras"),
"kdcraw",
0,
TQT_TQOBJECT(this),
this,
TQT_SLOT(slotRawCameraList()),
actionCollection(),
"help_rawcameralist");
@ -992,12 +992,12 @@ void DigikamApp::setupActions()
d->kipiHelpAction = new TDEAction(i18n("Kipi Plugins Handbook"),
"kipi",
0,
TQT_TQOBJECT(this),
this,
TQT_SLOT(slotShowKipiHelp()),
actionCollection(),
"help_kipi");
d->tipAction = KStdAction::tipOfDay(TQT_TQOBJECT(this),
d->tipAction = KStdAction::tipOfDay(this,
TQT_SLOT(slotShowTip()),
actionCollection(),
"help_tipofday");
@ -1005,14 +1005,14 @@ void DigikamApp::setupActions()
d->donateMoneyAction = new TDEAction(i18n("Donate..."),
0,
0,
TQT_TQOBJECT(this),
this,
TQT_SLOT(slotDonateMoney()),
actionCollection(),
"help_donatemoney");
d->contributeAction = new TDEAction(i18n("Contribute..."),
0, 0,
TQT_TQOBJECT(this), TQT_SLOT(slotContribute()),
this, TQT_SLOT(slotContribute()),
actionCollection(),
"help_contribute");
@ -1021,50 +1021,50 @@ void DigikamApp::setupActions()
// -- Rating actions ---------------------------------------------------------------
d->rating0Star = new TDEAction(i18n("Assign Rating \"No Stars\""), CTRL+Key_0,
TQT_TQOBJECT(d->view), TQT_SLOT(slotAssignRatingNoStar()),
d->view, TQT_SLOT(slotAssignRatingNoStar()),
actionCollection(), "ratenostar");
d->rating1Star = new TDEAction(i18n("Assign Rating \"One Star\""), CTRL+Key_1,
TQT_TQOBJECT(d->view), TQT_SLOT(slotAssignRatingOneStar()),
d->view, TQT_SLOT(slotAssignRatingOneStar()),
actionCollection(), "rateonestar");
d->rating2Star = new TDEAction(i18n("Assign Rating \"Two Stars\""), CTRL+Key_2,
TQT_TQOBJECT(d->view), TQT_SLOT(slotAssignRatingTwoStar()),
d->view, TQT_SLOT(slotAssignRatingTwoStar()),
actionCollection(), "ratetwostar");
d->rating3Star = new TDEAction(i18n("Assign Rating \"Three Stars\""), CTRL+Key_3,
TQT_TQOBJECT(d->view), TQT_SLOT(slotAssignRatingThreeStar()),
d->view, TQT_SLOT(slotAssignRatingThreeStar()),
actionCollection(), "ratethreestar");
d->rating4Star = new TDEAction(i18n("Assign Rating \"Four Stars\""), CTRL+Key_4,
TQT_TQOBJECT(d->view), TQT_SLOT(slotAssignRatingFourStar()),
d->view, TQT_SLOT(slotAssignRatingFourStar()),
actionCollection(), "ratefourstar");
d->rating5Star = new TDEAction(i18n("Assign Rating \"Five Stars\""), CTRL+Key_5,
TQT_TQOBJECT(d->view), TQT_SLOT(slotAssignRatingFiveStar()),
d->view, TQT_SLOT(slotAssignRatingFiveStar()),
actionCollection(), "ratefivestar");
// -----------------------------------------------------------
TDEAction* findAction = KStdAction::find(TQT_TQOBJECT(d->view), TQT_SLOT(slotNewQuickSearch()),
TDEAction* findAction = KStdAction::find(d->view, TQT_SLOT(slotNewQuickSearch()),
actionCollection(), "search_quick");
findAction->setText(i18n("Search..."));
findAction->setIconSet(BarIcon("filefind"));
TDEAction* advFindAction = KStdAction::find(TQT_TQOBJECT(d->view), TQT_SLOT(slotNewAdvancedSearch()),
TDEAction* advFindAction = KStdAction::find(d->view, TQT_SLOT(slotNewAdvancedSearch()),
actionCollection(), "search_advanced");
advFindAction->setText(i18n("Advanced Search..."));
advFindAction->setShortcut("Ctrl+Alt+F");
new TDEAction(i18n("Light Table"), "idea", Key_L,
TQT_TQOBJECT(d->view), TQT_SLOT(slotLightTable()), actionCollection(),
d->view, TQT_SLOT(slotLightTable()), actionCollection(),
"light_table");
new TDEAction(i18n("Scan for New Images"), "reload_page", 0,
TQT_TQOBJECT(this), TQT_SLOT(slotDatabaseRescan()), actionCollection(),
this, TQT_SLOT(slotDatabaseRescan()), actionCollection(),
"database_rescan");
new TDEAction(i18n("Rebuild All Thumbnails..."), "reload_page", 0,
TQT_TQOBJECT(this), TQT_SLOT(slotRebuildAllThumbs()), actionCollection(),
this, TQT_SLOT(slotRebuildAllThumbs()), actionCollection(),
"thumbs_rebuild");
new TDEAction(i18n("Update Metadata Database..."), "reload_page", 0,
TQT_TQOBJECT(this), TQT_SLOT(slotSyncAllPicturesMetadata()), actionCollection(),
this, TQT_SLOT(slotSyncAllPicturesMetadata()), actionCollection(),
"sync_metadata");
// -----------------------------------------------------------
@ -1350,7 +1350,7 @@ void DigikamApp::slotExit()
if (d->fullScreen)
{
slotToggleFullScreen();
TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(close()));
TQTimer::singleShot(0, this, TQT_SLOT(close()));
}
else
close();
@ -1448,7 +1448,7 @@ void DigikamApp::slotDownloadImages( const TQString& folder)
{
d->cameraGuiPath = folder;
TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotDownloadImages()));
TQTimer::singleShot(0, this, TQT_SLOT(slotDownloadImages()));
}
}
@ -1482,7 +1482,7 @@ void DigikamApp::slotDownloadImages()
i18n("Browse %1").arg(KURL(d->cameraGuiPath).prettyURL()),
"camera-photo",
0,
TQT_TQOBJECT(this),
this,
TQT_SLOT(slotDownloadImages()),
actionCollection(),
d->cameraGuiPath.latin1() );
@ -1497,10 +1497,10 @@ void DigikamApp::slotDownloadImages()
cgui->show();
connect(cgui, TQT_SIGNAL(signalLastDestination(const KURL&)),
TQT_TQOBJECT(d->view), TQT_SLOT(slotSelectAlbum(const KURL&)));
d->view, TQT_SLOT(slotSelectAlbum(const KURL&)));
connect(cgui, TQT_SIGNAL(signalAlbumSettingsChanged()),
TQT_TQOBJECT(this), TQT_SLOT(slotSetupChanged()));
this, TQT_SLOT(slotSetupChanged()));
}
void DigikamApp::slotCameraConnect()
@ -1528,10 +1528,10 @@ void DigikamApp::slotCameraConnect()
cgui->show();
connect(cgui, TQT_SIGNAL(signalLastDestination(const KURL&)),
TQT_TQOBJECT(d->view), TQT_SLOT(slotSelectAlbum(const KURL&)));
d->view, TQT_SLOT(slotSelectAlbum(const KURL&)));
connect(cgui, TQT_SIGNAL(signalAlbumSettingsChanged()),
TQT_TQOBJECT(this), TQT_SLOT(slotSetupChanged()));
this, TQT_SLOT(slotSetupChanged()));
}
}
}
@ -1541,7 +1541,7 @@ void DigikamApp::slotCameraAdded(CameraType *ctype)
if (!ctype) return;
TDEAction *cAction = new TDEAction(ctype->title(), "camera-photo", 0,
TQT_TQOBJECT(this), TQT_SLOT(slotCameraConnect()),
this, TQT_SLOT(slotCameraConnect()),
actionCollection(),
ctype->title().utf8());
d->cameraMenuAction->insert(cAction, 0);
@ -1560,7 +1560,7 @@ void DigikamApp::slotCameraMediaMenu()
TDEIO::ListJob *job = TDEIO::listDir(kurl, false, false);
connect( job, TQT_SIGNAL(entries(TDEIO::Job*,const TDEIO::UDSEntryList&)),
TQT_TQOBJECT(this), TQT_SLOT(slotCameraMediaMenuEntries(TDEIO::Job*,const TDEIO::UDSEntryList&)) );
this, TQT_SLOT(slotCameraMediaMenuEntries(TDEIO::Job*,const TDEIO::UDSEntryList&)) );
}
void DigikamApp::slotCameraMediaMenuEntries( Job *, const UDSEntryList & list )
@ -1590,7 +1590,7 @@ void DigikamApp::slotCameraMediaMenuEntries( Job *, const UDSEntryList & list )
d->mediaItems[i] = path;
d->cameraMediaList->insertItem(name, TQT_TQOBJECT(this), TQT_SLOT(slotDownloadImagesFromMedia(int)), 0, i);
d->cameraMediaList->insertItem(name, this, TQT_SLOT(slotDownloadImagesFromMedia(int)), 0, i);
d->cameraMediaList->setItemParameter(i, i);
i++;
}
@ -1620,7 +1620,7 @@ void DigikamApp::slotCameraAutoDetect()
if (!ctype && retry)
{
TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotCameraAutoDetect()));
TQTimer::singleShot(0, this, TQT_SLOT(slotCameraAutoDetect()));
return;
}
@ -1804,7 +1804,7 @@ void DigikamApp::loadPlugins()
d->splashScreen->message(i18n("Loading Kipi Plugins"));
TQStringList ignores;
d->kipiInterface = new DigikamKipiInterface( TQT_TQOBJECT(this), "Digikam_KIPI_interface" );
d->kipiInterface = new DigikamKipiInterface( this, "Digikam_KIPI_interface" );
ignores.append( "HelloWorld" );
ignores.append( "KameraKlient" );
@ -1812,7 +1812,7 @@ void DigikamApp::loadPlugins()
d->kipiPluginLoader = new KIPI::PluginLoader( ignores, d->kipiInterface );
connect( d->kipiPluginLoader, TQT_SIGNAL( replug() ),
TQT_TQOBJECT(this), TQT_SLOT( slotKipiPluginPlug() ) );
this, TQT_SLOT( slotKipiPluginPlug() ) );
d->kipiPluginLoader->loadPlugins();
@ -1821,7 +1821,7 @@ void DigikamApp::loadPlugins()
// Setting the initial menu options after all plugins have been loaded
d->view->slotAlbumSelected(d->albumManager->currentAlbum());
d->imagePluginsLoader = new ImagePluginLoader(TQT_TQOBJECT(this), d->splashScreen);
d->imagePluginsLoader = new ImagePluginLoader(this, d->splashScreen);
}
void DigikamApp::slotKipiPluginPlug()
@ -1925,7 +1925,7 @@ void DigikamApp::loadCameras()
d->cameraMenuAction->popupMenu()->insertSeparator();
d->cameraMenuAction->insert(new TDEAction(i18n("Add Camera..."), 0,
TQT_TQOBJECT(this), TQT_SLOT(slotSetupCamera()),
this, TQT_SLOT(slotSetupCamera()),
actionCollection(),
"camera_add"));
}
@ -1982,7 +1982,7 @@ void DigikamApp::slotRebuildAllThumbs()
BatchThumbsGenerator *thumbsGenerator = new BatchThumbsGenerator(this);
connect(thumbsGenerator, TQT_SIGNAL(signalRebuildAllThumbsDone()),
TQT_TQOBJECT(this), TQT_SLOT(slotRebuildAllThumbsDone()));
this, TQT_SLOT(slotRebuildAllThumbsDone()));
thumbsGenerator->exec();
}
@ -2002,7 +2002,7 @@ void DigikamApp::slotSyncAllPicturesMetadata()
BatchAlbumsSyncMetadata *syncMetadata = new BatchAlbumsSyncMetadata(this);
connect(syncMetadata, TQT_SIGNAL(signalComplete()),
TQT_TQOBJECT(this), TQT_SLOT(slotSyncAllPicturesMetadataDone()));
this, TQT_SLOT(slotSyncAllPicturesMetadataDone()));
syncMetadata->exec();
}

2
digikam/digikam/digikamview.cpp
Unescape Escape View File

@ -1173,7 +1173,7 @@ void DigikamView::slotAlbumSyncPicturesMetadata()
if (!album)
return;
BatchSyncMetadata *syncMetadata = new BatchSyncMetadata(TQT_TQOBJECT(this), album);
BatchSyncMetadata *syncMetadata = new BatchSyncMetadata(this, album);
connect(syncMetadata, TQT_SIGNAL(signalProgressBarMode(int, const TQString&)),
d->parent, TQT_SLOT(slotProgressBarMode(int, const TQString&)));

2
digikam/digikam/kdateedit.cpp
Unescape Escape View File

@ -47,7 +47,7 @@ class DateValidator : public TQValidator
{
public:
DateValidator( const TQStringList &keywords, TQWidget* parent, const char* name = 0 )
: TQValidator( TQT_TQOBJECT(parent), name ), mKeywords( keywords )
: TQValidator( parent, name ), mKeywords( keywords )
{}
virtual State validate( TQString &str, int& ) const

2
digikam/digikam/mediaplayerview.cpp
Unescape Escape View File

@ -187,7 +187,7 @@ void MediaPlayerView::setMediaPlayerFromUrl(const KURL& url)
DDebug() << "Find KPart library " << library << endl;
int error = 0;
d->mediaPlayerPart = KParts::ComponentFactory::createPartInstanceFromService
<KParts::ReadOnlyPart>(service, TQT_TQWIDGET(d->mediaPlayerView), 0, TQT_TQOBJECT(d->mediaPlayerView),
<KParts::ReadOnlyPart>(service, d->mediaPlayerView, 0, d->mediaPlayerView,
0, TQStringList(), &error);
if (!d->mediaPlayerPart)
{

6
digikam/digikam/tagfilterview.cpp
Unescape Escape View File

@ -1134,13 +1134,13 @@ void TagFilterView::tagNew(TagFilterViewItem* item, const TQString& _title, cons
if (title.isNull())
{
if (!TagEditDlg::tagCreate(TQT_TQWIDGET(kapp->activeWindow()), parent, title, icon))
if (!TagEditDlg::tagCreate(kapp->activeWindow(), parent, title, icon))
return;
}
TQMap<TQString, TQString> errMap;
AlbumList tList = TagEditDlg::createTAlbum(parent, title, icon, errMap);
TagEditDlg::showtagsListCreationError(TQT_TQWIDGET(kapp->activeWindow()), errMap);
TagEditDlg::showtagsListCreationError(kapp->activeWindow(), errMap);
for (AlbumList::iterator it = tList.begin(); it != tList.end(); ++it)
{
@ -1165,7 +1165,7 @@ void TagFilterView::tagEdit(TagFilterViewItem* item)
return;
TQString title, icon;
if (!TagEditDlg::tagEdit(TQT_TQWIDGET(kapp->activeWindow()), tag, title, icon))
if (!TagEditDlg::tagEdit(kapp->activeWindow(), tag, title, icon))
{
return;
}

6
digikam/digikam/tagfolderview.cpp
Unescape Escape View File

@ -635,13 +635,13 @@ void TagFolderView::tagNew( TagFolderViewItem *item, const TQString& _title, con
if (title.isNull())
{
if(!TagEditDlg::tagCreate(TQT_TQWIDGET(kapp->activeWindow()), parent, title, icon))
if(!TagEditDlg::tagCreate(kapp->activeWindow(), parent, title, icon))
return;
}
TQMap<TQString, TQString> errMap;
AlbumList tList = TagEditDlg::createTAlbum(parent, title, icon, errMap);
TagEditDlg::showtagsListCreationError(TQT_TQWIDGET(kapp->activeWindow()), errMap);
TagEditDlg::showtagsListCreationError(kapp->activeWindow(), errMap);
for (AlbumList::iterator it = tList.begin(); it != tList.end(); ++it)
{
@ -667,7 +667,7 @@ void TagFolderView::tagEdit(TagFolderViewItem *item)
return;
TQString title, icon;
if(!TagEditDlg::tagEdit(TQT_TQWIDGET(kapp->activeWindow()), tag, title, icon))
if(!TagEditDlg::tagEdit(kapp->activeWindow(), tag, title, icon))
return;
if(tag->title() != title)

4
digikam/digikam/tagspopupmenu.cpp
Unescape Escape View File

@ -346,12 +346,12 @@ void TagsPopupMenu::slotActivated(int id)
}
TQString title, icon;
if (!TagEditDlg::tagCreate(TQT_TQWIDGET(kapp->activeWindow()), parent, title, icon))
if (!TagEditDlg::tagCreate(kapp->activeWindow(), parent, title, icon))
return;
TQMap<TQString, TQString> errMap;
AlbumList tList = TagEditDlg::createTAlbum(parent, title, icon, errMap);
TagEditDlg::showtagsListCreationError(TQT_TQWIDGET(kapp->activeWindow()), errMap);
TagEditDlg::showtagsListCreationError(kapp->activeWindow(), errMap);
for (AlbumList::iterator it = tList.begin(); it != tList.end(); ++it)
emit signalTagActivated((*it)->id());

10
digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp
Unescape Escape View File

@ -679,7 +679,7 @@ void SharpenTool::putFinalData()
void SharpenTool::slotLoadSettings()
{
KURL loadRestorationFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(),
TQString( "*" ), TQT_TQWIDGET(kapp->activeWindow()),
TQString( "*" ), kapp->activeWindow(),
TQString( i18n("Photograph Refocus Settings File to Load")) );
if ( loadRestorationFile.isEmpty() )
return;
@ -691,7 +691,7 @@ void SharpenTool::slotLoadSettings()
TQTextStream stream( &file );
if ( stream.readLine() != "# Photograph Refocus Configuration File" )
{
KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()),
KMessageBox::error(kapp->activeWindow(),
i18n("\"%1\" is not a Photograph Refocus settings text file.")
.arg(loadRestorationFile.fileName()));
file.close();
@ -707,7 +707,7 @@ void SharpenTool::slotLoadSettings()
blockSignals(false);
}
else
KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), i18n("Cannot load settings from the Photograph Refocus text file."));
KMessageBox::error(kapp->activeWindow(), i18n("Cannot load settings from the Photograph Refocus text file."));
file.close();
}
@ -715,7 +715,7 @@ void SharpenTool::slotLoadSettings()
void SharpenTool::slotSaveAsSettings()
{
KURL saveRestorationFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(),
TQString( "*" ), TQT_TQWIDGET(kapp->activeWindow()),
TQString( "*" ), kapp->activeWindow(),
TQString( i18n("Photograph Refocus Settings File to Save")) );
if ( saveRestorationFile.isEmpty() )
return;
@ -733,7 +733,7 @@ void SharpenTool::slotSaveAsSettings()
stream << m_noise->value() << "\n";
}
else
KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), i18n("Cannot save settings to the Photograph Refocus text file."));
KMessageBox::error(kapp->activeWindow(), i18n("Cannot save settings to the Photograph Refocus text file."));
file.close();
}

2
digikam/libs/greycstoration/greycstorationwidget.cpp
Unescape Escape View File

@ -126,7 +126,7 @@ public:
};
GreycstorationWidget::GreycstorationWidget(TQTabWidget *parent)
: TQObject(TQT_TQOBJECT(parent))
: TQObject(parent)
{
d = new GreycstorationWidgetPriv;
d->parent = parent;

6
digikam/libs/imageproperties/imagedescedittab.cpp
Unescape Escape View File

@ -1071,13 +1071,13 @@ void ImageDescEditTab::tagNew(TAlbum* parAlbum, const TQString& _title, const TQ
if (title.isNull())
{
if (!TagEditDlg::tagCreate(TQT_TQWIDGET(TQT_TQWIDGET(kapp->activeWindow())), parAlbum, title, icon))
if (!TagEditDlg::tagCreate(kapp->activeWindow(), parAlbum, title, icon))
return;
}
TQMap<TQString, TQString> errMap;
AlbumList tList = TagEditDlg::createTAlbum(parAlbum, title, icon, errMap);
TagEditDlg::showtagsListCreationError(TQT_TQWIDGET(kapp->activeWindow()), errMap);
TagEditDlg::showtagsListCreationError(kapp->activeWindow(), errMap);
for (AlbumList::iterator it = tList.begin(); it != tList.end(); ++it)
{
@ -1171,7 +1171,7 @@ void ImageDescEditTab::tagEdit(TAlbum* album)
TQString title;
TQString icon;
if (!TagEditDlg::tagEdit(TQT_TQWIDGET(kapp->activeWindow()), album, title, icon))
if (!TagEditDlg::tagEdit(kapp->activeWindow(), album, title, icon))
return;
AlbumManager *albumMan = AlbumManager::instance();

2
digikam/libs/widgets/common/curveswidget.cpp
Unescape Escape View File

@ -168,7 +168,7 @@ void CurvesWidget::updateData(uchar *i_data, uint i_w, uint i_h, bool i_sixteenB
delete m_imageHistogram;
// Calc new histogram data
m_imageHistogram = new ImageHistogram(i_data, i_w, i_h, i_sixteenBits, TQT_TQOBJECT(this));
m_imageHistogram = new ImageHistogram(i_data, i_w, i_h, i_sixteenBits, this);
if (d->curves)
delete d->curves;

2
digikam/libs/widgets/common/dcursortracker.cpp
Unescape Escape View File

@ -58,7 +58,7 @@ void DCursorTracker::setEnable(bool b)
bool DCursorTracker::eventFilter(TQObject *object, TQEvent *e)
{
TQWidget *widget = TQT_TQWIDGET(object);
TQWidget *widget = static_cast<TQWidget*>(object);
switch (e->type())
{

22
digikam/libs/widgets/common/histogramwidget.cpp
Unescape Escape View File

@ -134,7 +134,7 @@ HistogramWidget::HistogramWidget(int w, int h,
d->sixteenBits = i_sixteenBits;
setup(w, h, selectMode, showProgress, statisticsVisible);
m_imageHistogram = new ImageHistogram(i_data, i_w, i_h, i_sixteenBits, TQT_TQOBJECT(this));
m_imageHistogram = new ImageHistogram(i_data, i_w, i_h, i_sixteenBits, this);
m_selectionHistogram = 0L;
}
@ -152,8 +152,8 @@ HistogramWidget::HistogramWidget(int w, int h,
d->sixteenBits = i_sixteenBits;
setup(w, h, selectMode, showProgress, statisticsVisible);
m_imageHistogram = new ImageHistogram(i_data, i_w, i_h, i_sixteenBits, TQT_TQOBJECT(this));
m_selectionHistogram = new ImageHistogram(s_data, s_w, s_h, i_sixteenBits, TQT_TQOBJECT(this));
m_imageHistogram = new ImageHistogram(i_data, i_w, i_h, i_sixteenBits, this);
m_selectionHistogram = new ImageHistogram(s_data, s_w, s_h, i_sixteenBits, this);
}
HistogramWidget::~HistogramWidget()
@ -340,10 +340,10 @@ void HistogramWidget::updateData(uchar *i_data, uint i_w, uint i_h,
delete m_selectionHistogram;
// Calc new histogram data
m_imageHistogram = new ImageHistogram(i_data, i_w, i_h, i_sixteenBits, TQT_TQOBJECT(this));
m_imageHistogram = new ImageHistogram(i_data, i_w, i_h, i_sixteenBits, this);
if (s_data && s_w && s_h)
m_selectionHistogram = new ImageHistogram(s_data, s_w, s_h, i_sixteenBits, TQT_TQOBJECT(this));
m_selectionHistogram = new ImageHistogram(s_data, s_w, s_h, i_sixteenBits, this);
else
m_selectionHistogram = 0L;
}
@ -360,7 +360,7 @@ void HistogramWidget::updateSelectionData(uchar *s_data, uint s_w, uint s_h,
delete m_selectionHistogram;
// Calc new histogram data
m_selectionHistogram = new ImageHistogram(s_data, s_w, s_h, i_sixteenBits, TQT_TQOBJECT(this));
m_selectionHistogram = new ImageHistogram(s_data, s_w, s_h, i_sixteenBits, this);
}
void HistogramWidget::slotBlinkTimerDone()
@ -383,7 +383,7 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
{
TQPixmap pm(size());
TQPainter p1;
p1.begin(&pm, TQT_TQOBJECT(this));
p1.begin(&pm, this);
p1.fillRect(0, 0, size().width(), size().height(), palette().disabled().background());
p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
p1.drawRect(0, 0, width(), height());
@ -405,7 +405,7 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
int asize = 24;
TQPixmap anim(asize, asize);
TQPainter p2;
p2.begin(&anim, TQT_TQOBJECT(this));
p2.begin(&anim, this);
p2.fillRect(0, 0, asize, asize, palette().active().background());
p2.translate(asize/2, asize/2);
@ -423,7 +423,7 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
TQPixmap pm(size());
TQPainter p1;
p1.begin(&pm, TQT_TQOBJECT(this));
p1.begin(&pm, this);
p1.fillRect(0, 0, width(), height(), palette().active().background());
p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
p1.drawRect(0, 0, width(), height());
@ -447,7 +447,7 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
{
TQPixmap pm(size());
TQPainter p1;
p1.begin(&pm, TQT_TQOBJECT(this));
p1.begin(&pm, this);
p1.fillRect(0, 0, width(), height(), palette().active().background());
p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
p1.drawRect(0, 0, width(), height());
@ -524,7 +524,7 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
TQPixmap pm(size());
TQPainter p1;
p1.begin(&pm, TQT_TQOBJECT(this));
p1.begin(&pm, this);
p1.fillRect(0, 0, width(), height(), palette().active().background());
// Drawing selection or all histogram values.

2
digikam/libs/widgets/iccprofiles/cietonguewidget.cpp
Unescape Escape View File

@ -724,7 +724,7 @@ void CIETongueWidget::paintEvent(TQPaintEvent*)
int asize = 24;
TQPixmap anim(asize, asize);
TQPainter p2;
p2.begin(&anim, TQT_TQOBJECT(this));
p2.begin(&anim, this);
p2.fillRect(0, 0, asize, asize, palette().active().background());
p2.translate(asize/2, asize/2);

30
digikam/showfoto/showfoto.cpp
Unescape Escape View File

@ -204,7 +204,7 @@ ShowFoto::ShowFoto(const KURL::List& urlList)
// Load image plugins to GUI
m_imagePluginLoader = new Digikam::ImagePluginLoader(TQT_TQOBJECT(this), d->splash);
m_imagePluginLoader = new Digikam::ImagePluginLoader(this, d->splash);
loadImagePlugins();
// If plugin core is not available, plug BCG actions to collection instead.
@ -215,22 +215,22 @@ ShowFoto::ShowFoto(const KURL::List& urlList)
d->BCGAction->setDelayed(false);
TDEAction *incGammaAction = new TDEAction(i18n("Increase Gamma"), 0, ALT+Key_G,
TQT_TQOBJECT(this), TQT_SLOT(slotChangeBCG()),
this, TQT_SLOT(slotChangeBCG()),
actionCollection(), "gamma_plus");
TDEAction *decGammaAction = new TDEAction(i18n("Decrease Gamma"), 0, ALT+SHIFT+Key_G,
TQT_TQOBJECT(this), TQT_SLOT(slotChangeBCG()),
this, TQT_SLOT(slotChangeBCG()),
actionCollection(), "gamma_minus");
TDEAction *incBrightAction = new TDEAction(i18n("Increase Brightness"), 0, ALT+Key_B,
TQT_TQOBJECT(this), TQT_SLOT(slotChangeBCG()),
this, TQT_SLOT(slotChangeBCG()),
actionCollection(), "brightness_plus");
TDEAction *decBrightAction = new TDEAction(i18n("Decrease Brightness"), 0, ALT+SHIFT+Key_B,
TQT_TQOBJECT(this), TQT_SLOT(slotChangeBCG()),
this, TQT_SLOT(slotChangeBCG()),
actionCollection(), "brightness_minus");
TDEAction *incContrastAction = new TDEAction(i18n("Increase Contrast"), 0, ALT+Key_C,
TQT_TQOBJECT(this), TQT_SLOT(slotChangeBCG()),
this, TQT_SLOT(slotChangeBCG()),
actionCollection(), "contrast_plus");
TDEAction *decContrastAction = new TDEAction(i18n("Decrease Contrast"), 0, ALT+SHIFT+Key_C,
TQT_TQOBJECT(this), TQT_SLOT(slotChangeBCG()),
this, TQT_SLOT(slotChangeBCG()),
actionCollection(), "contrast_minus");
d->BCGAction->insert(incBrightAction);
@ -393,10 +393,10 @@ void ShowFoto::setupConnections()
setupStandardConnections();
connect(d->thumbBar, TQT_SIGNAL(signalURLSelected(const KURL&)),
TQT_TQOBJECT(this), TQT_SLOT(slotOpenURL(const KURL&)));
this, TQT_SLOT(slotOpenURL(const KURL&)));
connect(d->thumbBar, TQT_SIGNAL(signalItemAdded()),
TQT_TQOBJECT(this), TQT_SLOT(slotUpdateItemInfo()));
this, TQT_SLOT(slotUpdateItemInfo()));
connect(this, TQT_SIGNAL(signalSelectionChanged(const TQRect &)),
d->rightSidebar, TQT_SLOT(slotImageSelectionChanged(const TQRect &)));
@ -478,24 +478,24 @@ void ShowFoto::setupActions()
// Extra 'File' menu actions ---------------------------------------------
d->fileOpenAction = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotOpenFile()),
d->fileOpenAction = KStdAction::open(this, TQT_SLOT(slotOpenFile()),
actionCollection(), "showfoto_open_file");
d->openFilesInFolderAction = new TDEAction(i18n("Open folder"),
"folder_image",
CTRL+SHIFT+Key_O,
TQT_TQOBJECT(this),
this,
TQT_SLOT(slotOpenFilesInFolder()),
actionCollection(),
"showfoto_open_folder");
KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection(), "showfoto_quit");
KStdAction::quit(this, TQT_SLOT(close()), actionCollection(), "showfoto_quit");
// Extra 'View' menu actions ---------------------------------------------
d->showBarAction = new TDEToggleAction(i18n("Show Thumbnails"), 0,
CTRL+Key_T,
TQT_TQOBJECT(this), TQT_SLOT(slotToggleShowBar()),
this, TQT_SLOT(slotToggleShowBar()),
actionCollection(), "shofoto_showthumbs");
// --- Create the gui --------------------------------------------------------------
@ -1115,7 +1115,7 @@ void ShowFoto::slotDeleteCurrentItem()
{
TDEIO::Job* job = TDEIO::del( urlCurrent );
connect( job, TQT_SIGNAL(result( TDEIO::Job* )),
TQT_TQOBJECT(this), TQT_SLOT(slotDeleteCurrentItemResult( TDEIO::Job*)) );
this, TQT_SLOT(slotDeleteCurrentItemResult( TDEIO::Job*)) );
}
}
else
@ -1129,7 +1129,7 @@ void ShowFoto::slotDeleteCurrentItem()
TDEIO::Job* job = TDEIO::move( urlCurrent, dest );
connect( job, TQT_SIGNAL(result( TDEIO::Job* )),
TQT_TQOBJECT(this), TQT_SLOT(slotDeleteCurrentItemResult( TDEIO::Job*)) );
this, TQT_SLOT(slotDeleteCurrentItemResult( TDEIO::Job*)) );
}
}

4
digikam/utilities/cameragui/albumselectdialog.cpp
Unescape Escape View File

@ -276,9 +276,9 @@ void AlbumSelectDialog::slotContextMenu(TQListViewItem *, const TQPoint &, int)
{
TQPopupMenu popmenu(d->folderView);
TDEAction *action = new TDEAction(i18n( "Create New Album" ),
"albumfolder-new", 0, TQT_TQOBJECT(this),
"albumfolder-new", 0, this,
TQT_SLOT( slotUser1() ),
TQT_TQOBJECT(&popmenu));
&popmenu);
action->plug(&popmenu);
popmenu.exec(TQCursor::pos());
}

164
digikam/utilities/imageeditor/editor/editorwindow.cpp
Unescape Escape View File

@ -184,71 +184,71 @@ void EditorWindow::setupStandardConnections()
// -- Canvas connections ------------------------------------------------
connect(m_canvas, TQT_SIGNAL(signalToggleOffFitToWindow()),
TQT_TQOBJECT(this), TQT_SLOT(slotToggleOffFitToWindow()));
this, TQT_SLOT(slotToggleOffFitToWindow()));
connect(m_canvas, TQT_SIGNAL(signalShowNextImage()),
TQT_TQOBJECT(this), TQT_SLOT(slotForward()));
this, TQT_SLOT(slotForward()));
connect(m_canvas, TQT_SIGNAL(signalShowPrevImage()),
TQT_TQOBJECT(this), TQT_SLOT(slotBackward()));
this, TQT_SLOT(slotBackward()));
connect(m_canvas, TQT_SIGNAL(signalRightButtonClicked()),
TQT_TQOBJECT(this), TQT_SLOT(slotContextMenu()));
this, TQT_SLOT(slotContextMenu()));
connect(m_stackView, TQT_SIGNAL(signalZoomChanged(bool, bool, double)),
TQT_TQOBJECT(this), TQT_SLOT(slotZoomChanged(bool, bool, double)));
this, TQT_SLOT(slotZoomChanged(bool, bool, double)));
connect(m_canvas, TQT_SIGNAL(signalChanged()),
TQT_TQOBJECT(this), TQT_SLOT(slotChanged()));
this, TQT_SLOT(slotChanged()));
connect(m_canvas, TQT_SIGNAL(signalUndoStateChanged(bool, bool, bool)),
TQT_TQOBJECT(this), TQT_SLOT(slotUndoStateChanged(bool, bool, bool)));
this, TQT_SLOT(slotUndoStateChanged(bool, bool, bool)));
connect(m_canvas, TQT_SIGNAL(signalSelected(bool)),
TQT_TQOBJECT(this), TQT_SLOT(slotSelected(bool)));
this, TQT_SLOT(slotSelected(bool)));
connect(m_canvas, TQT_SIGNAL(signalPrepareToLoad()),
TQT_TQOBJECT(this), TQT_SLOT(slotPrepareToLoad()));
this, TQT_SLOT(slotPrepareToLoad()));
connect(m_canvas, TQT_SIGNAL(signalLoadingStarted(const TQString &)),
TQT_TQOBJECT(this), TQT_SLOT(slotLoadingStarted(const TQString &)));
this, TQT_SLOT(slotLoadingStarted(const TQString &)));
connect(m_canvas, TQT_SIGNAL(signalLoadingFinished(const TQString &, bool)),
TQT_TQOBJECT(this), TQT_SLOT(slotLoadingFinished(const TQString &, bool)));
this, TQT_SLOT(slotLoadingFinished(const TQString &, bool)));
connect(m_canvas, TQT_SIGNAL(signalLoadingProgress(const TQString &, float)),
TQT_TQOBJECT(this), TQT_SLOT(slotLoadingProgress(const TQString &, float)));
this, TQT_SLOT(slotLoadingProgress(const TQString &, float)));
connect(m_canvas, TQT_SIGNAL(signalSavingStarted(const TQString&)),
TQT_TQOBJECT(this), TQT_SLOT(slotSavingStarted(const TQString&)));
this, TQT_SLOT(slotSavingStarted(const TQString&)));
connect(m_canvas, TQT_SIGNAL(signalSavingFinished(const TQString&, bool)),
TQT_TQOBJECT(this), TQT_SLOT(slotSavingFinished(const TQString&, bool)));
this, TQT_SLOT(slotSavingFinished(const TQString&, bool)));
connect(m_canvas, TQT_SIGNAL(signalSavingProgress(const TQString&, float)),
TQT_TQOBJECT(this), TQT_SLOT(slotSavingProgress(const TQString&, float)));
this, TQT_SLOT(slotSavingProgress(const TQString&, float)));
connect(m_canvas, TQT_SIGNAL(signalSelectionChanged(const TQRect&)),
TQT_TQOBJECT(this), TQT_SLOT(slotSelectionChanged(const TQRect&)));
this, TQT_SLOT(slotSelectionChanged(const TQRect&)));
// -- if rotating/flipping set the rotatedflipped flag to true -----------
connect(d->rotateLeftAction, TQT_SIGNAL(activated()),
TQT_TQOBJECT(this), TQT_SLOT(slotRotatedOrFlipped()));
this, TQT_SLOT(slotRotatedOrFlipped()));
connect(d->rotateRightAction, TQT_SIGNAL(activated()),
TQT_TQOBJECT(this), TQT_SLOT(slotRotatedOrFlipped()));
this, TQT_SLOT(slotRotatedOrFlipped()));
connect(d->flipHorizAction, TQT_SIGNAL(activated()),
TQT_TQOBJECT(this), TQT_SLOT(slotRotatedOrFlipped()));
this, TQT_SLOT(slotRotatedOrFlipped()));
connect(d->flipVertAction, TQT_SIGNAL(activated()),
TQT_TQOBJECT(this), TQT_SLOT(slotRotatedOrFlipped()));
this, TQT_SLOT(slotRotatedOrFlipped()));
// -- status bar connections --------------------------------------
connect(m_nameLabel, TQT_SIGNAL(signalCancelButtonPressed()),
TQT_TQOBJECT(this), TQT_SLOT(slotNameLabelCancelButtonPressed()));
this, TQT_SLOT(slotNameLabelCancelButtonPressed()));
connect(m_nameLabel, TQT_SIGNAL(signalCancelButtonPressed()),
d->toolIface, TQT_SLOT(slotToolAborted()));
@ -258,29 +258,29 @@ void EditorWindow::setupStandardActions()
{
// -- Standard 'File' menu actions ---------------------------------------------
m_backwardAction = KStdAction::back(TQT_TQOBJECT(this), TQT_SLOT(slotBackward()),
m_backwardAction = KStdAction::back(this, TQT_SLOT(slotBackward()),
actionCollection(), "editorwindow_backward");
m_forwardAction = KStdAction::forward(TQT_TQOBJECT(this), TQT_SLOT(slotForward()),
m_forwardAction = KStdAction::forward(this, TQT_SLOT(slotForward()),
actionCollection(), "editorwindow_forward");
m_firstAction = new TDEAction(i18n("&First"), "go-first",
TDEStdAccel::shortcut( TDEStdAccel::Home),
TQT_TQOBJECT(this), TQT_SLOT(slotFirst()),
this, TQT_SLOT(slotFirst()),
actionCollection(), "editorwindow_first");
m_lastAction = new TDEAction(i18n("&Last"), "go-last",
TDEStdAccel::shortcut( TDEStdAccel::End),
TQT_TQOBJECT(this), TQT_SLOT(slotLast()),
this, TQT_SLOT(slotLast()),
actionCollection(), "editorwindow_last");
m_saveAction = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotSave()),
m_saveAction = KStdAction::save(this, TQT_SLOT(slotSave()),
actionCollection(), "editorwindow_save");
m_saveAsAction = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs()),
m_saveAsAction = KStdAction::saveAs(this, TQT_SLOT(slotSaveAs()),
actionCollection(), "editorwindow_saveas");
m_revertAction = KStdAction::revert(TQT_TQOBJECT(this), TQT_SLOT(slotRevert()),
m_revertAction = KStdAction::revert(this, TQT_SLOT(slotRevert()),
actionCollection(), "editorwindow_revert");
m_saveAction->setEnabled(false);
@ -289,53 +289,53 @@ void EditorWindow::setupStandardActions()
d->filePrintAction = new TDEAction(i18n("Print Image..."), "document-print",
CTRL+Key_P,
TQT_TQOBJECT(this), TQT_SLOT(slotFilePrint()),
this, TQT_SLOT(slotFilePrint()),
actionCollection(), "editorwindow_print");
m_fileDeleteAction = new TDEAction(i18n("Move to Trash"), "edittrash",
Key_Delete,
TQT_TQOBJECT(this), TQT_SLOT(slotDeleteCurrentItem()),
this, TQT_SLOT(slotDeleteCurrentItem()),
actionCollection(), "editorwindow_delete");
KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection(), "editorwindow_close");
KStdAction::close(this, TQT_SLOT(close()), actionCollection(), "editorwindow_close");
// -- Standard 'Edit' menu actions ---------------------------------------------
d->copyAction = KStdAction::copy(TQT_TQOBJECT(m_canvas), TQT_SLOT(slotCopy()),
d->copyAction = KStdAction::copy(m_canvas, TQT_SLOT(slotCopy()),
actionCollection(), "editorwindow_copy");
d->copyAction->setEnabled(false);
m_undoAction = new TDEToolBarPopupAction(i18n("Undo"), "edit-undo",
TDEStdAccel::shortcut(TDEStdAccel::Undo),
TQT_TQOBJECT(m_canvas), TQT_SLOT(slotUndo()),
m_canvas, TQT_SLOT(slotUndo()),
actionCollection(), "editorwindow_undo");
connect(m_undoAction->popupMenu(), TQT_SIGNAL(aboutToShow()),
TQT_TQOBJECT(this), TQT_SLOT(slotAboutToShowUndoMenu()));
this, TQT_SLOT(slotAboutToShowUndoMenu()));
connect(m_undoAction->popupMenu(), TQT_SIGNAL(activated(int)),
TQT_TQOBJECT(m_canvas), TQT_SLOT(slotUndo(int)));
m_canvas, TQT_SLOT(slotUndo(int)));
m_undoAction->setEnabled(false);
m_redoAction = new TDEToolBarPopupAction(i18n("Redo"), "edit-redo",
TDEStdAccel::shortcut(TDEStdAccel::Redo),
TQT_TQOBJECT(m_canvas), TQT_SLOT(slotRedo()),
m_canvas, TQT_SLOT(slotRedo()),
actionCollection(), "editorwindow_redo");
connect(m_redoAction->popupMenu(), TQT_SIGNAL(aboutToShow()),
TQT_TQOBJECT(this), TQT_SLOT(slotAboutToShowRedoMenu()));
this, TQT_SLOT(slotAboutToShowRedoMenu()));
connect(m_redoAction->popupMenu(), TQT_SIGNAL(activated(int)),
TQT_TQOBJECT(m_canvas), TQT_SLOT(slotRedo(int)));
m_canvas, TQT_SLOT(slotRedo(int)));
m_redoAction->setEnabled(false);
d->selectAllAction = new TDEAction(i18n("Select All"),
0,
CTRL+Key_A,
TQT_TQOBJECT(m_canvas),
m_canvas,
TQT_SLOT(slotSelectAll()),
actionCollection(),
"editorwindow_selectAll");
@ -343,32 +343,32 @@ void EditorWindow::setupStandardActions()
d->selectNoneAction = new TDEAction(i18n("Select None"),
0,
CTRL+SHIFT+Key_A,
TQT_TQOBJECT(m_canvas),
m_canvas,
TQT_SLOT(slotSelectNone()),
actionCollection(),
"editorwindow_selectNone");
// -- Standard 'View' menu actions ---------------------------------------------
d->zoomPlusAction = KStdAction::zoomIn(TQT_TQOBJECT(this), TQT_SLOT(slotIncreaseZoom()),
d->zoomPlusAction = KStdAction::zoomIn(this, TQT_SLOT(slotIncreaseZoom()),
actionCollection(), "editorwindow_zoomplus");
d->zoomMinusAction = KStdAction::zoomOut(TQT_TQOBJECT(this), TQT_SLOT(slotDecreaseZoom()),
d->zoomMinusAction = KStdAction::zoomOut(this, TQT_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.
TQT_TQOBJECT(this), TQT_SLOT(slotZoomTo100Percents()),
this, TQT_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.
TQT_TQOBJECT(this), TQT_SLOT(slotToggleFitToWindow()),
this, TQT_SLOT(slotToggleFitToWindow()),
actionCollection(), "editorwindow_zoomfit2window");
d->zoomFitToSelectAction = new TDEAction(i18n("Fit to &Selection"), "zoom-fit-best",
ALT+CTRL+Key_S, TQT_TQOBJECT(this), TQT_SLOT(slotFitToSelect()),
ALT+CTRL+Key_S, this, TQT_SLOT(slotFitToSelect()),
actionCollection(), "editorwindow_zoomfit2select");
d->zoomFitToSelectAction->setEnabled(false);
d->zoomFitToSelectAction->setWhatsThis(i18n("This option can be used to zoom the image to the "
@ -395,46 +395,46 @@ void EditorWindow::setupStandardActions()
d->zoomCombo->insertItem(TQString("1200%"));
connect(d->zoomCombo, TQT_SIGNAL(activated(int)),
TQT_TQOBJECT(this), TQT_SLOT(slotZoomSelected()) );
this, TQT_SLOT(slotZoomSelected()) );
connect(d->zoomCombo, TQT_SIGNAL(returnPressed(const TQString&)),
TQT_TQOBJECT(this), TQT_SLOT(slotZoomTextChanged(const TQString &)) );
this, TQT_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, TQT_TQOBJECT(this),
CTRL+SHIFT+Key_F, this,
TQT_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,
TQT_TQOBJECT(this), TQT_SLOT(slotToggleSlideShow()),
this, TQT_SLOT(slotToggleSlideShow()),
actionCollection(),"editorwindow_slideshow");
d->viewUnderExpoAction = new TDEToggleAction(i18n("Under-Exposure Indicator"), "underexposure",
Key_F10, TQT_TQOBJECT(this),
Key_F10, this,
TQT_SLOT(slotToggleUnderExposureIndicator()),
actionCollection(),"editorwindow_underexposure");
d->viewOverExpoAction = new TDEToggleAction(i18n("Over-Exposure Indicator"), "overexposure",
Key_F11, TQT_TQOBJECT(this),
Key_F11, this,
TQT_SLOT(slotToggleOverExposureIndicator()),
actionCollection(),"editorwindow_overexposure");
d->viewCMViewAction = new TDEToggleAction(i18n("Color Managed View"), "tv",
Key_F12, TQT_TQOBJECT(this),
Key_F12, this,
TQT_SLOT(slotToggleColorManagedView()),
actionCollection(),"editorwindow_cmview");
// -- Standard 'Transform' menu actions ---------------------------------------------
d->resizeAction = new TDEAction(i18n("&Resize..."), "resize_image", 0,
TQT_TQOBJECT(this), TQT_SLOT(slotResize()),
this, TQT_SLOT(slotResize()),
actionCollection(), "editorwindow_resize");
d->cropAction = new TDEAction(i18n("Crop"), "crop",
CTRL+Key_X,
TQT_TQOBJECT(m_canvas), TQT_SLOT(slotCrop()),
m_canvas, TQT_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,
TQT_TQOBJECT(m_canvas), TQT_SLOT(slotFlipHoriz()),
m_canvas, TQT_SLOT(slotFlipHoriz()),
actionCollection(), "editorwindow_flip_horiz");
d->flipHorizAction->setEnabled(false);
d->flipVertAction = new TDEAction(i18n("Flip Vertically"), "flip", CTRL+Key_Slash,
TQT_TQOBJECT(m_canvas), TQT_SLOT(slotFlipVert()),
m_canvas, TQT_SLOT(slotFlipVert()),
actionCollection(), "editorwindow_flip_vert");
d->flipVertAction->setEnabled(false);
@ -457,24 +457,24 @@ void EditorWindow::setupStandardActions()
d->rotateLeftAction = new TDEAction(i18n("Rotate Left"),
"object-rotate-left", SHIFT+CTRL+Key_Left,
TQT_TQOBJECT(m_canvas), TQT_SLOT(slotRotate270()),
m_canvas, TQT_SLOT(slotRotate270()),
actionCollection(),
"editorwindow_rotate_left");
d->rotateLeftAction->setEnabled(false);
d->rotateRightAction = new TDEAction(i18n("Rotate Right"),
"object-rotate-right", SHIFT+CTRL+Key_Right,
TQT_TQOBJECT(m_canvas), TQT_SLOT(slotRotate90()),
m_canvas, TQT_SLOT(slotRotate90()),
actionCollection(),
"editorwindow_rotate_right");
d->rotateRightAction->setEnabled(false);
// -- Standard 'Configure' menu actions ----------------------------------------
d->showMenuBarAction = KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(slotShowMenuBar()), actionCollection());
d->showMenuBarAction = KStdAction::showMenubar(this, TQT_SLOT(slotShowMenuBar()), actionCollection());
KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotEditKeys()), actionCollection());
KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfToolbars()), actionCollection());
KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotSetup()), actionCollection());
KStdAction::keyBindings(this, TQT_SLOT(slotEditKeys()), actionCollection());
KStdAction::configureToolbars(this, TQT_SLOT(slotConfToolbars()), actionCollection());
KStdAction::preferences(this, TQT_SLOT(slotSetup()), actionCollection());
// -----------------------------------------------------------------------------------------
@ -482,29 +482,29 @@ void EditorWindow::setupStandardActions()
m_themeMenuAction->setItems(ThemeEngine::instance()->themeNames());
connect(m_themeMenuAction, TQT_SIGNAL(activated(const TQString&)),
TQT_TQOBJECT(this), TQT_SLOT(slotChangeTheme(const TQString&)));
this, TQT_SLOT(slotChangeTheme(const TQString&)));
connect(ThemeEngine::instance(), TQT_SIGNAL(signalThemeChanged()),
TQT_TQOBJECT(this), TQT_SLOT(slotThemeChanged()));
this, TQT_SLOT(slotThemeChanged()));
// -- Standard 'Help' menu actions ---------------------------------------------
d->donateMoneyAction = new TDEAction(i18n("Donate..."),
0, 0,
TQT_TQOBJECT(this), TQT_SLOT(slotDonateMoney()),
this, TQT_SLOT(slotDonateMoney()),
actionCollection(),
"editorwindow_donatemoney");
d->contributeAction = new TDEAction(i18n("Contribute..."),
0, 0,
TQT_TQOBJECT(this), TQT_SLOT(slotContribute()),
this, TQT_SLOT(slotContribute()),
actionCollection(),
"editorwindow_contribute");
d->rawCameraListAction = new TDEAction(i18n("Supported RAW Cameras"),
"kdcraw",
0,
TQT_TQOBJECT(this),
this,
TQT_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, TQT_TQOBJECT(this), TQT_SLOT(slotEscapePressed()),
Key_Escape, this, TQT_SLOT(slotEscapePressed()),
false, true);
d->accelerators->insert("Next Image Key_Space", i18n("Next Image"),
i18n("Load Next Image"),
Key_Space, TQT_TQOBJECT(this), TQT_SLOT(slotForward()),
Key_Space, this, TQT_SLOT(slotForward()),
false, true);
d->accelerators->insert("Previous Image SHIFT+Key_Space", i18n("Previous Image"),
i18n("Load Previous Image"),
SHIFT+Key_Space, TQT_TQOBJECT(this), TQT_SLOT(slotBackward()),
SHIFT+Key_Space, this, TQT_SLOT(slotBackward()),
false, true);
d->accelerators->insert("Previous Image Key_Backspace", i18n("Previous Image"),
i18n("Load Previous Image"),
Key_Backspace, TQT_TQOBJECT(this), TQT_SLOT(slotBackward()),
Key_Backspace, this, TQT_SLOT(slotBackward()),
false, true);
d->accelerators->insert("Next Image Key_Next", i18n("Next Image"),
i18n("Load Next Image"),
Key_Next, TQT_TQOBJECT(this), TQT_SLOT(slotForward()),
Key_Next, this, TQT_SLOT(slotForward()),
false, true);
d->accelerators->insert("Previous Image Key_Prior", i18n("Previous Image"),
i18n("Load Previous Image"),
Key_Prior, TQT_TQOBJECT(this), TQT_SLOT(slotBackward()),
Key_Prior, this, TQT_SLOT(slotBackward()),
false, true);
d->accelerators->insert("Zoom Plus Key_Plus", i18n("Zoom In"),
i18n("Zoom in on Image"),
Key_Plus, TQT_TQOBJECT(this), TQT_SLOT(slotIncreaseZoom()),
Key_Plus, this, TQT_SLOT(slotIncreaseZoom()),
false, true);
d->accelerators->insert("Zoom Plus Key_Minus", i18n("Zoom Out"),
i18n("Zoom out of Image"),
Key_Minus, TQT_TQOBJECT(this), TQT_SLOT(slotDecreaseZoom()),
Key_Minus, this, TQT_SLOT(slotDecreaseZoom()),
false, true);
d->accelerators->insert("Redo CTRL+Key_Y", i18n("Redo"),
i18n("Redo Last action"),
CTRL+Key_Y, TQT_TQOBJECT(m_canvas), TQT_SLOT(slotRedo()),
CTRL+Key_Y, m_canvas, TQT_SLOT(slotRedo()),
false, true);
}
@ -595,13 +595,13 @@ void EditorWindow::setupStatusBar()
statusBar()->addWidget(d->cmViewIndicator, 1);
connect(d->underExposureIndicator, TQT_SIGNAL(toggled(bool)),
TQT_TQOBJECT(this), TQT_SLOT(slotToggleUnderExposureIndicator()));
this, TQT_SLOT(slotToggleUnderExposureIndicator()));
connect(d->overExposureIndicator, TQT_SIGNAL(toggled(bool)),
TQT_TQOBJECT(this), TQT_SLOT(slotToggleOverExposureIndicator()));
this, TQT_SLOT(slotToggleOverExposureIndicator()));
connect(d->cmViewIndicator, TQT_SIGNAL(toggled(bool)),
TQT_TQOBJECT(this), TQT_SLOT(slotToggleColorManagedView()));
this, TQT_SLOT(slotToggleColorManagedView()));
}
void EditorWindow::printImage(KURL url)
@ -703,7 +703,7 @@ void EditorWindow::slotConfToolbars()
KEditToolbar dlg(factory(), this);
connect(&dlg, TQT_SIGNAL(newToolbarConfig()),
TQT_TQOBJECT(this), TQT_SLOT(slotNewToolbarConfig()));
this, TQT_SLOT(slotNewToolbarConfig()));
dlg.exec();
}
@ -1054,7 +1054,7 @@ void EditorWindow::slotToggleFullScreen()
if (obj)
{
TDEToolBar* toolBar = static_cast<TDEToolBar*>(TQT_TQWIDGET(obj));
TDEToolBar* toolBar = static_cast<TDEToolBar*>(obj);
if (m_fullScreenAction->isPlugged(toolBar) && d->removeFullScreenButton)
m_fullScreenAction->unplug(toolBar);
@ -1100,7 +1100,7 @@ void EditorWindow::slotToggleFullScreen()
if (obj)
{
TDEToolBar* toolBar = static_cast<TDEToolBar*>(TQT_TQWIDGET(obj));
TDEToolBar* toolBar = static_cast<TDEToolBar*>(obj);
if (d->fullScreenHideToolBar)
{

32
digikam/utilities/imageeditor/editor/imagewindow.cpp
Unescape Escape View File

@ -254,10 +254,10 @@ void ImageWindow::setupConnections()
// To toggle properly keyboards shortcuts from comments & tags side bar tab.
connect(d->rightSidebar, TQT_SIGNAL(signalNextItem()),
TQT_TQOBJECT(this), TQT_SLOT(slotForward()));
this, TQT_SLOT(slotForward()));
connect(d->rightSidebar, TQT_SIGNAL(signalPrevItem()),
TQT_TQOBJECT(this), TQT_SLOT(slotBackward()));
this, TQT_SLOT(slotBackward()));
connect(this, TQT_SIGNAL(signalSelectionChanged( const TQRect &)),
d->rightSidebar, TQT_SLOT(slotImageSelectionChanged( const TQRect &)));
@ -268,7 +268,7 @@ void ImageWindow::setupConnections()
ImageAttributesWatch *watch = ImageAttributesWatch::instance();
connect(watch, TQT_SIGNAL(signalFileMetadataChanged(const KURL &)),
TQT_TQOBJECT(this), TQT_SLOT(slotFileMetadataChanged(const KURL &)));
this, TQT_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,
TQT_TQOBJECT(this), TQT_SLOT(slotAssignRatingNoStar()),
this, TQT_SLOT(slotAssignRatingNoStar()),
actionCollection(), "imageview_ratenostar");
d->star1 = new TDEAction(i18n("Assign Rating \"One Star\""), CTRL+Key_1,
TQT_TQOBJECT(this), TQT_SLOT(slotAssignRatingOneStar()),
this, TQT_SLOT(slotAssignRatingOneStar()),
actionCollection(), "imageview_rateonestar");
d->star2 = new TDEAction(i18n("Assign Rating \"Two Stars\""), CTRL+Key_2,
TQT_TQOBJECT(this), TQT_SLOT(slotAssignRatingTwoStar()),
this, TQT_SLOT(slotAssignRatingTwoStar()),
actionCollection(), "imageview_ratetwostar");
d->star3 = new TDEAction(i18n("Assign Rating \"Three Stars\""), CTRL+Key_3,
TQT_TQOBJECT(this), TQT_SLOT(slotAssignRatingThreeStar()),
this, TQT_SLOT(slotAssignRatingThreeStar()),
actionCollection(), "imageview_ratethreestar");
d->star4 = new TDEAction(i18n("Assign Rating \"Four Stars\""), CTRL+Key_4,
TQT_TQOBJECT(this), TQT_SLOT(slotAssignRatingFourStar()),
this, TQT_SLOT(slotAssignRatingFourStar()),
actionCollection(), "imageview_ratefourstar");
d->star5 = new TDEAction(i18n("Assign Rating \"Five Stars\""), CTRL+Key_5,
TQT_TQOBJECT(this), TQT_SLOT(slotAssignRatingFiveStar()),
this, TQT_SLOT(slotAssignRatingFiveStar()),
actionCollection(), "imageview_ratefivestar");
// -- Special Delete actions ---------------------------------------------------------------
@ -336,7 +336,7 @@ void ImageWindow::setupActions()
d->fileDeletePermanentlyAction = new TDEAction(i18n("Delete File Permanently"),
"edit-delete",
SHIFT+Key_Delete,
TQT_TQOBJECT(this),
this,
TQT_SLOT(slotDeleteCurrentItemPermanently()),
actionCollection(),
"image_delete_permanently");
@ -346,7 +346,7 @@ void ImageWindow::setupActions()
d->fileDeletePermanentlyDirectlyAction = new TDEAction(i18n("Delete Permanently without Confirmation"),
"edit-delete",
0,
TQT_TQOBJECT(this),
this,
TQT_SLOT(slotDeleteCurrentItemPermanentlyDirectly()),
actionCollection(),
"image_delete_permanently_directly");
@ -354,7 +354,7 @@ void ImageWindow::setupActions()
d->fileTrashDirectlyAction = new TDEAction(i18n("Move to Trash without Confirmation"),
"edittrash",
0,
TQT_TQOBJECT(this),
this,
TQT_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, TQT_TQOBJECT(this), TQT_SLOT(slotLoadCurrent()));
TQTimer::singleShot(0, this, TQT_SLOT(slotLoadCurrent()));
}
void ImageWindow::slotLoadCurrent()
@ -569,10 +569,10 @@ void ImageWindow::slotContextMenu()
int i = m_contextMenu->insertItem(i18n("Remove Tag"), removeTagsMenu);
connect(assignTagsMenu, TQT_SIGNAL(signalTagActivated(int)),
TQT_TQOBJECT(this), TQT_SLOT(slotAssignTag(int)));
this, TQT_SLOT(slotAssignTag(int)));
connect(removeTagsMenu, TQT_SIGNAL(signalTagActivated(int)),
TQT_TQOBJECT(this), TQT_SLOT(slotRemoveTag(int)));
this, TQT_SLOT(slotRemoveTag(int)));
AlbumDB* db = AlbumManager::instance()->albumDB();
if (!db->hasTags( idList ))
@ -585,7 +585,7 @@ void ImageWindow::slotContextMenu()
ratingMenu = new RatingPopupMenu();
connect(ratingMenu, TQT_SIGNAL(activated(int)),
TQT_TQOBJECT(this), TQT_SLOT(slotAssignRating(int)));
this, TQT_SLOT(slotAssignRating(int)));
m_contextMenu->insertItem(i18n("Assign Rating"), ratingMenu);
}

2
digikam/utilities/imageeditor/tools/imageresize.cpp
Unescape Escape View File

@ -540,7 +540,7 @@ void ImageResize::slotOk()
GreycstorationIface::Resize,
d->wInput->value(),
d->hInput->value(),
0, TQT_TQOBJECT(this));
0, this);
}
else
{

130
digikam/utilities/lighttable/lighttablewindow.cpp
Unescape Escape View File

@ -237,33 +237,33 @@ void LightTableWindow::setupStatusBar()
void LightTableWindow::setupConnections()
{
connect(d->statusProgressBar, TQT_SIGNAL(signalCancelButtonPressed()),
TQT_TQOBJECT(this), TQT_SLOT(slotProgressBarCancelButtonPressed()));
this, TQT_SLOT(slotProgressBarCancelButtonPressed()));
connect(ThemeEngine::instance(), TQT_SIGNAL(signalThemeChanged()),
TQT_TQOBJECT(this), TQT_SLOT(slotThemeChanged()));
this, TQT_SLOT(slotThemeChanged()));
// Thumbs bar connections ---------------------------------------
connect(d->barView, TQT_SIGNAL(signalSetItemOnLeftPanel(ImageInfo*)),
TQT_TQOBJECT(this), TQT_SLOT(slotSetItemOnLeftPanel(ImageInfo*)));
this, TQT_SLOT(slotSetItemOnLeftPanel(ImageInfo*)));
connect(d->barView, TQT_SIGNAL(signalSetItemOnRightPanel(ImageInfo*)),
TQT_TQOBJECT(this), TQT_SLOT(slotSetItemOnRightPanel(ImageInfo*)));
this, TQT_SLOT(slotSetItemOnRightPanel(ImageInfo*)));
connect(d->barView, TQT_SIGNAL(signalRemoveItem(ImageInfo*)),
TQT_TQOBJECT(this), TQT_SLOT(slotRemoveItem(ImageInfo*)));
this, TQT_SLOT(slotRemoveItem(ImageInfo*)));
connect(d->barView, TQT_SIGNAL(signalEditItem(ImageInfo*)),
TQT_TQOBJECT(this), TQT_SLOT(slotEditItem(ImageInfo*)));
this, TQT_SLOT(slotEditItem(ImageInfo*)));
connect(d->barView, TQT_SIGNAL(signalClearAll()),
TQT_TQOBJECT(this), TQT_SLOT(slotClearItemsList()));
this, TQT_SLOT(slotClearItemsList()));
connect(d->barView, TQT_SIGNAL(signalLightTableBarItemSelected(ImageInfo*)),
TQT_TQOBJECT(this), TQT_SLOT(slotItemSelected(ImageInfo*)));
this, TQT_SLOT(slotItemSelected(ImageInfo*)));
connect(d->barView, TQT_SIGNAL(signalDroppedItems(const ImageInfoList&)),
TQT_TQOBJECT(this), TQT_SLOT(slotThumbbarDroppedItems(const ImageInfoList&)));
this, TQT_SLOT(slotThumbbarDroppedItems(const ImageInfoList&)));
// Zoom bars connections -----------------------------------------
@ -288,158 +288,158 @@ void LightTableWindow::setupConnections()
// View connections ---------------------------------------------
connect(d->previewView, TQT_SIGNAL(signalLeftZoomFactorChanged(double)),
TQT_TQOBJECT(this), TQT_SLOT(slotLeftZoomFactorChanged(double)));
this, TQT_SLOT(slotLeftZoomFactorChanged(double)));
connect(d->previewView, TQT_SIGNAL(signalRightZoomFactorChanged(double)),
TQT_TQOBJECT(this), TQT_SLOT(slotRightZoomFactorChanged(double)));
this, TQT_SLOT(slotRightZoomFactorChanged(double)));
connect(d->previewView, TQT_SIGNAL(signalEditItem(ImageInfo*)),
TQT_TQOBJECT(this), TQT_SLOT(slotEditItem(ImageInfo*)));
this, TQT_SLOT(slotEditItem(ImageInfo*)));
connect(d->previewView, TQT_SIGNAL(signalDeleteItem(ImageInfo*)),
TQT_TQOBJECT(this), TQT_SLOT(slotDeleteItem(ImageInfo*)));
this, TQT_SLOT(slotDeleteItem(ImageInfo*)));
connect(d->previewView, TQT_SIGNAL(signalSlideShow()),
TQT_TQOBJECT(this), TQT_SLOT(slotToggleSlideShow()));
this, TQT_SLOT(slotToggleSlideShow()));
connect(d->previewView, TQT_SIGNAL(signalLeftDroppedItems(const ImageInfoList&)),
TQT_TQOBJECT(this), TQT_SLOT(slotLeftDroppedItems(const ImageInfoList&)));
this, TQT_SLOT(slotLeftDroppedItems(const ImageInfoList&)));
connect(d->previewView, TQT_SIGNAL(signalRightDroppedItems(const ImageInfoList&)),
TQT_TQOBJECT(this), TQT_SLOT(slotRightDroppedItems(const ImageInfoList&)));
this, TQT_SLOT(slotRightDroppedItems(const ImageInfoList&)));
connect(d->previewView, TQT_SIGNAL(signalToggleOnSyncPreview(bool)),
TQT_TQOBJECT(this), TQT_SLOT(slotToggleOnSyncPreview(bool)));
this, TQT_SLOT(slotToggleOnSyncPreview(bool)));
connect(d->previewView, TQT_SIGNAL(signalLeftPreviewLoaded(bool)),
TQT_TQOBJECT(this), TQT_SLOT(slotLeftPreviewLoaded(bool)));
this, TQT_SLOT(slotLeftPreviewLoaded(bool)));
connect(d->previewView, TQT_SIGNAL(signalRightPreviewLoaded(bool)),
TQT_TQOBJECT(this), TQT_SLOT(slotRightPreviewLoaded(bool)));
this, TQT_SLOT(slotRightPreviewLoaded(bool)));
connect(d->previewView, TQT_SIGNAL(signalLeftPanelLeftButtonClicked()),
TQT_TQOBJECT(this), TQT_SLOT(slotLeftPanelLeftButtonClicked()));
this, TQT_SLOT(slotLeftPanelLeftButtonClicked()));
connect(d->previewView, TQT_SIGNAL(signalRightPanelLeftButtonClicked()),
TQT_TQOBJECT(this), TQT_SLOT(slotRightPanelLeftButtonClicked()));
this, TQT_SLOT(slotRightPanelLeftButtonClicked()));
}
void LightTableWindow::setupActions()
{
// -- Standard 'File' menu actions ---------------------------------------------
d->backwardAction = KStdAction::back(TQT_TQOBJECT(this), TQT_SLOT(slotBackward()),
d->backwardAction = KStdAction::back(this, TQT_SLOT(slotBackward()),
actionCollection(), "lighttable_backward");
d->backwardAction->setEnabled(false);
d->forwardAction = KStdAction::forward(TQT_TQOBJECT(this), TQT_SLOT(slotForward()),
d->forwardAction = KStdAction::forward(this, TQT_SLOT(slotForward()),
actionCollection(), "lighttable_forward");
d->forwardAction->setEnabled(false);
d->firstAction = new TDEAction(i18n("&First"), "go-first",
TDEStdAccel::shortcut( TDEStdAccel::Home),
TQT_TQOBJECT(this), TQT_SLOT(slotFirst()),
this, TQT_SLOT(slotFirst()),
actionCollection(), "lighttable_first");
d->firstAction->setEnabled(false);
d->lastAction = new TDEAction(i18n("&Last"), "go-last",
TDEStdAccel::shortcut( TDEStdAccel::End),
TQT_TQOBJECT(this), TQT_SLOT(slotLast()),
this, TQT_SLOT(slotLast()),
actionCollection(), "lighttable_last");
d->lastAction->setEnabled(false);
d->setItemLeftAction = new TDEAction(i18n("On Left"), "go-previous",
CTRL+Key_L, TQT_TQOBJECT(this), TQT_SLOT(slotSetItemLeft()),
CTRL+Key_L, this, TQT_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, TQT_TQOBJECT(this), TQT_SLOT(slotSetItemRight()),
CTRL+Key_R, this, TQT_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, TQT_TQOBJECT(this), TQT_SLOT(slotEditItem()),
Key_F4, this, TQT_SLOT(slotEditItem()),
actionCollection(), "lighttable_edititem");
d->editItemAction->setEnabled(false);
d->removeItemAction = new TDEAction(i18n("Remove item from LightTable"), "window-close",
CTRL+Key_K, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveItem()),
CTRL+Key_K, this, TQT_SLOT(slotRemoveItem()),
actionCollection(), "lighttable_removeitem");
d->removeItemAction->setEnabled(false);
d->clearListAction = new TDEAction(i18n("Remove all items from LightTable"), "editshred",
CTRL+SHIFT+Key_K, TQT_TQOBJECT(this), TQT_SLOT(slotClearItemsList()),
CTRL+SHIFT+Key_K, this, TQT_SLOT(slotClearItemsList()),
actionCollection(), "lighttable_clearlist");
d->clearListAction->setEnabled(false);
d->fileDeleteAction = new TDEAction(i18n("Move to Trash"), "edittrash",
Key_Delete,
TQT_TQOBJECT(this), TQT_SLOT(slotDeleteItem()),
this, TQT_SLOT(slotDeleteItem()),
actionCollection(), "lighttable_filedelete");
d->fileDeleteAction->setEnabled(false);
KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection(), "lighttable_close");
KStdAction::close(this, TQT_SLOT(close()), actionCollection(), "lighttable_close");
// -- Standard 'View' menu actions ---------------------------------------------
d->syncPreviewAction = new TDEToggleAction(i18n("Synchronize"), "goto",
CTRL+SHIFT+Key_Y, TQT_TQOBJECT(this),
CTRL+SHIFT+Key_Y, this,
TQT_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, TQT_TQOBJECT(this),
CTRL+SHIFT+Key_P, this,
TQT_SLOT(slotToggleNavigateByPair()),
actionCollection(), "lighttable_navigatebypair");
d->navigateByPairAction->setEnabled(false);
d->navigateByPairAction->setWhatsThis(i18n("Navigate by pair with all items"));
d->zoomPlusAction = KStdAction::zoomIn(TQT_TQOBJECT(d->previewView), TQT_SLOT(slotIncreaseZoom()),
d->zoomPlusAction = KStdAction::zoomIn(d->previewView, TQT_SLOT(slotIncreaseZoom()),
actionCollection(), "lighttable_zoomplus");
d->zoomPlusAction->setEnabled(false);
d->zoomMinusAction = KStdAction::zoomOut(TQT_TQOBJECT(d->previewView), TQT_SLOT(slotDecreaseZoom()),
d->zoomMinusAction = KStdAction::zoomOut(d->previewView, TQT_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.
TQT_TQOBJECT(this), TQT_SLOT(slotZoomTo100Percents()),
this, TQT_SLOT(slotZoomTo100Percents()),
actionCollection(), "lighttable_zoomto100percents");
d->zoomFitToWindowAction = new TDEAction(i18n("Fit to &Window"), "view_fit_window",
CTRL+SHIFT+Key_E, TQT_TQOBJECT(this), TQT_SLOT(slotFitToWindow()),
CTRL+SHIFT+Key_E, this, TQT_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, TQT_TQOBJECT(this),
CTRL+SHIFT+Key_F, this,
TQT_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,
TQT_TQOBJECT(this), TQT_SLOT(slotToggleSlideShow()),
this, TQT_SLOT(slotToggleSlideShow()),
actionCollection(),"lighttable_slideshow");
// -- Standard 'Configure' menu actions ----------------------------------------
d->showMenuBarAction = KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(slotShowMenuBar()), actionCollection());
d->showMenuBarAction = KStdAction::showMenubar(this, TQT_SLOT(slotShowMenuBar()), actionCollection());
KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotEditKeys()), actionCollection());
KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfToolbars()), actionCollection());
KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotSetup()), actionCollection());
KStdAction::keyBindings(this, TQT_SLOT(slotEditKeys()), actionCollection());
KStdAction::configureToolbars(this, TQT_SLOT(slotConfToolbars()), actionCollection());
KStdAction::preferences(this, TQT_SLOT(slotSetup()), actionCollection());
// -----------------------------------------------------------------------------------------
d->themeMenuAction = new TDESelectAction(i18n("&Themes"), 0, actionCollection(), "theme_menu");
connect(d->themeMenuAction, TQT_SIGNAL(activated(const TQString&)),
TQT_TQOBJECT(this), TQT_SLOT(slotChangeTheme(const TQString&)));
this, TQT_SLOT(slotChangeTheme(const TQString&)));
d->themeMenuAction->setItems(ThemeEngine::instance()->themeNames());
slotThemeChanged();
@ -449,20 +449,20 @@ void LightTableWindow::setupActions()
d->donateMoneyAction = new TDEAction(i18n("Donate..."),
0, 0,
TQT_TQOBJECT(this), TQT_SLOT(slotDonateMoney()),
this, TQT_SLOT(slotDonateMoney()),
actionCollection(),
"lighttable_donatemoney");
d->contributeAction = new TDEAction(i18n("Contribute..."),
0, 0,
TQT_TQOBJECT(this), TQT_SLOT(slotContribute()),
this, TQT_SLOT(slotContribute()),
actionCollection(),
"lighttable_contribute");
d->rawCameraListAction = new TDEAction(i18n("Supported RAW Cameras"),
"kdcraw",
0,
TQT_TQOBJECT(this),
this,
TQT_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,
TQT_TQOBJECT(d->barView), TQT_SLOT(slotAssignRatingNoStar()),
d->barView, TQT_SLOT(slotAssignRatingNoStar()),
actionCollection(), "lighttable_ratenostar");
d->star1 = new TDEAction(i18n("Assign Rating \"One Star\""), CTRL+Key_1,
TQT_TQOBJECT(d->barView), TQT_SLOT(slotAssignRatingOneStar()),
d->barView, TQT_SLOT(slotAssignRatingOneStar()),
actionCollection(), "lighttable_rateonestar");
d->star2 = new TDEAction(i18n("Assign Rating \"Two Stars\""), CTRL+Key_2,
TQT_TQOBJECT(d->barView), TQT_SLOT(slotAssignRatingTwoStar()),
d->barView, TQT_SLOT(slotAssignRatingTwoStar()),
actionCollection(), "lighttable_ratetwostar");
d->star3 = new TDEAction(i18n("Assign Rating \"Three Stars\""), CTRL+Key_3,
TQT_TQOBJECT(d->barView), TQT_SLOT(slotAssignRatingThreeStar()),
d->barView, TQT_SLOT(slotAssignRatingThreeStar()),
actionCollection(), "lighttable_ratethreestar");
d->star4 = new TDEAction(i18n("Assign Rating \"Four Stars\""), CTRL+Key_4,
TQT_TQOBJECT(d->barView), TQT_SLOT(slotAssignRatingFourStar()),
d->barView, TQT_SLOT(slotAssignRatingFourStar()),
actionCollection(), "lighttable_ratefourstar");
d->star5 = new TDEAction(i18n("Assign Rating \"Five Stars\""), CTRL+Key_5,
TQT_TQOBJECT(d->barView), TQT_SLOT(slotAssignRatingFiveStar()),
d->barView, TQT_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, TQT_TQOBJECT(this), TQT_SLOT(slotEscapePressed()),
Key_Escape, this, TQT_SLOT(slotEscapePressed()),
false, true);
d->accelerators->insert("Next Image Key_Space", i18n("Next Image"),
i18n("Load Next Image"),
Key_Space, TQT_TQOBJECT(this), TQT_SLOT(slotForward()),
Key_Space, this, TQT_SLOT(slotForward()),
false, true);
d->accelerators->insert("Previous Image SHIFT+Key_Space", i18n("Previous Image"),
i18n("Load Previous Image"),
SHIFT+Key_Space, TQT_TQOBJECT(this), TQT_SLOT(slotBackward()),
SHIFT+Key_Space, this, TQT_SLOT(slotBackward()),
false, true);
d->accelerators->insert("Previous Image Key_Backspace", i18n("Previous Image"),
i18n("Load Previous Image"),
Key_Backspace, TQT_TQOBJECT(this), TQT_SLOT(slotBackward()),
Key_Backspace, this, TQT_SLOT(slotBackward()),
false, true);
d->accelerators->insert("Next Image Key_Next", i18n("Next Image"),
i18n("Load Next Image"),
Key_Next, TQT_TQOBJECT(this), TQT_SLOT(slotForward()),
Key_Next, this, TQT_SLOT(slotForward()),
false, true);
d->accelerators->insert("Previous Image Key_Prior", i18n("Previous Image"),
i18n("Load Previous Image"),
Key_Prior, TQT_TQOBJECT(this), TQT_SLOT(slotBackward()),
Key_Prior, this, TQT_SLOT(slotBackward()),
false, true);
d->accelerators->insert("Zoom Plus Key_Plus", i18n("Zoom in"),
i18n("Zoom in on image"),
Key_Plus, TQT_TQOBJECT(d->previewView), TQT_SLOT(slotIncreaseZoom()),
Key_Plus, d->previewView, TQT_SLOT(slotIncreaseZoom()),
false, true);
d->accelerators->insert("Zoom Plus Key_Minus", i18n("Zoom out"),
i18n("Zoom out from image"),
Key_Minus, TQT_TQOBJECT(d->previewView), TQT_SLOT(slotDecreaseZoom()),
Key_Minus, d->previewView, TQT_SLOT(slotDecreaseZoom()),
false, true);
}
@ -1349,7 +1349,7 @@ void LightTableWindow::slotToggleFullScreen()
if (obj)
{
TDEToolBar* toolBar = static_cast<TDEToolBar*>(TQT_TQWIDGET(obj));
TDEToolBar* toolBar = static_cast<TDEToolBar*>(obj);
if (d->fullScreenAction->isPlugged(toolBar) && d->removeFullScreenButton)
d->fullScreenAction->unplug(toolBar);
@ -1389,7 +1389,7 @@ void LightTableWindow::slotToggleFullScreen()
if (obj)
{
TDEToolBar* toolBar = static_cast<TDEToolBar*>(TQT_TQWIDGET(obj));
TDEToolBar* toolBar = static_cast<TDEToolBar*>(obj);
if (d->fullScreenHideToolBar)
{
@ -1512,7 +1512,7 @@ void LightTableWindow::slotConfToolbars()
KEditToolbar dlg(factory(), this);
connect(&dlg, TQT_SIGNAL(newToolbarConfig()),
TQT_TQOBJECT(this), TQT_SLOT(slotNewToolbarConfig()));
this, TQT_SLOT(slotNewToolbarConfig()));
dlg.exec();
}

2
digikam/utilities/setup/setupidentity.cpp
Unescape Escape View File

@ -76,7 +76,7 @@ SetupIdentity::SetupIdentity(TQWidget* parent )
// IPTC only accept printable Ascii char.
TQRegExp asciiRx("[\x20-\x7F]+$");
TQValidator *asciiValidator = new TQRegExpValidator(asciiRx, TQT_TQOBJECT(this));
TQValidator *asciiValidator = new TQRegExpValidator(asciiRx, this);
TQGroupBox *photographerIdGroup = new TQGroupBox(0, TQt::Horizontal, i18n("Photographer and Copyright Information"), parent);
TQGridLayout* grid = new TQGridLayout( photographerIdGroup->layout(), 1, 1, KDialog::spacingHint());

Write Preview
Loading…
Cancel
Save