diff options
Diffstat (limited to 'digikam/utilities/lighttable')
-rw-r--r-- | digikam/utilities/lighttable/lighttablebar.cpp | 30 | ||||
-rw-r--r-- | digikam/utilities/lighttable/lighttablebar.h | 2 | ||||
-rw-r--r-- | digikam/utilities/lighttable/lighttablepreview.cpp | 40 | ||||
-rw-r--r-- | digikam/utilities/lighttable/lighttablepreview.h | 2 | ||||
-rw-r--r-- | digikam/utilities/lighttable/lighttableview.cpp | 96 | ||||
-rw-r--r-- | digikam/utilities/lighttable/lighttableview.h | 2 | ||||
-rw-r--r-- | digikam/utilities/lighttable/lighttablewindow.cpp | 214 | ||||
-rw-r--r-- | digikam/utilities/lighttable/lighttablewindow.h | 2 |
8 files changed, 194 insertions, 194 deletions
diff --git a/digikam/utilities/lighttable/lighttablebar.cpp b/digikam/utilities/lighttable/lighttablebar.cpp index d5e2166..cfb935a 100644 --- a/digikam/utilities/lighttable/lighttablebar.cpp +++ b/digikam/utilities/lighttable/lighttablebar.cpp @@ -111,7 +111,7 @@ LightTableBar::LightTableBar(TQWidget* parent, int orientation, bool exifRotate) ThemeEngine::instance()->textSpecialRegColor()); painter.end(); - if (orientation ==Qt::Vertical) + if (orientation ==TQt::Vertical) setMinimumWidth(d->ratingPixmap.width()*5 + 6 + 2*getMargin()); else setMinimumHeight(d->ratingPixmap.width()*5 + 6 + 2*getMargin()); @@ -120,14 +120,14 @@ LightTableBar::LightTableBar(TQWidget* parent, int orientation, bool exifRotate) ImageAttributesWatch *watch = ImageAttributesWatch::instance(); - connect(watch, TQT_SIGNAL(signalImageRatingChanged(TQ_LLONG)), - this, TQT_SLOT(slotImageRatingChanged(TQ_LLONG))); + connect(watch, TQ_SIGNAL(signalImageRatingChanged(TQ_LLONG)), + this, TQ_SLOT(slotImageRatingChanged(TQ_LLONG))); - connect(ThemeEngine::instance(), TQT_SIGNAL(signalThemeChanged()), - this, TQT_SLOT(slotThemeChanged())); + connect(ThemeEngine::instance(), TQ_SIGNAL(signalThemeChanged()), + this, TQ_SLOT(slotThemeChanged())); - connect(this, TQT_SIGNAL(signalItemSelected(ThumbBarItem*)), - this, TQT_SLOT(slotItemSelected(ThumbBarItem*))); + connect(this, TQ_SIGNAL(signalItemSelected(ThumbBarItem*)), + this, TQ_SLOT(slotItemSelected(ThumbBarItem*))); } LightTableBar::~LightTableBar() @@ -165,7 +165,7 @@ void LightTableBar::contentsMouseReleaseEvent(TQMouseEvent *e) RatingPopupMenu *ratingMenu = 0; - if (e->button() == Qt::RightButton) + if (e->button() == TQt::RightButton) { TDEPopupMenu popmenu(this); @@ -197,8 +197,8 @@ void LightTableBar::contentsMouseReleaseEvent(TQMouseEvent *e) ratingMenu = new RatingPopupMenu(); - connect(ratingMenu, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotAssignRating(int))); + connect(ratingMenu, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotAssignRating(int))); popmenu.insertItem(i18n("Assign Rating"), ratingMenu); } @@ -460,7 +460,7 @@ void LightTableBar::viewportPaintEvent(TQPaintEvent* e) int cy, cx, ts, y1, y2, x1, x2; TQPixmap tile; - if (getOrientation() ==Qt::Vertical) + if (getOrientation() ==TQt::Vertical) { cy = viewportToContents(er.topLeft()).y(); @@ -489,7 +489,7 @@ void LightTableBar::viewportPaintEvent(TQPaintEvent* e) for (ThumbBarItem *item = firstItem(); item; item = item->next()) { - if (getOrientation() ==Qt::Vertical) + if (getOrientation() ==TQt::Vertical) { if (y1 <= item->position() && item->position() <= y2) { @@ -515,7 +515,7 @@ void LightTableBar::viewportPaintEvent(TQPaintEvent* e) { TQPixmap pix; pix.convertFromImage(TQImage(item->pixmap()->convertToImage()). - smoothScale(getTileSize(), getTileSize(), TQ_ScaleMin)); + smoothScale(getTileSize(), getTileSize(), TQImage::ScaleMin)); int x = (tile.width() - pix.width())/2; int y = (tile.height() - pix.height())/2; bitBlt(&tile, x, y, &pix); @@ -571,7 +571,7 @@ void LightTableBar::viewportPaintEvent(TQPaintEvent* e) { TQPixmap pix; pix.convertFromImage(TQImage(item->pixmap()->convertToImage()). - smoothScale(getTileSize(), getTileSize(), TQ_ScaleMin)); + smoothScale(getTileSize(), getTileSize(), TQImage::ScaleMin)); int x = (tile.width() - pix.width())/2; int y = (tile.height()- pix.height())/2; bitBlt(&tile, x, y, &pix); @@ -603,7 +603,7 @@ void LightTableBar::viewportPaintEvent(TQPaintEvent* e) } } - if (getOrientation() ==Qt::Vertical) + if (getOrientation() ==TQt::Vertical) bitBlt(viewport(), 0, er.y(), &bgPix); else bitBlt(viewport(), er.x(), 0, &bgPix); diff --git a/digikam/utilities/lighttable/lighttablebar.h b/digikam/utilities/lighttable/lighttablebar.h index e6bc239..b64e93a 100644 --- a/digikam/utilities/lighttable/lighttablebar.h +++ b/digikam/utilities/lighttable/lighttablebar.h @@ -46,7 +46,7 @@ class LightTableBarPriv; class DIGIKAM_EXPORT LightTableBar : public ThumbBarView { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/utilities/lighttable/lighttablepreview.cpp b/digikam/utilities/lighttable/lighttablepreview.cpp index 23d1cbc..100427e 100644 --- a/digikam/utilities/lighttable/lighttablepreview.cpp +++ b/digikam/utilities/lighttable/lighttablepreview.cpp @@ -150,14 +150,14 @@ LightTablePreview::LightTablePreview(TQWidget *parent) // ------------------------------------------------------------ - connect(d->cornerButton, TQT_SIGNAL(pressed()), - this, TQT_SLOT(slotCornerButtonPressed())); + connect(d->cornerButton, TQ_SIGNAL(pressed()), + this, TQ_SLOT(slotCornerButtonPressed())); - connect(this, TQT_SIGNAL(signalRightButtonClicked()), - this, TQT_SLOT(slotContextMenu())); + connect(this, TQ_SIGNAL(signalRightButtonClicked()), + this, TQ_SLOT(slotContextMenu())); - connect(ThemeEngine::instance(), TQT_SIGNAL(signalThemeChanged()), - this, TQT_SLOT(slotThemeChanged())); + connect(ThemeEngine::instance(), TQ_SIGNAL(signalThemeChanged()), + this, TQ_SLOT(slotThemeChanged())); // ------------------------------------------------------------ @@ -248,14 +248,14 @@ void LightTablePreview::setImagePath(const TQString& path) if (!d->previewThread) { d->previewThread = new PreviewLoadThread(); - connect(d->previewThread, TQT_SIGNAL(signalImageLoaded(const LoadingDescription &, const DImg &)), - this, TQT_SLOT(slotGotImagePreview(const LoadingDescription &, const DImg&))); + connect(d->previewThread, TQ_SIGNAL(signalImageLoaded(const LoadingDescription &, const DImg &)), + this, TQ_SLOT(slotGotImagePreview(const LoadingDescription &, const DImg&))); } if (!d->previewPreloadThread) { d->previewPreloadThread = new PreviewLoadThread(); - connect(d->previewPreloadThread, TQT_SIGNAL(signalImageLoaded(const LoadingDescription &, const DImg &)), - this, TQT_SLOT(slotNextPreload())); + connect(d->previewPreloadThread, TQ_SIGNAL(signalImageLoaded(const LoadingDescription &, const DImg &)), + this, TQ_SLOT(slotNextPreload())); } if (d->loadFullImageSize) @@ -405,11 +405,11 @@ void LightTablePreview::slotContextMenu() popmenu.insertItem(i18n("Assign Tag"), assignTagsMenu); int i = popmenu.insertItem(i18n("Remove Tag"), removeTagsMenu); - connect(assignTagsMenu, TQT_SIGNAL(signalTagActivated(int)), - this, TQT_SLOT(slotAssignTag(int))); + connect(assignTagsMenu, TQ_SIGNAL(signalTagActivated(int)), + this, TQ_SLOT(slotAssignTag(int))); - connect(removeTagsMenu, TQT_SIGNAL(signalTagActivated(int)), - this, TQT_SLOT(slotRemoveTag(int))); + connect(removeTagsMenu, TQ_SIGNAL(signalTagActivated(int)), + this, TQ_SLOT(slotRemoveTag(int))); AlbumDB* db = AlbumManager::instance()->albumDB(); if (!db->hasTags( idList )) @@ -421,8 +421,8 @@ void LightTablePreview::slotContextMenu() ratingMenu = new RatingPopupMenu(); - connect(ratingMenu, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotAssignRating(int))); + connect(ratingMenu, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotAssignRating(int))); popmenu.insertItem(i18n("Assign Rating"), ratingMenu); @@ -547,11 +547,11 @@ void LightTablePreview::slotCornerButtonPressed() pan->setRegionSelection(r); pan->setMouseFocus(); - connect(pan, TQT_SIGNAL(signalSelectionMoved(const TQRect&, bool)), - this, TQT_SLOT(slotPanIconSelectionMoved(const TQRect&, bool))); + connect(pan, TQ_SIGNAL(signalSelectionMoved(const TQRect&, bool)), + this, TQ_SLOT(slotPanIconSelectionMoved(const TQRect&, bool))); - connect(pan, TQT_SIGNAL(signalHiden()), - this, TQT_SLOT(slotPanIconHiden())); + connect(pan, TQ_SIGNAL(signalHiden()), + this, TQ_SLOT(slotPanIconHiden())); TQPoint g = mapToGlobal(viewport()->pos()); g.setX(g.x()+ viewport()->size().width()); diff --git a/digikam/utilities/lighttable/lighttablepreview.h b/digikam/utilities/lighttable/lighttablepreview.h index 255602d..3549fa1 100644 --- a/digikam/utilities/lighttable/lighttablepreview.h +++ b/digikam/utilities/lighttable/lighttablepreview.h @@ -48,7 +48,7 @@ class LightTablePreviewPriv; class DIGIKAM_EXPORT LightTablePreview : public PreviewWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/utilities/lighttable/lighttableview.cpp b/digikam/utilities/lighttable/lighttableview.cpp index 70bd000..51f45ab 100644 --- a/digikam/utilities/lighttable/lighttableview.cpp +++ b/digikam/utilities/lighttable/lighttableview.cpp @@ -87,55 +87,55 @@ LightTableView::LightTableView(TQWidget *parent) // Left panel connections ------------------------------------------------ - connect(d->leftPreview, TQT_SIGNAL(signalZoomFactorChanged(double)), - this, TQT_SIGNAL(signalLeftZoomFactorChanged(double))); + connect(d->leftPreview, TQ_SIGNAL(signalZoomFactorChanged(double)), + this, TQ_SIGNAL(signalLeftZoomFactorChanged(double))); - connect(d->leftPreview, TQT_SIGNAL(contentsMoving(int, int)), - this, TQT_SLOT(slotLeftContentsMoved(int, int))); + connect(d->leftPreview, TQ_SIGNAL(contentsMoving(int, int)), + this, TQ_SLOT(slotLeftContentsMoved(int, int))); - connect(d->leftPreview, TQT_SIGNAL(signalSlideShow()), - this, TQT_SIGNAL(signalSlideShow())); + connect(d->leftPreview, TQ_SIGNAL(signalSlideShow()), + this, TQ_SIGNAL(signalSlideShow())); - connect(d->leftPreview, TQT_SIGNAL(signalDeleteItem(ImageInfo*)), - this, TQT_SIGNAL(signalDeleteItem(ImageInfo*))); + connect(d->leftPreview, TQ_SIGNAL(signalDeleteItem(ImageInfo*)), + this, TQ_SIGNAL(signalDeleteItem(ImageInfo*))); - connect(d->leftPreview, TQT_SIGNAL(signalEditItem(ImageInfo*)), - this, TQT_SIGNAL(signalEditItem(ImageInfo*))); + connect(d->leftPreview, TQ_SIGNAL(signalEditItem(ImageInfo*)), + this, TQ_SIGNAL(signalEditItem(ImageInfo*))); - connect(d->leftPreview, TQT_SIGNAL(signalDroppedItems(const ImageInfoList&)), - this, TQT_SIGNAL(signalLeftDroppedItems(const ImageInfoList&))); + connect(d->leftPreview, TQ_SIGNAL(signalDroppedItems(const ImageInfoList&)), + this, TQ_SIGNAL(signalLeftDroppedItems(const ImageInfoList&))); - connect(d->leftPreview, TQT_SIGNAL(signalPreviewLoaded(bool)), - this, TQT_SLOT(slotLeftPreviewLoaded(bool))); + connect(d->leftPreview, TQ_SIGNAL(signalPreviewLoaded(bool)), + this, TQ_SLOT(slotLeftPreviewLoaded(bool))); - connect(d->leftPreview, TQT_SIGNAL(signalLeftButtonClicked()), - this, TQT_SIGNAL(signalLeftPanelLeftButtonClicked())); + connect(d->leftPreview, TQ_SIGNAL(signalLeftButtonClicked()), + this, TQ_SIGNAL(signalLeftPanelLeftButtonClicked())); // Right panel connections ------------------------------------------------ - connect(d->rightPreview, TQT_SIGNAL(signalZoomFactorChanged(double)), - this, TQT_SIGNAL(signalRightZoomFactorChanged(double))); + connect(d->rightPreview, TQ_SIGNAL(signalZoomFactorChanged(double)), + this, TQ_SIGNAL(signalRightZoomFactorChanged(double))); - connect(d->rightPreview, TQT_SIGNAL(contentsMoving(int, int)), - this, TQT_SLOT(slotRightContentsMoved(int, int))); + connect(d->rightPreview, TQ_SIGNAL(contentsMoving(int, int)), + this, TQ_SLOT(slotRightContentsMoved(int, int))); - connect(d->rightPreview, TQT_SIGNAL(signalDeleteItem(ImageInfo*)), - this, TQT_SIGNAL(signalDeleteItem(ImageInfo*))); + connect(d->rightPreview, TQ_SIGNAL(signalDeleteItem(ImageInfo*)), + this, TQ_SIGNAL(signalDeleteItem(ImageInfo*))); - connect(d->rightPreview, TQT_SIGNAL(signalEditItem(ImageInfo*)), - this, TQT_SIGNAL(signalEditItem(ImageInfo*))); + connect(d->rightPreview, TQ_SIGNAL(signalEditItem(ImageInfo*)), + this, TQ_SIGNAL(signalEditItem(ImageInfo*))); - connect(d->rightPreview, TQT_SIGNAL(signalDroppedItems(const ImageInfoList&)), - this, TQT_SIGNAL(signalRightDroppedItems(const ImageInfoList&))); + connect(d->rightPreview, TQ_SIGNAL(signalDroppedItems(const ImageInfoList&)), + this, TQ_SIGNAL(signalRightDroppedItems(const ImageInfoList&))); - connect(d->rightPreview, TQT_SIGNAL(signalSlideShow()), - this, TQT_SIGNAL(signalSlideShow())); + connect(d->rightPreview, TQ_SIGNAL(signalSlideShow()), + this, TQ_SIGNAL(signalSlideShow())); - connect(d->rightPreview, TQT_SIGNAL(signalPreviewLoaded(bool)), - this, TQT_SLOT(slotRightPreviewLoaded(bool))); + connect(d->rightPreview, TQ_SIGNAL(signalPreviewLoaded(bool)), + this, TQ_SLOT(slotRightPreviewLoaded(bool))); - connect(d->rightPreview, TQT_SIGNAL(signalLeftButtonClicked()), - this, TQT_SIGNAL(signalRightPanelLeftButtonClicked())); + connect(d->rightPreview, TQ_SIGNAL(signalLeftButtonClicked()), + this, TQ_SIGNAL(signalRightPanelLeftButtonClicked())); } LightTableView::~LightTableView() @@ -324,21 +324,21 @@ void LightTableView::slotLeftContentsMoved(int x, int y) { if (d->syncPreview && !d->leftLoading) { - disconnect(d->rightPreview, TQT_SIGNAL(signalZoomFactorChanged(double)), - this, TQT_SIGNAL(signalRightZoomFactorChanged(double))); + disconnect(d->rightPreview, TQ_SIGNAL(signalZoomFactorChanged(double)), + this, TQ_SIGNAL(signalRightZoomFactorChanged(double))); - disconnect(d->rightPreview, TQT_SIGNAL(contentsMoving(int, int)), - this, TQT_SLOT(slotRightContentsMoved(int, int))); + disconnect(d->rightPreview, TQ_SIGNAL(contentsMoving(int, int)), + this, TQ_SLOT(slotRightContentsMoved(int, int))); setRightZoomFactor(d->leftPreview->zoomFactor()); emit signalRightZoomFactorChanged(d->leftPreview->zoomFactor()); d->rightPreview->setContentsPos(x, y); - connect(d->rightPreview, TQT_SIGNAL(signalZoomFactorChanged(double)), - this, TQT_SIGNAL(signalRightZoomFactorChanged(double))); + connect(d->rightPreview, TQ_SIGNAL(signalZoomFactorChanged(double)), + this, TQ_SIGNAL(signalRightZoomFactorChanged(double))); - connect(d->rightPreview, TQT_SIGNAL(contentsMoving(int, int)), - this, TQT_SLOT(slotRightContentsMoved(int, int))); + connect(d->rightPreview, TQ_SIGNAL(contentsMoving(int, int)), + this, TQ_SLOT(slotRightContentsMoved(int, int))); } } @@ -346,22 +346,22 @@ void LightTableView::slotRightContentsMoved(int x, int y) { if (d->syncPreview && !d->rightLoading) { - disconnect(d->leftPreview, TQT_SIGNAL(signalZoomFactorChanged(double)), - this, TQT_SIGNAL(signalLeftZoomFactorChanged(double))); + disconnect(d->leftPreview, TQ_SIGNAL(signalZoomFactorChanged(double)), + this, TQ_SIGNAL(signalLeftZoomFactorChanged(double))); - disconnect(d->leftPreview, TQT_SIGNAL(contentsMoving(int, int)), - this, TQT_SLOT(slotLeftContentsMoved(int, int))); + disconnect(d->leftPreview, TQ_SIGNAL(contentsMoving(int, int)), + this, TQ_SLOT(slotLeftContentsMoved(int, int))); setLeftZoomFactor(d->rightPreview->zoomFactor()); emit signalLeftZoomFactorChanged(d->rightPreview->zoomFactor()); d->leftPreview->setContentsPos(x, y); - connect(d->leftPreview, TQT_SIGNAL(signalZoomFactorChanged(double)), - this, TQT_SIGNAL(signalLeftZoomFactorChanged(double))); + connect(d->leftPreview, TQ_SIGNAL(signalZoomFactorChanged(double)), + this, TQ_SIGNAL(signalLeftZoomFactorChanged(double))); - connect(d->leftPreview, TQT_SIGNAL(contentsMoving(int, int)), - this, TQT_SLOT(slotLeftContentsMoved(int, int))); + connect(d->leftPreview, TQ_SIGNAL(contentsMoving(int, int)), + this, TQ_SLOT(slotLeftContentsMoved(int, int))); } } diff --git a/digikam/utilities/lighttable/lighttableview.h b/digikam/utilities/lighttable/lighttableview.h index 1f93702..273b707 100644 --- a/digikam/utilities/lighttable/lighttableview.h +++ b/digikam/utilities/lighttable/lighttableview.h @@ -43,7 +43,7 @@ class LightTableViewPriv; class DIGIKAM_EXPORT LightTableView : public TQFrame { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/utilities/lighttable/lighttablewindow.cpp b/digikam/utilities/lighttable/lighttablewindow.cpp index 0b77be1..58409ae 100644 --- a/digikam/utilities/lighttable/lighttablewindow.cpp +++ b/digikam/utilities/lighttable/lighttablewindow.cpp @@ -182,7 +182,7 @@ void LightTableWindow::closeEvent(TQCloseEvent* e) void LightTableWindow::setupUserArea() { TQWidget* mainW = new TQWidget(this); - d->hSplitter = new TQSplitter(Qt::Horizontal, mainW); + d->hSplitter = new TQSplitter(TQt::Horizontal, mainW); TQHBoxLayout *hlay = new TQHBoxLayout(mainW); d->leftSidebar = new ImagePropertiesSideBarDB(mainW, "LightTable Left Sidebar", d->hSplitter, @@ -190,7 +190,7 @@ void LightTableWindow::setupUserArea() TQWidget* centralW = new TQWidget(d->hSplitter); TQVBoxLayout *vlay = new TQVBoxLayout(centralW); - d->vSplitter = new TQSplitter(Qt::Vertical, centralW); + d->vSplitter = new TQSplitter(TQt::Vertical, centralW); d->barView = new LightTableBar(d->vSplitter, ThumbBarView::Horizontal, AlbumSettings::instance()->getExifRotate()); d->previewView = new LightTableView(d->vSplitter); @@ -236,210 +236,210 @@ void LightTableWindow::setupStatusBar() void LightTableWindow::setupConnections() { - connect(d->statusProgressBar, TQT_SIGNAL(signalCancelButtonPressed()), - TQT_TQOBJECT(this), TQT_SLOT(slotProgressBarCancelButtonPressed())); + connect(d->statusProgressBar, TQ_SIGNAL(signalCancelButtonPressed()), + this, TQ_SLOT(slotProgressBarCancelButtonPressed())); - connect(ThemeEngine::instance(), TQT_SIGNAL(signalThemeChanged()), - TQT_TQOBJECT(this), TQT_SLOT(slotThemeChanged())); + connect(ThemeEngine::instance(), TQ_SIGNAL(signalThemeChanged()), + this, TQ_SLOT(slotThemeChanged())); // Thumbs bar connections --------------------------------------- - connect(d->barView, TQT_SIGNAL(signalSetItemOnLeftPanel(ImageInfo*)), - TQT_TQOBJECT(this), TQT_SLOT(slotSetItemOnLeftPanel(ImageInfo*))); + connect(d->barView, TQ_SIGNAL(signalSetItemOnLeftPanel(ImageInfo*)), + this, TQ_SLOT(slotSetItemOnLeftPanel(ImageInfo*))); - connect(d->barView, TQT_SIGNAL(signalSetItemOnRightPanel(ImageInfo*)), - TQT_TQOBJECT(this), TQT_SLOT(slotSetItemOnRightPanel(ImageInfo*))); + connect(d->barView, TQ_SIGNAL(signalSetItemOnRightPanel(ImageInfo*)), + this, TQ_SLOT(slotSetItemOnRightPanel(ImageInfo*))); - connect(d->barView, TQT_SIGNAL(signalRemoveItem(ImageInfo*)), - TQT_TQOBJECT(this), TQT_SLOT(slotRemoveItem(ImageInfo*))); + connect(d->barView, TQ_SIGNAL(signalRemoveItem(ImageInfo*)), + this, TQ_SLOT(slotRemoveItem(ImageInfo*))); - connect(d->barView, TQT_SIGNAL(signalEditItem(ImageInfo*)), - TQT_TQOBJECT(this), TQT_SLOT(slotEditItem(ImageInfo*))); + connect(d->barView, TQ_SIGNAL(signalEditItem(ImageInfo*)), + this, TQ_SLOT(slotEditItem(ImageInfo*))); - connect(d->barView, TQT_SIGNAL(signalClearAll()), - TQT_TQOBJECT(this), TQT_SLOT(slotClearItemsList())); + connect(d->barView, TQ_SIGNAL(signalClearAll()), + this, TQ_SLOT(slotClearItemsList())); - connect(d->barView, TQT_SIGNAL(signalLightTableBarItemSelected(ImageInfo*)), - TQT_TQOBJECT(this), TQT_SLOT(slotItemSelected(ImageInfo*))); + connect(d->barView, TQ_SIGNAL(signalLightTableBarItemSelected(ImageInfo*)), + this, TQ_SLOT(slotItemSelected(ImageInfo*))); - connect(d->barView, TQT_SIGNAL(signalDroppedItems(const ImageInfoList&)), - TQT_TQOBJECT(this), TQT_SLOT(slotThumbbarDroppedItems(const ImageInfoList&))); + connect(d->barView, TQ_SIGNAL(signalDroppedItems(const ImageInfoList&)), + this, TQ_SLOT(slotThumbbarDroppedItems(const ImageInfoList&))); // Zoom bars connections ----------------------------------------- - connect(d->leftZoomBar, TQT_SIGNAL(signalZoomMinusClicked()), - d->previewView, TQT_SLOT(slotDecreaseLeftZoom())); + connect(d->leftZoomBar, TQ_SIGNAL(signalZoomMinusClicked()), + d->previewView, TQ_SLOT(slotDecreaseLeftZoom())); - connect(d->leftZoomBar, TQT_SIGNAL(signalZoomPlusClicked()), - d->previewView, TQT_SLOT(slotIncreaseLeftZoom())); + connect(d->leftZoomBar, TQ_SIGNAL(signalZoomPlusClicked()), + d->previewView, TQ_SLOT(slotIncreaseLeftZoom())); - connect(d->leftZoomBar, TQT_SIGNAL(signalZoomSliderChanged(int)), - d->previewView, TQT_SLOT(slotLeftZoomSliderChanged(int))); + connect(d->leftZoomBar, TQ_SIGNAL(signalZoomSliderChanged(int)), + d->previewView, TQ_SLOT(slotLeftZoomSliderChanged(int))); - connect(d->rightZoomBar, TQT_SIGNAL(signalZoomMinusClicked()), - d->previewView, TQT_SLOT(slotDecreaseRightZoom())); + connect(d->rightZoomBar, TQ_SIGNAL(signalZoomMinusClicked()), + d->previewView, TQ_SLOT(slotDecreaseRightZoom())); - connect(d->rightZoomBar, TQT_SIGNAL(signalZoomPlusClicked()), - d->previewView, TQT_SLOT(slotIncreaseRightZoom())); + connect(d->rightZoomBar, TQ_SIGNAL(signalZoomPlusClicked()), + d->previewView, TQ_SLOT(slotIncreaseRightZoom())); - connect(d->rightZoomBar, TQT_SIGNAL(signalZoomSliderChanged(int)), - d->previewView, TQT_SLOT(slotRightZoomSliderChanged(int))); + connect(d->rightZoomBar, TQ_SIGNAL(signalZoomSliderChanged(int)), + d->previewView, TQ_SLOT(slotRightZoomSliderChanged(int))); // View connections --------------------------------------------- - connect(d->previewView, TQT_SIGNAL(signalLeftZoomFactorChanged(double)), - TQT_TQOBJECT(this), TQT_SLOT(slotLeftZoomFactorChanged(double))); + connect(d->previewView, TQ_SIGNAL(signalLeftZoomFactorChanged(double)), + this, TQ_SLOT(slotLeftZoomFactorChanged(double))); - connect(d->previewView, TQT_SIGNAL(signalRightZoomFactorChanged(double)), - TQT_TQOBJECT(this), TQT_SLOT(slotRightZoomFactorChanged(double))); + connect(d->previewView, TQ_SIGNAL(signalRightZoomFactorChanged(double)), + this, TQ_SLOT(slotRightZoomFactorChanged(double))); - connect(d->previewView, TQT_SIGNAL(signalEditItem(ImageInfo*)), - TQT_TQOBJECT(this), TQT_SLOT(slotEditItem(ImageInfo*))); + connect(d->previewView, TQ_SIGNAL(signalEditItem(ImageInfo*)), + this, TQ_SLOT(slotEditItem(ImageInfo*))); - connect(d->previewView, TQT_SIGNAL(signalDeleteItem(ImageInfo*)), - TQT_TQOBJECT(this), TQT_SLOT(slotDeleteItem(ImageInfo*))); + connect(d->previewView, TQ_SIGNAL(signalDeleteItem(ImageInfo*)), + this, TQ_SLOT(slotDeleteItem(ImageInfo*))); - connect(d->previewView, TQT_SIGNAL(signalSlideShow()), - TQT_TQOBJECT(this), TQT_SLOT(slotToggleSlideShow())); + connect(d->previewView, TQ_SIGNAL(signalSlideShow()), + this, TQ_SLOT(slotToggleSlideShow())); - connect(d->previewView, TQT_SIGNAL(signalLeftDroppedItems(const ImageInfoList&)), - TQT_TQOBJECT(this), TQT_SLOT(slotLeftDroppedItems(const ImageInfoList&))); + connect(d->previewView, TQ_SIGNAL(signalLeftDroppedItems(const ImageInfoList&)), + this, TQ_SLOT(slotLeftDroppedItems(const ImageInfoList&))); - connect(d->previewView, TQT_SIGNAL(signalRightDroppedItems(const ImageInfoList&)), - TQT_TQOBJECT(this), TQT_SLOT(slotRightDroppedItems(const ImageInfoList&))); + connect(d->previewView, TQ_SIGNAL(signalRightDroppedItems(const ImageInfoList&)), + this, TQ_SLOT(slotRightDroppedItems(const ImageInfoList&))); - connect(d->previewView, TQT_SIGNAL(signalToggleOnSyncPreview(bool)), - TQT_TQOBJECT(this), TQT_SLOT(slotToggleOnSyncPreview(bool))); + connect(d->previewView, TQ_SIGNAL(signalToggleOnSyncPreview(bool)), + this, TQ_SLOT(slotToggleOnSyncPreview(bool))); - connect(d->previewView, TQT_SIGNAL(signalLeftPreviewLoaded(bool)), - TQT_TQOBJECT(this), TQT_SLOT(slotLeftPreviewLoaded(bool))); + connect(d->previewView, TQ_SIGNAL(signalLeftPreviewLoaded(bool)), + this, TQ_SLOT(slotLeftPreviewLoaded(bool))); - connect(d->previewView, TQT_SIGNAL(signalRightPreviewLoaded(bool)), - TQT_TQOBJECT(this), TQT_SLOT(slotRightPreviewLoaded(bool))); + connect(d->previewView, TQ_SIGNAL(signalRightPreviewLoaded(bool)), + this, TQ_SLOT(slotRightPreviewLoaded(bool))); - connect(d->previewView, TQT_SIGNAL(signalLeftPanelLeftButtonClicked()), - TQT_TQOBJECT(this), TQT_SLOT(slotLeftPanelLeftButtonClicked())); + connect(d->previewView, TQ_SIGNAL(signalLeftPanelLeftButtonClicked()), + this, TQ_SLOT(slotLeftPanelLeftButtonClicked())); - connect(d->previewView, TQT_SIGNAL(signalRightPanelLeftButtonClicked()), - TQT_TQOBJECT(this), TQT_SLOT(slotRightPanelLeftButtonClicked())); + connect(d->previewView, TQ_SIGNAL(signalRightPanelLeftButtonClicked()), + this, TQ_SLOT(slotRightPanelLeftButtonClicked())); } void LightTableWindow::setupActions() { // -- Standard 'File' menu actions --------------------------------------------- - d->backwardAction = KStdAction::back(TQT_TQOBJECT(this), TQT_SLOT(slotBackward()), + d->backwardAction = KStdAction::back(this, TQ_SLOT(slotBackward()), actionCollection(), "lighttable_backward"); d->backwardAction->setEnabled(false); - d->forwardAction = KStdAction::forward(TQT_TQOBJECT(this), TQT_SLOT(slotForward()), + d->forwardAction = KStdAction::forward(this, TQ_SLOT(slotForward()), actionCollection(), "lighttable_forward"); d->forwardAction->setEnabled(false); d->firstAction = new TDEAction(i18n("&First"), "go-first", TDEStdAccel::shortcut( TDEStdAccel::Home), - TQT_TQOBJECT(this), TQT_SLOT(slotFirst()), + this, TQ_SLOT(slotFirst()), actionCollection(), "lighttable_first"); d->firstAction->setEnabled(false); d->lastAction = new TDEAction(i18n("&Last"), "go-last", TDEStdAccel::shortcut( TDEStdAccel::End), - TQT_TQOBJECT(this), TQT_SLOT(slotLast()), + this, TQ_SLOT(slotLast()), actionCollection(), "lighttable_last"); d->lastAction->setEnabled(false); d->setItemLeftAction = new TDEAction(i18n("On Left"), "go-previous", - CTRL+Key_L, TQT_TQOBJECT(this), TQT_SLOT(slotSetItemLeft()), + CTRL+Key_L, this, TQ_SLOT(slotSetItemLeft()), actionCollection(), "lighttable_setitemleft"); d->setItemLeftAction->setEnabled(false); d->setItemLeftAction->setWhatsThis(i18n("Show item on left panel")); d->setItemRightAction = new TDEAction(i18n("On Right"), "go-next", - CTRL+Key_R, TQT_TQOBJECT(this), TQT_SLOT(slotSetItemRight()), + CTRL+Key_R, this, TQ_SLOT(slotSetItemRight()), actionCollection(), "lighttable_setitemright"); d->setItemRightAction->setEnabled(false); d->setItemRightAction->setWhatsThis(i18n("Show item on right panel")); d->editItemAction = new TDEAction(i18n("Edit"), "editimage", - Key_F4, TQT_TQOBJECT(this), TQT_SLOT(slotEditItem()), + Key_F4, this, TQ_SLOT(slotEditItem()), actionCollection(), "lighttable_edititem"); d->editItemAction->setEnabled(false); d->removeItemAction = new TDEAction(i18n("Remove item from LightTable"), "window-close", - CTRL+Key_K, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveItem()), + CTRL+Key_K, this, TQ_SLOT(slotRemoveItem()), actionCollection(), "lighttable_removeitem"); d->removeItemAction->setEnabled(false); d->clearListAction = new TDEAction(i18n("Remove all items from LightTable"), "editshred", - CTRL+SHIFT+Key_K, TQT_TQOBJECT(this), TQT_SLOT(slotClearItemsList()), + CTRL+SHIFT+Key_K, this, TQ_SLOT(slotClearItemsList()), actionCollection(), "lighttable_clearlist"); d->clearListAction->setEnabled(false); d->fileDeleteAction = new TDEAction(i18n("Move to Trash"), "edittrash", Key_Delete, - TQT_TQOBJECT(this), TQT_SLOT(slotDeleteItem()), + this, TQ_SLOT(slotDeleteItem()), actionCollection(), "lighttable_filedelete"); d->fileDeleteAction->setEnabled(false); - KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection(), "lighttable_close"); + KStdAction::close(this, TQ_SLOT(close()), actionCollection(), "lighttable_close"); // -- Standard 'View' menu actions --------------------------------------------- d->syncPreviewAction = new TDEToggleAction(i18n("Synchronize"), "goto", - CTRL+SHIFT+Key_Y, TQT_TQOBJECT(this), - TQT_SLOT(slotToggleSyncPreview()), + CTRL+SHIFT+Key_Y, this, + TQ_SLOT(slotToggleSyncPreview()), actionCollection(), "lighttable_syncpreview"); d->syncPreviewAction->setEnabled(false); d->syncPreviewAction->setWhatsThis(i18n("Synchronize preview from left and right panels")); d->navigateByPairAction = new TDEToggleAction(i18n("By Pair"), "preferences-system", - CTRL+SHIFT+Key_P, TQT_TQOBJECT(this), - TQT_SLOT(slotToggleNavigateByPair()), + CTRL+SHIFT+Key_P, this, + TQ_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, TQ_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, TQ_SLOT(slotDecreaseZoom()), actionCollection(), "lighttable_zoomminus"); d->zoomMinusAction->setEnabled(false); d->zoomTo100percents = new TDEAction(i18n("Zoom to 100%"), "zoom-original", ALT+CTRL+Key_0, // NOTE: Photoshop 7 use ALT+CTRL+0. - TQT_TQOBJECT(this), TQT_SLOT(slotZoomTo100Percents()), + this, TQ_SLOT(slotZoomTo100Percents()), actionCollection(), "lighttable_zoomto100percents"); d->zoomFitToWindowAction = new TDEAction(i18n("Fit to &Window"), "view_fit_window", - CTRL+SHIFT+Key_E, TQT_TQOBJECT(this), TQT_SLOT(slotFitToWindow()), + CTRL+SHIFT+Key_E, this, TQ_SLOT(slotFitToWindow()), actionCollection(), "lighttable_zoomfit2window"); // Do not use std KDE action for full screen because action text is too large for app. toolbar. d->fullScreenAction = new TDEToggleAction(i18n("Full Screen"), "view-fullscreen", - CTRL+SHIFT+Key_F, TQT_TQOBJECT(this), - TQT_SLOT(slotToggleFullScreen()), + CTRL+SHIFT+Key_F, this, + TQ_SLOT(slotToggleFullScreen()), actionCollection(), "lighttable_fullscreen"); d->fullScreenAction->setWhatsThis(i18n("Toggle the window to full screen mode")); d->slideShowAction = new TDEAction(i18n("Slideshow"), "slideshow", Key_F9, - TQT_TQOBJECT(this), TQT_SLOT(slotToggleSlideShow()), + this, TQ_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, TQ_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, TQ_SLOT(slotEditKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(slotConfToolbars()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(slotSetup()), actionCollection()); // ----------------------------------------------------------------------------------------- d->themeMenuAction = new TDESelectAction(i18n("&Themes"), 0, actionCollection(), "theme_menu"); - connect(d->themeMenuAction, TQT_SIGNAL(activated(const TQString&)), - TQT_TQOBJECT(this), TQT_SLOT(slotChangeTheme(const TQString&))); + connect(d->themeMenuAction, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(slotChangeTheme(const TQString&))); d->themeMenuAction->setItems(ThemeEngine::instance()->themeNames()); slotThemeChanged(); @@ -449,21 +449,21 @@ void LightTableWindow::setupActions() d->donateMoneyAction = new TDEAction(i18n("Donate..."), 0, 0, - TQT_TQOBJECT(this), TQT_SLOT(slotDonateMoney()), + this, TQ_SLOT(slotDonateMoney()), actionCollection(), "lighttable_donatemoney"); d->contributeAction = new TDEAction(i18n("Contribute..."), 0, 0, - TQT_TQOBJECT(this), TQT_SLOT(slotContribute()), + this, TQ_SLOT(slotContribute()), actionCollection(), "lighttable_contribute"); d->rawCameraListAction = new TDEAction(i18n("Supported RAW Cameras"), "kdcraw", 0, - TQT_TQOBJECT(this), - TQT_SLOT(slotRawCameraList()), + this, + TQ_SLOT(slotRawCameraList()), actionCollection(), "lighttable_rawcameralist"); @@ -477,22 +477,22 @@ void LightTableWindow::setupActions() // -- Rating actions --------------------------------------------------------------- d->star0 = new TDEAction(i18n("Assign Rating \"No Stars\""), CTRL+Key_0, - TQT_TQOBJECT(d->barView), TQT_SLOT(slotAssignRatingNoStar()), + d->barView, TQ_SLOT(slotAssignRatingNoStar()), actionCollection(), "lighttable_ratenostar"); d->star1 = new TDEAction(i18n("Assign Rating \"One Star\""), CTRL+Key_1, - TQT_TQOBJECT(d->barView), TQT_SLOT(slotAssignRatingOneStar()), + d->barView, TQ_SLOT(slotAssignRatingOneStar()), actionCollection(), "lighttable_rateonestar"); d->star2 = new TDEAction(i18n("Assign Rating \"Two Stars\""), CTRL+Key_2, - TQT_TQOBJECT(d->barView), TQT_SLOT(slotAssignRatingTwoStar()), + d->barView, TQ_SLOT(slotAssignRatingTwoStar()), actionCollection(), "lighttable_ratetwostar"); d->star3 = new TDEAction(i18n("Assign Rating \"Three Stars\""), CTRL+Key_3, - TQT_TQOBJECT(d->barView), TQT_SLOT(slotAssignRatingThreeStar()), + d->barView, TQ_SLOT(slotAssignRatingThreeStar()), actionCollection(), "lighttable_ratethreestar"); d->star4 = new TDEAction(i18n("Assign Rating \"Four Stars\""), CTRL+Key_4, - TQT_TQOBJECT(d->barView), TQT_SLOT(slotAssignRatingFourStar()), + d->barView, TQ_SLOT(slotAssignRatingFourStar()), actionCollection(), "lighttable_ratefourstar"); d->star5 = new TDEAction(i18n("Assign Rating \"Five Stars\""), CTRL+Key_5, - TQT_TQOBJECT(d->barView), TQT_SLOT(slotAssignRatingFiveStar()), + d->barView, TQ_SLOT(slotAssignRatingFiveStar()), actionCollection(), "lighttable_ratefivestar"); // --------------------------------------------------------------------------------- @@ -508,42 +508,42 @@ void LightTableWindow::setupAccelerators() d->accelerators->insert("Exit fullscreen", i18n("Exit Fullscreen mode"), i18n("Exit fullscreen viewing mode"), - Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(slotEscapePressed()), + Key_Escape, this, TQ_SLOT(slotEscapePressed()), false, true); d->accelerators->insert("Next Image Key_Space", i18n("Next Image"), i18n("Load Next Image"), - Key_Space, TQT_TQOBJECT(this), TQT_SLOT(slotForward()), + Key_Space, this, TQ_SLOT(slotForward()), false, true); d->accelerators->insert("Previous Image SHIFT+Key_Space", i18n("Previous Image"), i18n("Load Previous Image"), - SHIFT+Key_Space, TQT_TQOBJECT(this), TQT_SLOT(slotBackward()), + SHIFT+Key_Space, this, TQ_SLOT(slotBackward()), false, true); d->accelerators->insert("Previous Image Key_Backspace", i18n("Previous Image"), i18n("Load Previous Image"), - Key_Backspace, TQT_TQOBJECT(this), TQT_SLOT(slotBackward()), + Key_Backspace, this, TQ_SLOT(slotBackward()), false, true); d->accelerators->insert("Next Image Key_Next", i18n("Next Image"), i18n("Load Next Image"), - Key_Next, TQT_TQOBJECT(this), TQT_SLOT(slotForward()), + Key_Next, this, TQ_SLOT(slotForward()), false, true); d->accelerators->insert("Previous Image Key_Prior", i18n("Previous Image"), i18n("Load Previous Image"), - Key_Prior, TQT_TQOBJECT(this), TQT_SLOT(slotBackward()), + Key_Prior, this, TQ_SLOT(slotBackward()), false, true); d->accelerators->insert("Zoom Plus Key_Plus", i18n("Zoom in"), i18n("Zoom in on image"), - Key_Plus, TQT_TQOBJECT(d->previewView), TQT_SLOT(slotIncreaseZoom()), + Key_Plus, d->previewView, TQ_SLOT(slotIncreaseZoom()), false, true); d->accelerators->insert("Zoom Plus Key_Minus", i18n("Zoom out"), i18n("Zoom out from image"), - Key_Minus, TQT_TQOBJECT(d->previewView), TQT_SLOT(slotDecreaseZoom()), + Key_Minus, d->previewView, TQ_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) { @@ -1481,7 +1481,7 @@ void LightTableWindow::plugActionAccel(TDEAction* action) action->whatsThis(), action->shortcut(), action, - TQT_SLOT(activate())); + TQ_SLOT(activate())); } void LightTableWindow::unplugActionAccel(TDEAction* action) @@ -1511,8 +1511,8 @@ void LightTableWindow::slotConfToolbars() saveMainWindowSettings(TDEGlobal::config(), "LightTable Settings"); KEditToolbar dlg(factory(), this); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), - TQT_TQOBJECT(this), TQT_SLOT(slotNewToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), + this, TQ_SLOT(slotNewToolbarConfig())); dlg.exec(); } diff --git a/digikam/utilities/lighttable/lighttablewindow.h b/digikam/utilities/lighttable/lighttablewindow.h index d30f49f..f080e2d 100644 --- a/digikam/utilities/lighttable/lighttablewindow.h +++ b/digikam/utilities/lighttable/lighttablewindow.h @@ -48,7 +48,7 @@ class LightTableWindowPriv; class LightTableWindow : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: |