summaryrefslogtreecommitdiffstats
path: root/digikam/digikam/digikamapp.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'digikam/digikam/digikamapp.cpp')
-rw-r--r--digikam/digikam/digikamapp.cpp240
1 files changed, 120 insertions, 120 deletions
diff --git a/digikam/digikam/digikamapp.cpp b/digikam/digikam/digikamapp.cpp
index 4bdea61..649424b 100644
--- a/digikam/digikam/digikamapp.cpp
+++ b/digikam/digikam/digikamapp.cpp
@@ -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();
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 12:17:03 +0000