diff options
Diffstat (limited to 'digikam/utilities')
18 files changed, 59 insertions, 59 deletions
diff --git a/digikam/utilities/batch/imageinfojob.cpp b/digikam/utilities/batch/imageinfojob.cpp index 9fc5bc3..5d07c9a 100644 --- a/digikam/utilities/batch/imageinfojob.cpp +++ b/digikam/utilities/batch/imageinfojob.cpp @@ -151,7 +151,7 @@ void ImageInfoJob::slotData(TDEIO::Job*, const TQByteArray& data) ds >> dims; ImageInfo* info = new ImageInfo(imageID, albumID, name, - TQDateTime::fromString(date, Qt::ISODate), + TQDateTime::fromString(date, TQt::ISODate), size, dims); itemsList.append(info); diff --git a/digikam/utilities/cameragui/cameraui.cpp b/digikam/utilities/cameragui/cameraui.cpp index 302f3ea..cdabd06 100644 --- a/digikam/utilities/cameragui/cameraui.cpp +++ b/digikam/utilities/cameragui/cameraui.cpp @@ -1142,13 +1142,13 @@ void CameraUI::slotDownload(bool onlySelected, bool deleteAfter, Album *album) switch(d->folderDateFormat->currentItem()) { case CameraUIPriv::TextDateFormat: - newDirName = dateTime.date().toString(Qt::TextDate); + newDirName = dateTime.date().toString(TQt::TextDate); break; case CameraUIPriv::LocalDateFormat: - newDirName = dateTime.date().toString(Qt::LocalDate); + newDirName = dateTime.date().toString(TQt::LocalDate); break; default: // IsoDateFormat - newDirName = dateTime.date().toString(Qt::ISODate); + newDirName = dateTime.date().toString(TQt::ISODate); break; } } @@ -1234,13 +1234,13 @@ void CameraUI::slotDownload(bool onlySelected, bool deleteAfter, Album *album) switch(d->folderDateFormat->currentItem()) { case CameraUIPriv::TextDateFormat: - dirName = dateTime.date().toString(Qt::TextDate); + dirName = dateTime.date().toString(TQt::TextDate); break; case CameraUIPriv::LocalDateFormat: - dirName = dateTime.date().toString(Qt::LocalDate); + dirName = dateTime.date().toString(TQt::LocalDate); break; default: // IsoDateFormat - dirName = dateTime.date().toString(Qt::ISODate); + dirName = dateTime.date().toString(TQt::ISODate); break; } // See B.K.O #136927 : we need to support file system which do not diff --git a/digikam/utilities/cameragui/renamecustomizer.cpp b/digikam/utilities/cameragui/renamecustomizer.cpp index 265cfcd..bc7b4c6 100644 --- a/digikam/utilities/cameragui/renamecustomizer.cpp +++ b/digikam/utilities/cameragui/renamecustomizer.cpp @@ -135,7 +135,7 @@ RenameCustomizer::RenameCustomizer(TQWidget* parent, const TQString& cameraTitle setFrameStyle( TQFrame::NoFrame ); setRadioButtonExclusive(true); - setColumnLayout(0, Qt::Vertical); + setColumnLayout(0, TQt::Vertical); TQGridLayout* mainLayout = new TQGridLayout(layout(), 4, 1); // ---------------------------------------------------------------- @@ -148,7 +148,7 @@ RenameCustomizer::RenameCustomizer(TQWidget* parent, const TQString& cameraTitle d->renameDefaultBox = new TQGroupBox( this ); d->renameDefaultBox->setFrameStyle(TQFrame::NoFrame|TQFrame::Plain); d->renameDefaultBox->setInsideMargin(0); - d->renameDefaultBox->setColumnLayout(0, Qt::Vertical); + d->renameDefaultBox->setColumnLayout(0, TQt::Vertical); d->renameDefaultCase = new TQLabel( i18n("Change case to:"), d->renameDefaultBox ); d->renameDefaultCase->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred ); @@ -178,7 +178,7 @@ RenameCustomizer::RenameCustomizer(TQWidget* parent, const TQString& cameraTitle d->renameCustomBox = new TQGroupBox(this); d->renameCustomBox->setFrameStyle(TQFrame::NoFrame|TQFrame::Plain); d->renameCustomBox->setInsideMargin(0); - d->renameCustomBox->setColumnLayout(0, Qt::Vertical); + d->renameCustomBox->setColumnLayout(0, TQt::Vertical); TQGridLayout* renameCustomBoxLayout = new TQGridLayout(d->renameCustomBox->layout(), 6, 2, KDialogBase::spacingHint()); @@ -331,13 +331,13 @@ TQString RenameCustomizer::newName(const TQDateTime &dateTime, int index, const date = dateTime.toString("yyyyMMddThhmmss"); break; case RenameCustomizerPriv::TextDateFormat: - date = dateTime.toString(Qt::TextDate); + date = dateTime.toString(TQt::TextDate); break; case RenameCustomizerPriv::LocalDateFormat: - date = dateTime.toString(Qt::LocalDate); + date = dateTime.toString(TQt::LocalDate); break; case RenameCustomizerPriv::IsoDateFormat: - date = dateTime.toString(Qt::ISODate); + date = dateTime.toString(TQt::ISODate); break; case RenameCustomizerPriv::Advanced: date = dateTime.toString(d->dateTimeFormatString); diff --git a/digikam/utilities/imageeditor/canvas/canvas.cpp b/digikam/utilities/imageeditor/canvas/canvas.cpp index 8154c09..09d4a6a 100644 --- a/digikam/utilities/imageeditor/canvas/canvas.cpp +++ b/digikam/utilities/imageeditor/canvas/canvas.cpp @@ -646,12 +646,12 @@ void Canvas::drawRubber() void Canvas::contentsMousePressEvent(TQMouseEvent *e) { - if (!e || e->button() == Qt::RightButton) + if (!e || e->button() == TQt::RightButton) return; d->midButtonPressed = false; - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) { if (d->ltActive || d->rtActive || d->lbActive || d->rbActive) @@ -695,7 +695,7 @@ void Canvas::contentsMousePressEvent(TQMouseEvent *e) return; } } - else if (e->button() == Qt::MidButton) + else if (e->button() == TQt::MidButton) { if (visibleWidth() < d->im->width() || visibleHeight() < d->im->height()) @@ -733,7 +733,7 @@ void Canvas::contentsMouseMoveEvent(TQMouseEvent *e) if (!e) return; - if (e->state() & Qt::MidButton) + if (e->state() & TQt::MidButton) { if (d->midButtonPressed) { @@ -746,7 +746,7 @@ void Canvas::contentsMouseMoveEvent(TQMouseEvent *e) if (!d->rubber) return; - if (e->state() != Qt::LeftButton && + if (e->state() != TQt::LeftButton && !(d->ltActive || d->rtActive || d->lbActive || d->rbActive)) return; @@ -865,12 +865,12 @@ void Canvas::contentsMouseReleaseEvent(TQMouseEvent *e) emit signalSelected(false); } - if (e->button() != Qt::LeftButton) + if (e->button() != TQt::LeftButton) { viewport()->unsetCursor(); } - if (e->button() == Qt::RightButton) + if (e->button() == TQt::RightButton) { emit signalRightButtonClicked(); } diff --git a/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp b/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp index f81a70d..1d098b2 100644 --- a/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp +++ b/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp @@ -84,7 +84,7 @@ ColorCorrectionDlg::ColorCorrectionDlg(TQWidget* parent, DImg *preview, TQLabel *embeddedProfileTitle = new TQLabel(i18n("Embedded color profile:"), page); TQLabel *embeddedProfileDesc = new TQLabel(TQString("<b>%1</b>").arg(m_iccTrans->getEmbeddedProfileDescriptor()), page); TQPushButton *embeddedProfInfo = new TQPushButton(i18n("Info..."), page); - KSeparator *line = new KSeparator(Qt::Horizontal, page); + KSeparator *line = new KSeparator(TQt::Horizontal, page); if (m_iccTrans->embeddedProfile().isEmpty()) { @@ -117,7 +117,7 @@ ColorCorrectionDlg::ColorCorrectionDlg(TQWidget* parent, DImg *preview, vlay->addWidget(logo); vlay->addWidget(message); - vlay->addWidget(new KSeparator(Qt::Horizontal, page)); + vlay->addWidget(new KSeparator(TQt::Horizontal, page)); vlay->addWidget(currentProfileTitle); vlay->addWidget(currentProfileDesc); diff --git a/digikam/utilities/imageeditor/canvas/undoaction.cpp b/digikam/utilities/imageeditor/canvas/undoaction.cpp index dea1a94..bb4ff75 100644 --- a/digikam/utilities/imageeditor/canvas/undoaction.cpp +++ b/digikam/utilities/imageeditor/canvas/undoaction.cpp @@ -108,9 +108,9 @@ UndoActionFlip::UndoActionFlip(DImgInterface* iface, UndoActionFlip::Direction dir) : UndoAction(iface), m_dir(dir) { - if(m_dir ==Qt::Horizontal) + if(m_dir ==TQt::Horizontal) m_title = i18n("Flip Horizontal"); - else if(m_dir ==Qt::Vertical) + else if(m_dir ==TQt::Vertical) m_title = i18n("Flip Vertical"); } @@ -122,10 +122,10 @@ void UndoActionFlip::rollBack() { switch(m_dir) { - case Qt::Horizontal: + case TQt::Horizontal: m_iface->flipHoriz(false); return; - case Qt::Vertical: + case TQt::Vertical: m_iface->flipVert(false); return; default: diff --git a/digikam/utilities/imageeditor/tools/imageprint.cpp b/digikam/utilities/imageeditor/tools/imageprint.cpp index 1803a4d..ece28f6 100644 --- a/digikam/utilities/imageeditor/tools/imageprint.cpp +++ b/digikam/utilities/imageeditor/tools/imageprint.cpp @@ -140,9 +140,9 @@ bool ImagePrint::printImageWithTQt() // Black & white print ? if ( m_printer.option( "app-imageeditor-blackwhite" ) != f) { - image2Print = image2Print.convertDepth( 1, Qt::MonoOnly | - Qt::ThresholdDither | - Qt::AvoidDither ); + image2Print = image2Print.convertDepth( 1, TQt::MonoOnly | + TQt::ThresholdDither | + TQt::AvoidDither ); } TQPainter p; diff --git a/digikam/utilities/lighttable/lighttablebar.cpp b/digikam/utilities/lighttable/lighttablebar.cpp index 849706c..7149018 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()); @@ -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); @@ -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) { @@ -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/lighttablewindow.cpp b/digikam/utilities/lighttable/lighttablewindow.cpp index 0b77be1..a9988f9 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); diff --git a/digikam/utilities/setup/cameraselection.cpp b/digikam/utilities/setup/cameraselection.cpp index 2274d87..e1bd9fe 100644 --- a/digikam/utilities/setup/cameraselection.cpp +++ b/digikam/utilities/setup/cameraselection.cpp @@ -174,7 +174,7 @@ CameraSelection::CameraSelection( TQWidget* parent ) // -------------------------------------------------------------- - TQGroupBox* box2 = new TQGroupBox( 0, Qt::Vertical, plainPage() ); + TQGroupBox* box2 = new TQGroupBox( 0, TQt::Vertical, plainPage() ); box2->setFrameStyle( TQFrame::NoFrame ); TQGridLayout* box2Layout = new TQGridLayout( box2->layout(), 1, 5 ); diff --git a/digikam/utilities/setup/setupcamera.cpp b/digikam/utilities/setup/setupcamera.cpp index 214a1df..f6a3b7b 100644 --- a/digikam/utilities/setup/setupcamera.cpp +++ b/digikam/utilities/setup/setupcamera.cpp @@ -166,7 +166,7 @@ SetupCamera::SetupCamera( TQWidget* parent ) { new TQListViewItem(d->listView, ctype->title(), ctype->model(), ctype->port(), ctype->path(), - ctype->lastAccess().toString(Qt::ISODate)); + ctype->lastAccess().toString(TQt::ISODate)); } } } @@ -261,7 +261,7 @@ void SetupCamera::slotAutoDetectCamera() KMessageBox::information(this, i18n("Found camera '%1' (%2) and added it to the list.") .arg(model).arg(port)); new TQListViewItem(d->listView, model, model, port, "/", - TQDateTime::currentDateTime().toString(Qt::ISODate)); + TQDateTime::currentDateTime().toString(TQt::ISODate)); } } @@ -269,7 +269,7 @@ void SetupCamera::slotAddedCamera(const TQString& title, const TQString& model, const TQString& port, const TQString& path) { new TQListViewItem(d->listView, title, model, port, path, - TQDateTime::currentDateTime().toString(Qt::ISODate)); + TQDateTime::currentDateTime().toString(TQt::ISODate)); } void SetupCamera::slotEditedCamera(const TQString& title, const TQString& model, @@ -300,7 +300,7 @@ void SetupCamera::applySettings() TQDateTime lastAccess = TQDateTime::currentDateTime(); if (!item->text(4).isEmpty()) - lastAccess = TQDateTime::fromString(item->text(4), Qt::ISODate); + lastAccess = TQDateTime::fromString(item->text(4), TQt::ISODate); CameraType *ctype = new CameraType(item->text(0), item->text(1), item->text(2), item->text(3), lastAccess); diff --git a/digikam/utilities/setup/setupgeneral.cpp b/digikam/utilities/setup/setupgeneral.cpp index b6fd47b..0ea3396 100644 --- a/digikam/utilities/setup/setupgeneral.cpp +++ b/digikam/utilities/setup/setupgeneral.cpp @@ -166,7 +166,7 @@ SetupGeneral::SetupGeneral(TQWidget* parent, KDialogBase* dialog ) // -------------------------------------------------------- TQVGroupBox *interfaceOptionsGroup = new TQVGroupBox(i18n("Interface Options"), parent); - interfaceOptionsGroup->setColumnLayout(0, Qt::Vertical ); + interfaceOptionsGroup->setColumnLayout(0, TQt::Vertical ); interfaceOptionsGroup->layout()->setMargin(KDialog::marginHint()); TQGridLayout* ifaceSettingsLayout = new TQGridLayout(interfaceOptionsGroup->layout(), 3, 4, KDialog::spacingHint()); diff --git a/digikam/utilities/setup/setupicc.cpp b/digikam/utilities/setup/setupicc.cpp index ecfa711..fcba0d4 100644 --- a/digikam/utilities/setup/setupicc.cpp +++ b/digikam/utilities/setup/setupicc.cpp @@ -154,7 +154,7 @@ SetupICC::SetupICC(TQWidget* parent, KDialogBase* dialog ) // -------------------------------------------------------- - TQGroupBox *colorPolicy = new TQGroupBox(0, Qt::Horizontal, i18n("Color Management Policy"), parent); + TQGroupBox *colorPolicy = new TQGroupBox(0, TQt::Horizontal, i18n("Color Management Policy"), parent); TQGridLayout* grid = new TQGridLayout( colorPolicy->layout(), 1, 2, KDialog::spacingHint()); d->enableColorManagement = new TQCheckBox(colorPolicy); @@ -171,7 +171,7 @@ SetupICC::SetupICC(TQWidget* parent, KDialogBase* dialog ) TQToolTip::add(lcmsLogoLabel, i18n("Visit Little CMS project website")); d->behaviourGB = new TQVGroupBox(i18n("Behavior"), colorPolicy); - TQButtonGroup *behaviourOptions = new TQButtonGroup(2, Qt::Vertical, d->behaviourGB); + TQButtonGroup *behaviourOptions = new TQButtonGroup(2, TQt::Vertical, d->behaviourGB); behaviourOptions->setFrameStyle( TQFrame::NoFrame ); behaviourOptions->setInsideMargin(0); @@ -210,7 +210,7 @@ SetupICC::SetupICC(TQWidget* parent, KDialogBase* dialog ) // -------------------------------------------------------- - d->profilesGB = new TQGroupBox(0, Qt::Horizontal, i18n("ICC Profiles Settings"), parent); + d->profilesGB = new TQGroupBox(0, TQt::Horizontal, i18n("ICC Profiles Settings"), parent); TQGridLayout* grid2 = new TQGridLayout( d->profilesGB->layout(), 4, 3, KDialog::spacingHint()); grid2->setColStretch(2, 10); diff --git a/digikam/utilities/setup/setupidentity.cpp b/digikam/utilities/setup/setupidentity.cpp index a27c116..d369038 100644 --- a/digikam/utilities/setup/setupidentity.cpp +++ b/digikam/utilities/setup/setupidentity.cpp @@ -78,7 +78,7 @@ SetupIdentity::SetupIdentity(TQWidget* parent ) TQRegExp asciiRx("[\x20-\x7F]+$"); TQValidator *asciiValidator = new TQRegExpValidator(asciiRx, TQT_TQOBJECT(this)); - TQGroupBox *photographerIdGroup = new TQGroupBox(0, Qt::Horizontal, i18n("Photographer and Copyright Information"), parent); + TQGroupBox *photographerIdGroup = new TQGroupBox(0, TQt::Horizontal, i18n("Photographer and Copyright Information"), parent); TQGridLayout* grid = new TQGridLayout( photographerIdGroup->layout(), 1, 1, KDialog::spacingHint()); TQLabel *label1 = new TQLabel(i18n("Author:"), photographerIdGroup); @@ -108,7 +108,7 @@ SetupIdentity::SetupIdentity(TQWidget* parent ) // -------------------------------------------------------- - TQGroupBox *creditsGroup = new TQGroupBox(0, Qt::Horizontal, i18n("Credit and Copyright"), parent); + TQGroupBox *creditsGroup = new TQGroupBox(0, TQt::Horizontal, i18n("Credit and Copyright"), parent); TQGridLayout* grid2 = new TQGridLayout( creditsGroup->layout(), 2, 1, KDialog::spacingHint()); TQLabel *label3 = new TQLabel(i18n("Credit:"), creditsGroup); diff --git a/digikam/utilities/setup/setupiofiles.cpp b/digikam/utilities/setup/setupiofiles.cpp index c8b9891..6cdf23d 100644 --- a/digikam/utilities/setup/setupiofiles.cpp +++ b/digikam/utilities/setup/setupiofiles.cpp @@ -77,21 +77,21 @@ SetupIOFiles::SetupIOFiles(TQWidget* parent ) //-- JPEG Settings ------------------------------------------------------ d->JPEGOptions = new JPEGSettings(parent); - KSeparator *line1 = new KSeparator(Qt::Horizontal, parent); + KSeparator *line1 = new KSeparator(TQt::Horizontal, parent); vbox->addWidget(d->JPEGOptions); vbox->addWidget(line1); //-- PNG Settings ------------------------------------------------------- d->PNGOptions = new PNGSettings(parent); - KSeparator *line2 = new KSeparator(Qt::Horizontal, parent); + KSeparator *line2 = new KSeparator(TQt::Horizontal, parent); vbox->addWidget(d->PNGOptions); vbox->addWidget(line2); //-- TIFF Settings ------------------------------------------------------ d->TIFFOptions = new TIFFSettings(parent); - KSeparator *line3 = new KSeparator(Qt::Horizontal, parent); + KSeparator *line3 = new KSeparator(TQt::Horizontal, parent); vbox->addWidget(d->TIFFOptions); vbox->addWidget(line3); diff --git a/digikam/utilities/setup/setupmetadata.cpp b/digikam/utilities/setup/setupmetadata.cpp index 3357b1c..41878bc 100644 --- a/digikam/utilities/setup/setupmetadata.cpp +++ b/digikam/utilities/setup/setupmetadata.cpp @@ -93,7 +93,7 @@ SetupMetadata::SetupMetadata(TQWidget* parent ) // -------------------------------------------------------- - TQGroupBox *ExifGroup = new TQGroupBox(1, Qt::Horizontal, i18n("EXIF Actions"), parent); + TQGroupBox *ExifGroup = new TQGroupBox(1, TQt::Horizontal, i18n("EXIF Actions"), parent); d->ExifRotateBox = new TQCheckBox(ExifGroup); d->ExifRotateBox->setText(i18n("Show images/thumbs &rotated according to orientation tag")); @@ -103,7 +103,7 @@ SetupMetadata::SetupMetadata(TQWidget* parent ) // -------------------------------------------------------- - TQGroupBox *IptcGroup = new TQGroupBox(1, Qt::Horizontal, i18n("IPTC Actions"), parent); + TQGroupBox *IptcGroup = new TQGroupBox(1, TQt::Horizontal, i18n("IPTC Actions"), parent); d->saveTagsIptcBox = new TQCheckBox(IptcGroup); d->saveTagsIptcBox->setText(i18n("&Save image tags as \"Keywords\" tag")); @@ -124,7 +124,7 @@ SetupMetadata::SetupMetadata(TQWidget* parent ) // -------------------------------------------------------- - TQGroupBox *commonGroup = new TQGroupBox(1, Qt::Horizontal, i18n("Common Metadata Actions"), parent); + TQGroupBox *commonGroup = new TQGroupBox(1, TQt::Horizontal, i18n("Common Metadata Actions"), parent); d->saveCommentsBox = new TQCheckBox(commonGroup); d->saveCommentsBox->setText(i18n("&Save image captions as embedded text")); diff --git a/digikam/utilities/setup/setupmime.cpp b/digikam/utilities/setup/setupmime.cpp index 594dece..1d54c82 100644 --- a/digikam/utilities/setup/setupmime.cpp +++ b/digikam/utilities/setup/setupmime.cpp @@ -84,7 +84,7 @@ SetupMime::SetupMime(TQWidget* parent ) // -------------------------------------------------------- - TQGroupBox *imageFileFilterBox = new TQGroupBox(0, Qt::Horizontal, i18n("Image Files"), parent); + TQGroupBox *imageFileFilterBox = new TQGroupBox(0, TQt::Horizontal, i18n("Image Files"), parent); TQGridLayout* grid1 = new TQGridLayout(imageFileFilterBox->layout(), 1, 1, KDialog::spacingHint()); TQLabel *logoLabel1 = new TQLabel(imageFileFilterBox); @@ -115,7 +115,7 @@ SetupMime::SetupMime(TQWidget* parent ) // -------------------------------------------------------- - TQGroupBox *movieFileFilterBox = new TQGroupBox(0, Qt::Horizontal, i18n("Movie Files"), parent); + TQGroupBox *movieFileFilterBox = new TQGroupBox(0, TQt::Horizontal, i18n("Movie Files"), parent); TQGridLayout* grid2 = new TQGridLayout(movieFileFilterBox->layout(), 1, 1, KDialog::spacingHint()); TQLabel *logoLabel2 = new TQLabel(movieFileFilterBox); @@ -146,7 +146,7 @@ SetupMime::SetupMime(TQWidget* parent ) // -------------------------------------------------------- - TQGroupBox *audioFileFilterBox = new TQGroupBox(0, Qt::Horizontal, i18n("Audio Files"), parent); + TQGroupBox *audioFileFilterBox = new TQGroupBox(0, TQt::Horizontal, i18n("Audio Files"), parent); TQGridLayout* grid3 = new TQGridLayout(audioFileFilterBox->layout(), 1, 1, KDialog::spacingHint()); TQLabel *logoLabel3 = new TQLabel(audioFileFilterBox); @@ -177,7 +177,7 @@ SetupMime::SetupMime(TQWidget* parent ) // -------------------------------------------------------- - TQGroupBox *rawFileFilterBox = new TQGroupBox(0, Qt::Horizontal, i18n("RAW Files"), parent); + TQGroupBox *rawFileFilterBox = new TQGroupBox(0, TQt::Horizontal, i18n("RAW Files"), parent); TQGridLayout* grid4 = new TQGridLayout(rawFileFilterBox->layout(), 1, 1, KDialog::spacingHint()); TQLabel *logoLabel4 = new TQLabel(rawFileFilterBox); diff --git a/digikam/utilities/slideshow/slideshow.cpp b/digikam/utilities/slideshow/slideshow.cpp index 31c6cf2..0983e8c 100644 --- a/digikam/utilities/slideshow/slideshow.cpp +++ b/digikam/utilities/slideshow/slideshow.cpp @@ -598,14 +598,14 @@ void SlideShow::mousePressEvent(TQMouseEvent *e) if (d->endOfShow) close(); - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) { d->timer->stop(); d->pause = true; d->toolBar->setPaused(true); slotNext(); } - else if (e->button() == Qt::RightButton && d->fileIndex-1 >= 0) + else if (e->button() == TQt::RightButton && d->fileIndex-1 >= 0) { d->timer->stop(); d->pause = true; |