diff options
Diffstat (limited to 'digikam/libs')
116 files changed, 471 insertions, 471 deletions
diff --git a/digikam/libs/dialogs/ctrlpaneldlg.cpp b/digikam/libs/dialogs/ctrlpaneldlg.cpp index a40dc68..450d380 100644 --- a/digikam/libs/dialogs/ctrlpaneldlg.cpp +++ b/digikam/libs/dialogs/ctrlpaneldlg.cpp @@ -142,7 +142,7 @@ CtrlPanelDlg::CtrlPanelDlg(TQWidget* parent, TQString title, TQString name, // ------------------------------------------------------------- - TQTimer::singleShot(0, this, TQT_SLOT(slotInit())); + TQTimer::singleShot(0, this, TQ_SLOT(slotInit())); kapp->restoreOverrideCursor(); } @@ -163,17 +163,17 @@ CtrlPanelDlg::~CtrlPanelDlg() void CtrlPanelDlg::slotInit() { // Reset values to defaults. - TQTimer::singleShot(0, this, TQT_SLOT(readUserSettings())); + TQTimer::singleShot(0, this, TQ_SLOT(readUserSettings())); if (!d->tryAction) { - connect(m_imagePreviewWidget, TQT_SIGNAL(signalOriginalClipFocusChanged()), - this, TQT_SLOT(slotFocusChanged())); + connect(m_imagePreviewWidget, TQ_SIGNAL(signalOriginalClipFocusChanged()), + this, TQ_SLOT(slotFocusChanged())); } else { - connect(m_imagePreviewWidget, TQT_SIGNAL(signalResized()), - this, TQT_SLOT(slotFocusChanged())); + connect(m_imagePreviewWidget, TQ_SIGNAL(signalResized()), + this, TQ_SLOT(slotFocusChanged())); } } @@ -183,7 +183,7 @@ void CtrlPanelDlg::setAboutData(TDEAboutData *about) TQPushButton *helpButton = actionButton( Help ); KHelpMenu* helpMenu = new KHelpMenu(this, d->aboutData, false); helpMenu->menu()->removeItemAt(0); - helpMenu->menu()->insertItem(i18n("digiKam Handbook"), this, TQT_SLOT(slotHelp()), 0, -1, 0); + helpMenu->menu()->insertItem(i18n("digiKam Handbook"), this, TQ_SLOT(slotHelp()), 0, -1, 0); helpButton->setPopup( helpMenu->menu() ); } @@ -262,7 +262,7 @@ void CtrlPanelDlg::slotFocusChanged(void) m_threadedFilter->stopComputation(); } - TQTimer::singleShot(0, this, TQT_SLOT(slotEffect())); + TQTimer::singleShot(0, this, TQ_SLOT(slotEffect())); } void CtrlPanelDlg::slotHelp() @@ -285,8 +285,8 @@ void CtrlPanelDlg::slotTimer() } d->timer = new TQTimer( this ); - connect( d->timer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotEffect()) ); + connect( d->timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotEffect()) ); d->timer->start(500, true); } diff --git a/digikam/libs/dialogs/ctrlpaneldlg.h b/digikam/libs/dialogs/ctrlpaneldlg.h index a69fb8b..eb60877 100644 --- a/digikam/libs/dialogs/ctrlpaneldlg.h +++ b/digikam/libs/dialogs/ctrlpaneldlg.h @@ -48,7 +48,7 @@ class DImgThreadedFilter; class DIGIKAM_EXPORT CtrlPanelDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/dialogs/deletedialog.cpp b/digikam/libs/dialogs/deletedialog.cpp index bbe7041..1db9b9c 100644 --- a/digikam/libs/dialogs/deletedialog.cpp +++ b/digikam/libs/dialogs/deletedialog.cpp @@ -199,8 +199,8 @@ DeleteDialog::DeleteDialog(TQWidget *parent, const char *name) adjustSize(); slotShouldDelete(shouldDelete()); - connect(m_widget->ddShouldDelete, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotShouldDelete(bool))); + connect(m_widget->ddShouldDelete, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotShouldDelete(bool))); actionButton(Ok)->setFocus(); } diff --git a/digikam/libs/dialogs/deletedialog.h b/digikam/libs/dialogs/deletedialog.h index 9d1cbd6..16ab9f8 100644 --- a/digikam/libs/dialogs/deletedialog.h +++ b/digikam/libs/dialogs/deletedialog.h @@ -70,7 +70,7 @@ namespace DeleteDialogMode class DeleteWidget : public DeleteDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -94,7 +94,7 @@ protected: class DIGIKAM_EXPORT DeleteDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/dialogs/dprogressdlg.cpp b/digikam/libs/dialogs/dprogressdlg.cpp index 754047d..d4b0dc2 100644 --- a/digikam/libs/dialogs/dprogressdlg.cpp +++ b/digikam/libs/dialogs/dprogressdlg.cpp @@ -144,11 +144,11 @@ void DProgressDlg::addedAction(const TQPixmap& pix, const TQString &text) "image-broken.png"); dir = dir + "/image-broken.png"; TQPixmap pixbi(dir); - img = pixbi.convertToImage().scale(32, 32, TQ_ScaleMin); + img = pixbi.convertToImage().scale(32, 32, TQImage::ScaleMin); } else { - img = pix.convertToImage().scale(32, 32, TQ_ScaleMin); + img = pix.convertToImage().scale(32, 32, TQImage::ScaleMin); } TQPixmap pixmap(img); diff --git a/digikam/libs/dialogs/dprogressdlg.h b/digikam/libs/dialogs/dprogressdlg.h index 7aa77fe..d75f509 100644 --- a/digikam/libs/dialogs/dprogressdlg.h +++ b/digikam/libs/dialogs/dprogressdlg.h @@ -41,7 +41,7 @@ class DProgressDlgPriv; class DIGIKAM_EXPORT DProgressDlg : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/dialogs/imagedialog.cpp b/digikam/libs/dialogs/imagedialog.cpp index 4473024..d052a2a 100644 --- a/digikam/libs/dialogs/imagedialog.cpp +++ b/digikam/libs/dialogs/imagedialog.cpp @@ -104,8 +104,8 @@ ImageDialogPreview::ImageDialogPreview(TQWidget *parent) d->timer = new TQTimer(this); - connect(d->timer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(showPreview()) ); + connect(d->timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(showPreview()) ); } ImageDialogPreview::~ImageDialogPreview() @@ -156,11 +156,11 @@ void ImageDialogPreview::showPreview(const KURL& url) d->thumbJob = new ThumbnailJob(url, ThumbnailSize::Huge, true, true); - connect(d->thumbJob, TQT_SIGNAL(signalThumbnail(const KURL&, const TQPixmap&)), - this, TQT_SLOT(slotGotThumbnail(const KURL&, const TQPixmap&))); + connect(d->thumbJob, TQ_SIGNAL(signalThumbnail(const KURL&, const TQPixmap&)), + this, TQ_SLOT(slotGotThumbnail(const KURL&, const TQPixmap&))); - connect(d->thumbJob, TQT_SIGNAL(signalFailed(const KURL&)), - this, TQT_SLOT(slotFailedThumbnail(const KURL&))); + connect(d->thumbJob, TQ_SIGNAL(signalFailed(const KURL&)), + this, TQ_SLOT(slotFailedThumbnail(const KURL&))); d->metaIface.load(d->currentURL.path()); PhotoInfoContainer info = d->metaIface.getPhotographInformations(); @@ -219,7 +219,7 @@ void ImageDialogPreview::slotGotThumbnail(const KURL& url, const TQPixmap& pix) TQSize s = d->imageLabel->contentsRect().size(); if (s.width() < pix.width() || s.height() < pix.height()) - pixmap = pix.convertToImage().smoothScale(s, TQ_ScaleMin); + pixmap = pix.convertToImage().smoothScale(s, TQImage::ScaleMin); else pixmap = pix; diff --git a/digikam/libs/dialogs/imagedialog.h b/digikam/libs/dialogs/imagedialog.h index f45729b..275765c 100644 --- a/digikam/libs/dialogs/imagedialog.h +++ b/digikam/libs/dialogs/imagedialog.h @@ -41,7 +41,7 @@ class ImageDialogPreviewPrivate; class DIGIKAM_EXPORT ImageDialogPreview : public KPreviewWidgetBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/dialogs/imagedlgbase.cpp b/digikam/libs/dialogs/imagedlgbase.cpp index fbc2b86..6166640 100644 --- a/digikam/libs/dialogs/imagedlgbase.cpp +++ b/digikam/libs/dialogs/imagedlgbase.cpp @@ -219,7 +219,7 @@ void ImageDlgBase::setAboutData(TDEAboutData *about) TQPushButton *helpButton = actionButton( Help ); KHelpMenu* helpMenu = new KHelpMenu(this, d->aboutData, false); helpMenu->menu()->removeItemAt(0); - helpMenu->menu()->insertItem(i18n("digiKam Handbook"), this, TQT_SLOT(slotHelp()), 0, -1, 0); + helpMenu->menu()->insertItem(i18n("digiKam Handbook"), this, TQ_SLOT(slotHelp()), 0, -1, 0); helpButton->setPopup( helpMenu->menu() ); } @@ -252,8 +252,8 @@ void ImageDlgBase::slotTimer() } d->timer = new TQTimer( this ); - connect( d->timer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotEffect()) ); + connect( d->timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotEffect()) ); d->timer->start(500, true); } diff --git a/digikam/libs/dialogs/imagedlgbase.h b/digikam/libs/dialogs/imagedlgbase.h index 202b9ca..97dc6a3 100644 --- a/digikam/libs/dialogs/imagedlgbase.h +++ b/digikam/libs/dialogs/imagedlgbase.h @@ -50,7 +50,7 @@ class ImageDlgBasePriv; class DIGIKAM_EXPORT ImageDlgBase : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/dialogs/imageguidedlg.cpp b/digikam/libs/dialogs/imageguidedlg.cpp index 9c6c086..9713a87 100644 --- a/digikam/libs/dialogs/imageguidedlg.cpp +++ b/digikam/libs/dialogs/imageguidedlg.cpp @@ -212,7 +212,7 @@ ImageGuideDlg::ImageGuideDlg(TQWidget* parent, TQString title, TQString name, TQWidget *gboxGuideSettings = new TQWidget(d->settings); TQGridLayout* grid = new TQGridLayout( gboxGuideSettings, 2, 2, marginHint(), spacingHint()); - KSeparator *line = new KSeparator(Qt::Horizontal, gboxGuideSettings); + KSeparator *line = new KSeparator(TQt::Horizontal, gboxGuideSettings); grid->addMultiCellWidget(line, 0, 0, 0, 2); TQLabel *label5 = new TQLabel(i18n("Guide color:"), gboxGuideSettings); @@ -260,7 +260,7 @@ ImageGuideDlg::ImageGuideDlg(TQWidget* parent, TQString title, TQString name, // ------------------------------------------------------------- - TQTimer::singleShot(0, this, TQT_SLOT(slotInit())); + TQTimer::singleShot(0, this, TQ_SLOT(slotInit())); kapp->restoreOverrideCursor(); } @@ -305,19 +305,19 @@ void ImageGuideDlg::slotInit() { readSettings(); // Reset values to defaults. - TQTimer::singleShot(0, this, TQT_SLOT(readUserSettings())); + TQTimer::singleShot(0, this, TQ_SLOT(readUserSettings())); if (!d->tryAction) { - connect(m_imagePreviewWidget, TQT_SIGNAL(signalResized()), - this, TQT_SLOT(slotResized())); + connect(m_imagePreviewWidget, TQ_SIGNAL(signalResized()), + this, TQ_SLOT(slotResized())); } - connect(d->guideColorBt, TQT_SIGNAL(changed(const TQColor &)), - m_imagePreviewWidget, TQT_SLOT(slotChangeGuideColor(const TQColor &))); + connect(d->guideColorBt, TQ_SIGNAL(changed(const TQColor &)), + m_imagePreviewWidget, TQ_SLOT(slotChangeGuideColor(const TQColor &))); - connect(d->guideSize, TQT_SIGNAL(valueChanged(int)), - m_imagePreviewWidget, TQT_SLOT(slotChangeGuideSize(int))); + connect(d->guideSize, TQ_SIGNAL(valueChanged(int)), + m_imagePreviewWidget, TQ_SLOT(slotChangeGuideSize(int))); } void ImageGuideDlg::setUserAreaWidget(TQWidget *w) @@ -334,7 +334,7 @@ void ImageGuideDlg::setAboutData(TDEAboutData *about) TQPushButton *helpButton = actionButton( Help ); KHelpMenu* helpMenu = new KHelpMenu(this, d->aboutData, false); helpMenu->menu()->removeItemAt(0); - helpMenu->menu()->insertItem(i18n("digiKam Handbook"), this, TQT_SLOT(slotHelp()), 0, -1, 0); + helpMenu->menu()->insertItem(i18n("digiKam Handbook"), this, TQ_SLOT(slotHelp()), 0, -1, 0); helpButton->setPopup( helpMenu->menu() ); } @@ -378,7 +378,7 @@ void ImageGuideDlg::slotResized(void) m_threadedFilter->stopComputation(); } - TQTimer::singleShot(0, this, TQT_SLOT(slotEffect())); + TQTimer::singleShot(0, this, TQ_SLOT(slotEffect())); } void ImageGuideDlg::slotUser1() @@ -442,8 +442,8 @@ void ImageGuideDlg::slotTimer() } d->timer = new TQTimer( this ); - connect( d->timer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotEffect()) ); + connect( d->timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotEffect()) ); d->timer->start(500, true); } diff --git a/digikam/libs/dialogs/imageguidedlg.h b/digikam/libs/dialogs/imageguidedlg.h index aa57e61..e6841c4 100644 --- a/digikam/libs/dialogs/imageguidedlg.h +++ b/digikam/libs/dialogs/imageguidedlg.h @@ -51,7 +51,7 @@ class DImgThreadedFilter; class DIGIKAM_EXPORT ImageGuideDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/dialogs/rawcameradlg.cpp b/digikam/libs/dialogs/rawcameradlg.cpp index e67a565..298b47d 100644 --- a/digikam/libs/dialogs/rawcameradlg.cpp +++ b/digikam/libs/dialogs/rawcameradlg.cpp @@ -139,8 +139,8 @@ RawCameraDlg::RawCameraDlg(TQWidget *parent) // -------------------------------------------------------- - connect(d->searchBar, TQT_SIGNAL(signalTextChanged(const TQString&)), - this, TQT_SLOT(slotSearchTextChanged(const TQString&))); + connect(d->searchBar, TQ_SIGNAL(signalTextChanged(const TQString&)), + this, TQ_SLOT(slotSearchTextChanged(const TQString&))); resize(500, 500); } diff --git a/digikam/libs/dialogs/rawcameradlg.h b/digikam/libs/dialogs/rawcameradlg.h index 0d1869f..41d4a7d 100644 --- a/digikam/libs/dialogs/rawcameradlg.h +++ b/digikam/libs/dialogs/rawcameradlg.h @@ -39,7 +39,7 @@ class RawCameraDlgPriv; class DIGIKAM_EXPORT RawCameraDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/dimg/README b/digikam/libs/dimg/README index 8b79bde..4b13f3f 100644 --- a/digikam/libs/dimg/README +++ b/digikam/libs/dimg/README @@ -16,20 +16,20 @@ some imlib2 bugreports I reported to upstream have gone unfixed for long time now. Also, we need to think about 16bit imaging support. this won't come from -imlib2 and neither from qt. with qt4 there was hope of 16bit image +imlib2 and neither from tqt. with qt4 there was hope of 16bit image support, but trolltech has made it clear that imaging apps forms only 0.1% of their customer base and they are not interested in providing custom support for them. so the only solution I see (without depending on imagemagick) is to roll our own library. i have been working on a imaging library for digikam, its called DImg. -it doesn't aim to be a complete imaging library; it uses QImage for +it doesn't aim to be a complete imaging library; it uses TQImage for rendering and for loading files which are not supported natively by it. some of the working/planned features: * Native Image Loaders, for some imageformats which are of interest to us: JPEG (complete), TIFF (a rudimentary one currently), PNG (planned), PPM -(planned). for the rest qt's qimage is used. +(planned). for the rest tqt's qimage is used. * Metadata preservation: when a file is loaded, its metadata like XMP, IPTC, EXIF, JFIF are read and held in memory. now when you save back the @@ -39,7 +39,7 @@ imlib2 is on saving a file: we save the file to a temporary file, reread the exif info from the original file and then write to a second temporary file.) -* Explicitly Shared Container format (see qt docs): this is necessary for +* Explicitly Shared Container format (see tqt docs): this is necessary for performance reasons. * 8bit and 16bit support: if the file format is 16 bit, it will load up @@ -53,11 +53,11 @@ scale (this has been ported from Imlib2 - originally ported by Mosfet, I added 16 bit scaling support and support for scaling of only a section of the image) -* Rendering to Pixmap: using QImage/QPixmap. (see above for rendering of +* Rendering to Pixmap: using TQImage/QPixmap. (see above for rendering of 16bit images). -* Pixel format: the pixel format is different from QImage/Imlib2 pixel -format. In QImage/Imlib2 the pixel data is stored as unsigned ints and to +* Pixel format: the pixel format is different from TQImage/Imlib2 pixel +format. In TQImage/Imlib2 the pixel data is stored as unsigned ints and to access the individual colors you need to use bit-shifting to ensure endian correctness. in DImg, the pixel data is stored as unsigned char. the color layout is B,G,R,A (blue, green, red, alpha) @@ -89,7 +89,7 @@ for (int i=0; i<image.width()*image.height(); i++) } the above is true for both big and little endian platforms. What this also -means is that the pixel format is different from that of QImage for big +means is that the pixel format is different from that of TQImage for big endian machines. Functions are provided if you want to get a copy of the -DImg as a QImage. +DImg as a TQImage. diff --git a/digikam/libs/dimg/loaders/README b/digikam/libs/dimg/loaders/README index e3a8c60..b77e9c4 100644 --- a/digikam/libs/dimg/loaders/README +++ b/digikam/libs/dimg/loaders/README @@ -11,7 +11,7 @@ RAW Done N.A N.A Done Done yes yes dcraw Metadat PPM Done TODO N.A N.A N.A yes yes none JPEG2K Done Done Done TODO N.A yes yes libjasper Metadata are EXIF/XMP/ICC profil -Others file formats are supported only in 8 bits/color/pixel using QImage/kimgio. +Others file formats are supported only in 8 bits/color/pixel using TQImage/kimgio. QT3.x + KDE 3.4.x support these formats : Format Read Write Remarks diff --git a/digikam/libs/dimg/loaders/jp2ksettings.cpp b/digikam/libs/dimg/loaders/jp2ksettings.cpp index ca5c473..af0737c 100644 --- a/digikam/libs/dimg/loaders/jp2ksettings.cpp +++ b/digikam/libs/dimg/loaders/jp2ksettings.cpp @@ -96,11 +96,11 @@ JP2KSettings::JP2KSettings(TQWidget *parent) d->JPEG2000Grid->addMultiCellWidget(d->JPEG2000compression, 1, 1, 1, 1); d->JPEG2000Grid->setColStretch(1, 10); - connect(d->JPEG2000LossLess, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotToggleJPEG2000LossLess(bool))); + connect(d->JPEG2000LossLess, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotToggleJPEG2000LossLess(bool))); - connect(d->JPEG2000LossLess, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotToggleJPEG2000LossLess(bool))); + connect(d->JPEG2000LossLess, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotToggleJPEG2000LossLess(bool))); } JP2KSettings::~JP2KSettings() diff --git a/digikam/libs/dimg/loaders/jp2ksettings.h b/digikam/libs/dimg/loaders/jp2ksettings.h index 929fce9..951cb2f 100644 --- a/digikam/libs/dimg/loaders/jp2ksettings.h +++ b/digikam/libs/dimg/loaders/jp2ksettings.h @@ -39,7 +39,7 @@ class JP2KSettingsPriv; class DIGIKAM_EXPORT JP2KSettings : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/dimg/loaders/jpegsettings.h b/digikam/libs/dimg/loaders/jpegsettings.h index 1162d1c..70e20d4 100644 --- a/digikam/libs/dimg/loaders/jpegsettings.h +++ b/digikam/libs/dimg/loaders/jpegsettings.h @@ -39,7 +39,7 @@ class JPEGSettingsPriv; class DIGIKAM_EXPORT JPEGSettings : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/dimg/loaders/pngsettings.h b/digikam/libs/dimg/loaders/pngsettings.h index ef5f77c..aecca93 100644 --- a/digikam/libs/dimg/loaders/pngsettings.h +++ b/digikam/libs/dimg/loaders/pngsettings.h @@ -39,7 +39,7 @@ class PNGSettingsPriv; class DIGIKAM_EXPORT PNGSettings : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/dimg/loaders/rawloader.h b/digikam/libs/dimg/loaders/rawloader.h index 9d7fbe6..22171a2 100644 --- a/digikam/libs/dimg/loaders/rawloader.h +++ b/digikam/libs/dimg/loaders/rawloader.h @@ -43,7 +43,7 @@ class DImg; class DIGIKAM_EXPORT RAWLoader : public KDcrawIface::KDcraw, public DImgLoader { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/dimg/loaders/tiffsettings.h b/digikam/libs/dimg/loaders/tiffsettings.h index 60375f6..e546ce0 100644 --- a/digikam/libs/dimg/loaders/tiffsettings.h +++ b/digikam/libs/dimg/loaders/tiffsettings.h @@ -39,7 +39,7 @@ class TIFFSettingsPriv; class DIGIKAM_EXPORT TIFFSettings : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/dmetadata/dmetadata.cpp b/digikam/libs/dmetadata/dmetadata.cpp index d342b37..bb37506 100644 --- a/digikam/libs/dmetadata/dmetadata.cpp +++ b/digikam/libs/dmetadata/dmetadata.cpp @@ -470,7 +470,7 @@ bool DMetadata::getXMLImageProperties(TQString& comments, TQDateTime& date, else if (name == TQString::fromLatin1("date")) { if (val.isEmpty()) continue; - date = TQDateTime::fromString(val, Qt::ISODate); + date = TQDateTime::fromString(val, TQt::ISODate); } else if (name == TQString::fromLatin1("rating")) { @@ -516,7 +516,7 @@ bool DMetadata::setXMLImageProperties(const TQString& comments, const TQDateTime propertiesElem.appendChild(c); TQDomElement d = xmlDoc.createElement(TQString::fromLatin1("date")); - d.setAttribute(TQString::fromLatin1("value"), date.toString(Qt::ISODate)); + d.setAttribute(TQString::fromLatin1("value"), date.toString(TQt::ISODate)); propertiesElem.appendChild(d); TQDomElement r = xmlDoc.createElement(TQString::fromLatin1("rating")); diff --git a/digikam/libs/greycstoration/greycstorationwidget.cpp b/digikam/libs/greycstoration/greycstorationwidget.cpp index 147a92f..93f2579 100644 --- a/digikam/libs/greycstoration/greycstorationwidget.cpp +++ b/digikam/libs/greycstoration/greycstorationwidget.cpp @@ -126,7 +126,7 @@ public: }; GreycstorationWidget::GreycstorationWidget(TQTabWidget *parent) - : TQObject(TQT_TQOBJECT(parent)) + : TQObject(parent) { d = new GreycstorationWidgetPriv; d->parent = parent; diff --git a/digikam/libs/greycstoration/greycstorationwidget.h b/digikam/libs/greycstoration/greycstorationwidget.h index 6d995fb..2279707 100644 --- a/digikam/libs/greycstoration/greycstorationwidget.h +++ b/digikam/libs/greycstoration/greycstorationwidget.h @@ -43,7 +43,7 @@ class GreycstorationWidgetPriv; class DIGIKAM_EXPORT GreycstorationWidget : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/imageproperties/cameraitempropertiestab.cpp b/digikam/libs/imageproperties/cameraitempropertiestab.cpp index 0427840..8593e9c 100644 --- a/digikam/libs/imageproperties/cameraitempropertiestab.cpp +++ b/digikam/libs/imageproperties/cameraitempropertiestab.cpp @@ -191,7 +191,7 @@ CameraItemPropertiesTab::CameraItemPropertiesTab(TQWidget* parent, bool navBar) d->newFileName = new TQLabel(i18n("<nobr><b>New Name</b></nobr>:"), d->settingsArea); d->downloaded = new TQLabel(i18n("<b>Downloaded</b>:"), d->settingsArea); - KSeparator *line = new KSeparator(Qt::Horizontal, d->settingsArea); + KSeparator *line = new KSeparator(TQt::Horizontal, d->settingsArea); d->title2 = new TQLabel(i18n("<big><b>Photograph Properties</b></big>"), d->settingsArea); d->make = new TQLabel(i18n("<b>Make</b>:"), d->settingsArea); d->model = new TQLabel(i18n("<b>Model</b>:"), d->settingsArea); diff --git a/digikam/libs/imageproperties/cameraitempropertiestab.h b/digikam/libs/imageproperties/cameraitempropertiestab.h index f690c85..badf4a7 100644 --- a/digikam/libs/imageproperties/cameraitempropertiestab.h +++ b/digikam/libs/imageproperties/cameraitempropertiestab.h @@ -46,7 +46,7 @@ class CameraItemPropertiesTabPriv; class DIGIKAM_EXPORT CameraItemPropertiesTab : public NavigateBarTab { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/imageproperties/imagedescedittab.cpp b/digikam/libs/imageproperties/imagedescedittab.cpp index 3c350b1..f79b1d7 100644 --- a/digikam/libs/imageproperties/imagedescedittab.cpp +++ b/digikam/libs/imageproperties/imagedescedittab.cpp @@ -234,50 +234,50 @@ ImageDescEditTab::ImageDescEditTab(TQWidget *parent, bool navBar) // -------------------------------------------------- - connect(d->tagsView, TQT_SIGNAL(signalProgressBarMode(int, const TQString&)), - this, TQT_SIGNAL(signalProgressBarMode(int, const TQString&))); + connect(d->tagsView, TQ_SIGNAL(signalProgressBarMode(int, const TQString&)), + this, TQ_SIGNAL(signalProgressBarMode(int, const TQString&))); - connect(d->tagsView, TQT_SIGNAL(signalProgressValue(int)), - this, TQT_SIGNAL(signalProgressValue(int))); + connect(d->tagsView, TQ_SIGNAL(signalProgressValue(int)), + this, TQ_SIGNAL(signalProgressValue(int))); - connect(popupMenu, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotRecentTagsMenuActivated(int))); + connect(popupMenu, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotRecentTagsMenuActivated(int))); - connect(d->tagsView, TQT_SIGNAL(signalItemStateChanged(TAlbumCheckListItem *)), - this, TQT_SLOT(slotItemStateChanged(TAlbumCheckListItem *))); + connect(d->tagsView, TQ_SIGNAL(signalItemStateChanged(TAlbumCheckListItem *)), + this, TQ_SLOT(slotItemStateChanged(TAlbumCheckListItem *))); - connect(d->commentsEdit, TQT_SIGNAL(textChanged()), - this, TQT_SLOT(slotCommentChanged())); + connect(d->commentsEdit, TQ_SIGNAL(textChanged()), + this, TQ_SLOT(slotCommentChanged())); - connect(d->dateTimeEdit, TQT_SIGNAL(dateTimeChanged(const TQDateTime& )), - this, TQT_SLOT(slotDateTimeChanged(const TQDateTime&))); + connect(d->dateTimeEdit, TQ_SIGNAL(dateTimeChanged(const TQDateTime& )), + this, TQ_SLOT(slotDateTimeChanged(const TQDateTime&))); - connect(d->ratingWidget, TQT_SIGNAL(signalRatingChanged(int)), - this, TQT_SLOT(slotRatingChanged(int))); + connect(d->ratingWidget, TQ_SIGNAL(signalRatingChanged(int)), + this, TQ_SLOT(slotRatingChanged(int))); - connect(d->tagsView, TQT_SIGNAL(rightButtonClicked(TQListViewItem*, const TQPoint &, int)), - this, TQT_SLOT(slotRightButtonClicked(TQListViewItem*, const TQPoint&, int))); + connect(d->tagsView, TQ_SIGNAL(rightButtonClicked(TQListViewItem*, const TQPoint &, int)), + this, TQ_SLOT(slotRightButtonClicked(TQListViewItem*, const TQPoint&, int))); - connect(d->tagsSearchBar, TQT_SIGNAL(signalTextChanged(const TQString&)), - this, TQT_SLOT(slotTagsSearchChanged(const TQString&))); + connect(d->tagsSearchBar, TQ_SIGNAL(signalTextChanged(const TQString&)), + this, TQ_SLOT(slotTagsSearchChanged(const TQString&))); - connect(this, TQT_SIGNAL(signalTagFilterMatch(bool)), - d->tagsSearchBar, TQT_SLOT(slotSearchResult(bool))); + connect(this, TQ_SIGNAL(signalTagFilterMatch(bool)), + d->tagsSearchBar, TQ_SLOT(slotSearchResult(bool))); - connect(d->assignedTagsBtn, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotAssignedTagsToggled(bool))); + connect(d->assignedTagsBtn, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotAssignedTagsToggled(bool))); - connect(d->newTagEdit->lineEdit(), TQT_SIGNAL(returnPressed(const TQString&)), - this, TQT_SLOT(slotCreateNewTag())); + connect(d->newTagEdit->lineEdit(), TQ_SIGNAL(returnPressed(const TQString&)), + this, TQ_SLOT(slotCreateNewTag())); - connect(d->applyBtn, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotApplyAllChanges())); + connect(d->applyBtn, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotApplyAllChanges())); - connect(d->revertBtn, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotRevertAllChanges())); + connect(d->revertBtn, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRevertAllChanges())); - connect(d->moreMenu, TQT_SIGNAL(aboutToShow()), - this, TQT_SLOT(slotMoreMenu())); + connect(d->moreMenu, TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(slotMoreMenu())); // Initialize --------------------------------------------- @@ -291,55 +291,55 @@ ImageDescEditTab::ImageDescEditTab(TQWidget *parent, bool navBar) AlbumManager* man = AlbumManager::instance(); - connect(man, TQT_SIGNAL(signalAlbumAdded(Album*)), - this, TQT_SLOT(slotAlbumAdded(Album*))); + connect(man, TQ_SIGNAL(signalAlbumAdded(Album*)), + this, TQ_SLOT(slotAlbumAdded(Album*))); - connect(man, TQT_SIGNAL(signalAlbumDeleted(Album*)), - this, TQT_SLOT(slotAlbumDeleted(Album*))); + connect(man, TQ_SIGNAL(signalAlbumDeleted(Album*)), + this, TQ_SLOT(slotAlbumDeleted(Album*))); - connect(man, TQT_SIGNAL(signalAlbumRenamed(Album*)), - this, TQT_SLOT(slotAlbumRenamed(Album*))); + connect(man, TQ_SIGNAL(signalAlbumRenamed(Album*)), + this, TQ_SLOT(slotAlbumRenamed(Album*))); - connect(man, TQT_SIGNAL(signalAlbumsCleared()), - this, TQT_SLOT(slotAlbumsCleared())); + connect(man, TQ_SIGNAL(signalAlbumsCleared()), + this, TQ_SLOT(slotAlbumsCleared())); - connect(man, TQT_SIGNAL(signalAlbumIconChanged(Album*)), - this, TQT_SLOT(slotAlbumIconChanged(Album*))); + connect(man, TQ_SIGNAL(signalAlbumIconChanged(Album*)), + this, TQ_SLOT(slotAlbumIconChanged(Album*))); - connect(man, TQT_SIGNAL(signalTAlbumMoved(TAlbum*, TAlbum*)), - this, TQT_SLOT(slotAlbumMoved(TAlbum*, TAlbum*))); + connect(man, TQ_SIGNAL(signalTAlbumMoved(TAlbum*, TAlbum*)), + this, TQ_SLOT(slotAlbumMoved(TAlbum*, TAlbum*))); // Connect to thumbnail loader ----------------------------- AlbumThumbnailLoader *loader = AlbumThumbnailLoader::instance(); - connect(loader, TQT_SIGNAL(signalThumbnail(Album *, const TQPixmap&)), - this, TQT_SLOT(slotGotThumbnailFromIcon(Album *, const TQPixmap&))); + connect(loader, TQ_SIGNAL(signalThumbnail(Album *, const TQPixmap&)), + this, TQ_SLOT(slotGotThumbnailFromIcon(Album *, const TQPixmap&))); - connect(loader, TQT_SIGNAL(signalFailed(Album *)), - this, TQT_SLOT(slotThumbnailLost(Album *))); + connect(loader, TQ_SIGNAL(signalFailed(Album *)), + this, TQ_SLOT(slotThumbnailLost(Album *))); - connect(loader, TQT_SIGNAL(signalReloadThumbnails()), - this, TQT_SLOT(slotReloadThumbnails())); + connect(loader, TQ_SIGNAL(signalReloadThumbnails()), + this, TQ_SLOT(slotReloadThumbnails())); // Connect to attribute watch ------------------------------ ImageAttributesWatch *watch = ImageAttributesWatch::instance(); - connect(watch, TQT_SIGNAL(signalImageTagsChanged(TQ_LLONG)), - this, TQT_SLOT(slotImageTagsChanged(TQ_LLONG))); + connect(watch, TQ_SIGNAL(signalImageTagsChanged(TQ_LLONG)), + this, TQ_SLOT(slotImageTagsChanged(TQ_LLONG))); - connect(watch, TQT_SIGNAL(signalImagesChanged(int)), - this, TQT_SLOT(slotImagesChanged(int))); + connect(watch, TQ_SIGNAL(signalImagesChanged(int)), + this, TQ_SLOT(slotImagesChanged(int))); - 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(watch, TQT_SIGNAL(signalImageDateChanged(TQ_LLONG)), - this, TQT_SLOT(slotImageDateChanged(TQ_LLONG))); + connect(watch, TQ_SIGNAL(signalImageDateChanged(TQ_LLONG)), + this, TQ_SLOT(slotImageDateChanged(TQ_LLONG))); - connect(watch, TQT_SIGNAL(signalImageCaptionChanged(TQ_LLONG)), - this, TQT_SLOT(slotImageCaptionChanged(TQ_LLONG))); + connect(watch, TQ_SIGNAL(signalImageCaptionChanged(TQ_LLONG)), + this, TQ_SLOT(slotImageCaptionChanged(TQ_LLONG))); // -- read config --------------------------------------------------------- @@ -819,8 +819,8 @@ void ImageDescEditTab::slotRightButtonClicked(TQListViewItem *item, const TQPoin d->ABCMenu = new TQPopupMenu; - connect(d->ABCMenu, TQT_SIGNAL( aboutToShow() ), - this, TQT_SLOT( slotABCContextMenu() )); + connect(d->ABCMenu, TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( slotABCContextMenu() )); TDEPopupMenu popmenu(this); popmenu.insertTitle(SmallIcon("digikam"), i18n("Tags")); @@ -1043,8 +1043,8 @@ void ImageDescEditTab::slotMoreMenu() if (singleSelection()) { - d->moreMenu->insertItem(i18n("Read metadata from file to database"), this, TQT_SLOT(slotReadFromFileMetadataToDatabase())); - int writeActionId = d->moreMenu->insertItem(i18n("Write metadata to each file"), this, TQT_SLOT(slotWriteToFileMetadataFromDatabase())); + d->moreMenu->insertItem(i18n("Read metadata from file to database"), this, TQ_SLOT(slotReadFromFileMetadataToDatabase())); + int writeActionId = d->moreMenu->insertItem(i18n("Write metadata to each file"), this, TQ_SLOT(slotWriteToFileMetadataFromDatabase())); // we do not need a "Write to file" action here because the apply button will do just that // if selection is a single file. // Adding the option will confuse users: Does the apply button not write to file? @@ -1056,8 +1056,8 @@ void ImageDescEditTab::slotMoreMenu() { // We need to make clear that this action is different from the Apply button, // which saves the same changes to all files. These batch operations operate on each single file. - d->moreMenu->insertItem(i18n("Read metadata from each file to database"), this, TQT_SLOT(slotReadFromFileMetadataToDatabase())); - d->moreMenu->insertItem(i18n("Write metadata to each file"), this, TQT_SLOT(slotWriteToFileMetadataFromDatabase())); + d->moreMenu->insertItem(i18n("Read metadata from each file to database"), this, TQ_SLOT(slotReadFromFileMetadataToDatabase())); + d->moreMenu->insertItem(i18n("Write metadata to each file"), this, TQ_SLOT(slotWriteToFileMetadataFromDatabase())); } } @@ -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(); diff --git a/digikam/libs/imageproperties/imagedescedittab.h b/digikam/libs/imageproperties/imagedescedittab.h index a482864..617bd59 100644 --- a/digikam/libs/imageproperties/imagedescedittab.h +++ b/digikam/libs/imageproperties/imagedescedittab.h @@ -49,7 +49,7 @@ class ImageDescEditTabPriv; class DIGIKAM_EXPORT ImageDescEditTab : public NavigateBarTab { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/imageproperties/imagepropertiescolorstab.cpp b/digikam/libs/imageproperties/imagepropertiescolorstab.cpp index 7388444..af85953 100644 --- a/digikam/libs/imageproperties/imagepropertiescolorstab.cpp +++ b/digikam/libs/imageproperties/imagepropertiescolorstab.cpp @@ -277,7 +277,7 @@ ImagePropertiesColorsTab::ImagePropertiesColorsTab(TQWidget* parent, bool navBar // ------------------------------------------------------------- - TQGroupBox *gbox = new TQGroupBox(2, Qt::Horizontal, i18n("Statistics"), histogramPage); + TQGroupBox *gbox = new TQGroupBox(2, TQt::Horizontal, i18n("Statistics"), histogramPage); TQWhatsThis::add( gbox, i18n("<p>Here you can see the statistical results calculated from the " "selected histogram part. These values are available for all " "channels.")); @@ -349,35 +349,35 @@ ImagePropertiesColorsTab::ImagePropertiesColorsTab(TQWidget* parent, bool navBar // ------------------------------------------------------------- - connect(d->channelCB, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotChannelChanged(int))); + connect(d->channelCB, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotChannelChanged(int))); - connect(d->scaleBG, TQT_SIGNAL(released(int)), - this, TQT_SLOT(slotScaleChanged(int))); + connect(d->scaleBG, TQ_SIGNAL(released(int)), + this, TQ_SLOT(slotScaleChanged(int))); - connect(d->colorsCB, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotColorsChanged(int))); + connect(d->colorsCB, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotColorsChanged(int))); - connect(d->regionBG, TQT_SIGNAL(released(int)), - this, TQT_SLOT(slotRenderingChanged(int))); + connect(d->regionBG, TQ_SIGNAL(released(int)), + this, TQ_SLOT(slotRenderingChanged(int))); - connect(d->histogramWidget, TQT_SIGNAL(signalIntervalChanged( int, int )), - this, TQT_SLOT(slotUpdateInterval(int, int))); + connect(d->histogramWidget, TQ_SIGNAL(signalIntervalChanged( int, int )), + this, TQ_SLOT(slotUpdateInterval(int, int))); - connect(d->histogramWidget, TQT_SIGNAL(signalMaximumValueChanged( int )), - this, TQT_SLOT(slotUpdateIntervRange(int))); + connect(d->histogramWidget, TQ_SIGNAL(signalMaximumValueChanged( int )), + this, TQ_SLOT(slotUpdateIntervRange(int))); - connect(d->histogramWidget, TQT_SIGNAL(signalHistogramComputationDone(bool)), - this, TQT_SLOT(slotRefreshOptions(bool))); + connect(d->histogramWidget, TQ_SIGNAL(signalHistogramComputationDone(bool)), + this, TQ_SLOT(slotRefreshOptions(bool))); - connect(d->histogramWidget, TQT_SIGNAL(signalHistogramComputationFailed(void)), - this, TQT_SLOT(slotHistogramComputationFailed(void))); + connect(d->histogramWidget, TQ_SIGNAL(signalHistogramComputationFailed(void)), + this, TQ_SLOT(slotHistogramComputationFailed(void))); - connect(d->minInterv, TQT_SIGNAL(valueChanged (int)), - this, TQT_SLOT(slotMinValueChanged(int))); + connect(d->minInterv, TQ_SIGNAL(valueChanged (int)), + this, TQ_SLOT(slotMinValueChanged(int))); - connect(d->maxInterv, TQT_SIGNAL(valueChanged (int)), - this, TQT_SLOT(slotMaxValueChanged(int))); + connect(d->maxInterv, TQ_SIGNAL(valueChanged (int)), + this, TQ_SLOT(slotMaxValueChanged(int))); // -- read config --------------------------------------------------------- @@ -509,11 +509,11 @@ void ImagePropertiesColorsTab::loadImageFromUrl(const KURL& url) { d->imageLoaderThread = new SharedLoadSaveThread(); - connect(d->imageLoaderThread, TQT_SIGNAL(signalImageLoaded(const LoadingDescription &, const DImg&)), - this, TQT_SLOT(slotLoadImageFromUrlComplete(const LoadingDescription &, const DImg&))); + connect(d->imageLoaderThread, TQ_SIGNAL(signalImageLoaded(const LoadingDescription &, const DImg&)), + this, TQ_SLOT(slotLoadImageFromUrlComplete(const LoadingDescription &, const DImg&))); - connect(d->imageLoaderThread, TQT_SIGNAL(signalMoreCompleteLoadingAvailable(const LoadingDescription &, const LoadingDescription &)), - this, TQT_SLOT(slotMoreCompleteLoadingAvailable(const LoadingDescription &, const LoadingDescription &))); + connect(d->imageLoaderThread, TQ_SIGNAL(signalMoreCompleteLoadingAvailable(const LoadingDescription &, const LoadingDescription &)), + this, TQ_SLOT(slotMoreCompleteLoadingAvailable(const LoadingDescription &, const LoadingDescription &))); } LoadingDescription desc = LoadingDescription(url.path()); diff --git a/digikam/libs/imageproperties/imagepropertiescolorstab.h b/digikam/libs/imageproperties/imagepropertiescolorstab.h index d35c547..0e01cad 100644 --- a/digikam/libs/imageproperties/imagepropertiescolorstab.h +++ b/digikam/libs/imageproperties/imagepropertiescolorstab.h @@ -49,7 +49,7 @@ class ImagePropertiesColorsTabPriv; class DIGIKAM_EXPORT ImagePropertiesColorsTab : public NavigateBarTab { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/imageproperties/imagepropertiesmetadatatab.h b/digikam/libs/imageproperties/imagepropertiesmetadatatab.h index 559a22e..95b8ecb 100644 --- a/digikam/libs/imageproperties/imagepropertiesmetadatatab.h +++ b/digikam/libs/imageproperties/imagepropertiesmetadatatab.h @@ -45,7 +45,7 @@ class ImagePropertiesMetadataTabPriv; class DIGIKAM_EXPORT ImagePropertiesMetaDataTab : public NavigateBarTab { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/imageproperties/imagepropertiessidebar.cpp b/digikam/libs/imageproperties/imagepropertiessidebar.cpp index c54721c..6725438 100644 --- a/digikam/libs/imageproperties/imagepropertiessidebar.cpp +++ b/digikam/libs/imageproperties/imagepropertiessidebar.cpp @@ -70,8 +70,8 @@ ImagePropertiesSideBar::ImagePropertiesSideBar(TQWidget *parent, const char *nam appendTab(m_metadataTab, SmallIcon("exifinfo"), i18n("Metadata")); appendTab(m_colorTab, SmallIcon("blend"), i18n("Colors")); - connect(this, TQT_SIGNAL(signalChangedTab(TQWidget*)), - this, TQT_SLOT(slotChangedTab(TQWidget*))); + connect(this, TQ_SIGNAL(signalChangedTab(TQWidget*)), + this, TQ_SLOT(slotChangedTab(TQWidget*))); } ImagePropertiesSideBar::~ImagePropertiesSideBar() diff --git a/digikam/libs/imageproperties/imagepropertiessidebar.h b/digikam/libs/imageproperties/imagepropertiessidebar.h index 29b58dc..43e08df 100644 --- a/digikam/libs/imageproperties/imagepropertiessidebar.h +++ b/digikam/libs/imageproperties/imagepropertiessidebar.h @@ -48,7 +48,7 @@ class ImagePropertiesColorsTab; class DIGIKAM_EXPORT ImagePropertiesSideBar : public Sidebar { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/imageproperties/imagepropertiessidebarcamgui.cpp b/digikam/libs/imageproperties/imagepropertiessidebarcamgui.cpp index f69b7f4..942c33e 100644 --- a/digikam/libs/imageproperties/imagepropertiessidebarcamgui.cpp +++ b/digikam/libs/imageproperties/imagepropertiessidebarcamgui.cpp @@ -106,8 +106,8 @@ ImagePropertiesSideBarCamGui::ImagePropertiesSideBarCamGui(TQWidget *parent, con connectNavigateSignals(d->cameraItemTab); connectNavigateSignals(d->metadataTab); - connect(this, TQT_SIGNAL(signalChangedTab(TQWidget*)), - this, TQT_SLOT(slotChangedTab(TQWidget*))); + connect(this, TQ_SIGNAL(signalChangedTab(TQWidget*)), + this, TQ_SLOT(slotChangedTab(TQWidget*))); } ImagePropertiesSideBarCamGui::~ImagePropertiesSideBarCamGui() @@ -117,17 +117,17 @@ ImagePropertiesSideBarCamGui::~ImagePropertiesSideBarCamGui() void ImagePropertiesSideBarCamGui::connectNavigateSignals(NavigateBarTab *tab) { - connect(tab, TQT_SIGNAL(signalFirstItem()), - this, TQT_SIGNAL(signalFirstItem())); + connect(tab, TQ_SIGNAL(signalFirstItem()), + this, TQ_SIGNAL(signalFirstItem())); - connect(tab, TQT_SIGNAL(signalPrevItem()), - this, TQT_SIGNAL(signalPrevItem())); + connect(tab, TQ_SIGNAL(signalPrevItem()), + this, TQ_SIGNAL(signalPrevItem())); - connect(tab, TQT_SIGNAL(signalNextItem()), - this, TQT_SIGNAL(signalNextItem())); + connect(tab, TQ_SIGNAL(signalNextItem()), + this, TQ_SIGNAL(signalNextItem())); - connect(tab, TQT_SIGNAL(signalLastItem()), - this, TQT_SIGNAL(signalLastItem())); + connect(tab, TQ_SIGNAL(signalLastItem()), + this, TQ_SIGNAL(signalLastItem())); } void ImagePropertiesSideBarCamGui::itemChanged(GPItemInfo* itemInfo, const KURL& url, diff --git a/digikam/libs/imageproperties/imagepropertiessidebarcamgui.h b/digikam/libs/imageproperties/imagepropertiessidebarcamgui.h index b8acb77..3c2eafd 100644 --- a/digikam/libs/imageproperties/imagepropertiessidebarcamgui.h +++ b/digikam/libs/imageproperties/imagepropertiessidebarcamgui.h @@ -48,7 +48,7 @@ class ImagePropertiesSideBarCamGuiPriv; class DIGIKAM_EXPORT ImagePropertiesSideBarCamGui : public Sidebar { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/imageproperties/imagepropertiessidebardb.cpp b/digikam/libs/imageproperties/imagepropertiessidebardb.cpp index e360622..f3dc5f7 100644 --- a/digikam/libs/imageproperties/imagepropertiessidebardb.cpp +++ b/digikam/libs/imageproperties/imagepropertiessidebardb.cpp @@ -92,19 +92,19 @@ ImagePropertiesSideBarDB::ImagePropertiesSideBarDB(TQWidget *parent, const char // ---------------------------------------------------------- - connect(this, TQT_SIGNAL(signalChangedTab(TQWidget*)), - this, TQT_SLOT(slotChangedTab(TQWidget*))); + connect(this, TQ_SIGNAL(signalChangedTab(TQWidget*)), + this, TQ_SLOT(slotChangedTab(TQWidget*))); - connect(d->desceditTab, TQT_SIGNAL(signalProgressBarMode(int, const TQString&)), - this, TQT_SIGNAL(signalProgressBarMode(int, const TQString&))); + connect(d->desceditTab, TQ_SIGNAL(signalProgressBarMode(int, const TQString&)), + this, TQ_SIGNAL(signalProgressBarMode(int, const TQString&))); - connect(d->desceditTab, TQT_SIGNAL(signalProgressValue(int)), - this, TQT_SIGNAL(signalProgressValue(int))); + connect(d->desceditTab, TQ_SIGNAL(signalProgressValue(int)), + this, TQ_SIGNAL(signalProgressValue(int))); ImageAttributesWatch *watch = ImageAttributesWatch::instance(); - connect(watch, TQT_SIGNAL(signalFileMetadataChanged(const KURL &)), - this, TQT_SLOT(slotFileMetadataChanged(const KURL &))); + connect(watch, TQ_SIGNAL(signalFileMetadataChanged(const KURL &)), + this, TQ_SLOT(slotFileMetadataChanged(const KURL &))); } ImagePropertiesSideBarDB::~ImagePropertiesSideBarDB() diff --git a/digikam/libs/imageproperties/imagepropertiessidebardb.h b/digikam/libs/imageproperties/imagepropertiessidebardb.h index 6fd78e7..7037b64 100644 --- a/digikam/libs/imageproperties/imagepropertiessidebardb.h +++ b/digikam/libs/imageproperties/imagepropertiessidebardb.h @@ -55,7 +55,7 @@ class ImagePropertiesSideBarDBPriv; class DIGIKAM_EXPORT ImagePropertiesSideBarDB : public ImagePropertiesSideBar { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/imageproperties/imagepropertiestab.cpp b/digikam/libs/imageproperties/imagepropertiestab.cpp index 952bb64..7141c03 100644 --- a/digikam/libs/imageproperties/imagepropertiestab.cpp +++ b/digikam/libs/imageproperties/imagepropertiestab.cpp @@ -202,7 +202,7 @@ ImagePropertiesTab::ImagePropertiesTab(TQWidget* parent, bool navBar) d->owner = new TQLabel(i18n("<b>Owner</b>:"), d->settingsArea); d->permissions = new TQLabel(i18n("<b>Permissions</b>:"), d->settingsArea); - KSeparator *line = new KSeparator(Qt::Horizontal, d->settingsArea); + KSeparator *line = new KSeparator(TQt::Horizontal, d->settingsArea); d->title2 = new TQLabel(i18n("<big><b>Image Properties</b></big>"), d->settingsArea); d->mime = new TQLabel(i18n("<b>Type</b>:"), d->settingsArea); d->dimensions = new TQLabel(i18n("<b>Dimensions</b>:"), d->settingsArea); @@ -210,7 +210,7 @@ ImagePropertiesTab::ImagePropertiesTab(TQWidget* parent, bool navBar) d->bitDepth = new TQLabel(i18n("<nobr><b>Bit depth</b></nobr>:"), d->settingsArea); d->colorMode = new TQLabel(i18n("<nobr><b>Color mode</b></nobr>:"), d->settingsArea); - KSeparator *line2 = new KSeparator(Qt::Horizontal, d->settingsArea); + KSeparator *line2 = new KSeparator(TQt::Horizontal, d->settingsArea); d->title3 = new TQLabel(i18n("<big><b>Photograph Properties</b></big>"), d->settingsArea); d->make = new TQLabel(i18n("<b>Make</b>:"), d->settingsArea); d->model = new TQLabel(i18n("<b>Model</b>:"), d->settingsArea); diff --git a/digikam/libs/imageproperties/imagepropertiestab.h b/digikam/libs/imageproperties/imagepropertiestab.h index 891bddc..2a69ce9 100644 --- a/digikam/libs/imageproperties/imagepropertiestab.h +++ b/digikam/libs/imageproperties/imagepropertiestab.h @@ -46,7 +46,7 @@ class ImagePropertiesTabPriv; class DIGIKAM_EXPORT ImagePropertiesTab : public NavigateBarTab { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/imageproperties/navigatebartab.cpp b/digikam/libs/imageproperties/navigatebartab.cpp index 87540cd..d40ae13 100644 --- a/digikam/libs/imageproperties/navigatebartab.cpp +++ b/digikam/libs/imageproperties/navigatebartab.cpp @@ -80,17 +80,17 @@ void NavigateBarTab::setupNavigateBar(bool withBar) d->navigateBar = new NavigateBarWidget(d->stack, withBar); d->stack->addWidget(d->navigateBar); - connect(d->navigateBar, TQT_SIGNAL(signalFirstItem()), - this, TQT_SIGNAL(signalFirstItem())); + connect(d->navigateBar, TQ_SIGNAL(signalFirstItem()), + this, TQ_SIGNAL(signalFirstItem())); - connect(d->navigateBar, TQT_SIGNAL(signalPrevItem()), - this, TQT_SIGNAL(signalPrevItem())); + connect(d->navigateBar, TQ_SIGNAL(signalPrevItem()), + this, TQ_SIGNAL(signalPrevItem())); - connect(d->navigateBar, TQT_SIGNAL(signalNextItem()), - this, TQT_SIGNAL(signalNextItem())); + connect(d->navigateBar, TQ_SIGNAL(signalNextItem()), + this, TQ_SIGNAL(signalNextItem())); - connect(d->navigateBar, TQT_SIGNAL(signalLastItem()), - this, TQT_SIGNAL(signalLastItem())); + connect(d->navigateBar, TQ_SIGNAL(signalLastItem()), + this, TQ_SIGNAL(signalLastItem())); d->label = new TQLabel(d->stack); d->label->setAlignment(TQt::AlignCenter); diff --git a/digikam/libs/imageproperties/navigatebartab.h b/digikam/libs/imageproperties/navigatebartab.h index d52fd96..a93090e 100644 --- a/digikam/libs/imageproperties/navigatebartab.h +++ b/digikam/libs/imageproperties/navigatebartab.h @@ -49,7 +49,7 @@ class NavigateBarTabPriv; class DIGIKAM_EXPORT NavigateBarTab : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/imageproperties/navigatebarwidget.cpp b/digikam/libs/imageproperties/navigatebarwidget.cpp index ba923cf..9232c55 100644 --- a/digikam/libs/imageproperties/navigatebarwidget.cpp +++ b/digikam/libs/imageproperties/navigatebarwidget.cpp @@ -70,17 +70,17 @@ NavigateBarWidget::NavigateBarWidget(TQWidget *parent, bool show) if (!show) hide(); - connect(d->navBar, TQT_SIGNAL(signalFirstItem()), - this, TQT_SIGNAL(signalFirstItem())); + connect(d->navBar, TQ_SIGNAL(signalFirstItem()), + this, TQ_SIGNAL(signalFirstItem())); - connect(d->navBar, TQT_SIGNAL(signalPrevItem()), - this, TQT_SIGNAL(signalPrevItem())); + connect(d->navBar, TQ_SIGNAL(signalPrevItem()), + this, TQ_SIGNAL(signalPrevItem())); - connect(d->navBar, TQT_SIGNAL(signalNextItem()), - this, TQT_SIGNAL(signalNextItem())); + connect(d->navBar, TQ_SIGNAL(signalNextItem()), + this, TQ_SIGNAL(signalNextItem())); - connect(d->navBar, TQT_SIGNAL(signalLastItem()), - this, TQT_SIGNAL(signalLastItem())); + connect(d->navBar, TQ_SIGNAL(signalLastItem()), + this, TQ_SIGNAL(signalLastItem())); } NavigateBarWidget::~NavigateBarWidget() diff --git a/digikam/libs/imageproperties/navigatebarwidget.h b/digikam/libs/imageproperties/navigatebarwidget.h index 2bb4571..7be088e 100644 --- a/digikam/libs/imageproperties/navigatebarwidget.h +++ b/digikam/libs/imageproperties/navigatebarwidget.h @@ -40,7 +40,7 @@ class NavigateBarWidgetPriv; class DIGIKAM_EXPORT NavigateBarWidget : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/imageproperties/talbumlistview.cpp b/digikam/libs/imageproperties/talbumlistview.cpp index 4191962..1369d22 100644 --- a/digikam/libs/imageproperties/talbumlistview.cpp +++ b/digikam/libs/imageproperties/talbumlistview.cpp @@ -178,8 +178,8 @@ TAlbumListView::TAlbumListView(TQWidget* parent) setAcceptDrops(true); viewport()->setAcceptDrops(true); - connect(AlbumManager::instance(), TQT_SIGNAL(signalTAlbumsDirty(const TQMap<int, int>&)), - this, TQT_SLOT(slotRefresh(const TQMap<int, int>&))); + connect(AlbumManager::instance(), TQ_SIGNAL(signalTAlbumsDirty(const TQMap<int, int>&)), + this, TQ_SLOT(slotRefresh(const TQMap<int, int>&))); } TAlbumListView::~TAlbumListView() diff --git a/digikam/libs/imageproperties/talbumlistview.h b/digikam/libs/imageproperties/talbumlistview.h index cc98722..b483706 100644 --- a/digikam/libs/imageproperties/talbumlistview.h +++ b/digikam/libs/imageproperties/talbumlistview.h @@ -70,7 +70,7 @@ private : class DIGIKAM_EXPORT TAlbumListView : public FolderView { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/jpegutils/jpegutils.cpp b/digikam/libs/jpegutils/jpegutils.cpp index 2db3402..2f2aabb 100644 --- a/digikam/libs/jpegutils/jpegutils.cpp +++ b/digikam/libs/jpegutils/jpegutils.cpp @@ -423,7 +423,7 @@ bool exifRotate(const TQString& file, const TQString& documentName) metaData.setImageDimensions(img.size()); // Update the image thumbnail. - TQImage thumb = img.scale(160, 120, TQ_ScaleMin); + TQImage thumb = img.scale(160, 120, TQImage::ScaleMin); metaData.setExifThumbnail(thumb); // Update Exif Document Name tag (the orinal file name from camera for example). @@ -495,7 +495,7 @@ bool jpegConvert(const TQString& src, const TQString& dest, const TQString& docu meta.setImagePreview(preview); // Update Exif thumbnail. - TQImage thumb = preview.smoothScale(160, 120, TQ_ScaleMin); + TQImage thumb = preview.smoothScale(160, 120, TQImage::ScaleMin); meta.setExifThumbnail(thumb); // Update Exif Document Name tag (the orinal file name from camera for example). diff --git a/digikam/libs/jpegutils/transupp.cpp b/digikam/libs/jpegutils/transupp.cpp index 43fe36c..47a9aa8 100644 --- a/digikam/libs/jpegutils/transupp.cpp +++ b/digikam/libs/jpegutils/transupp.cpp @@ -1625,7 +1625,7 @@ namespace Digikam * or recompression of the image. * Thanks to Guido Vollbeding for the initial design and code of this feature. * - *Qt::Horizontal flipping is done in-place, using a single top-to-bottom + * Horizontal flipping is done in-place, using a single top-to-bottom * pass through the virtual source array. It will thus be much the * fastest option for images larger than main memory. * @@ -1660,7 +1660,7 @@ namespace Digikam LOCAL(void) do_flip_h (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, jvirt_barray_ptr *src_coef_arrays) -/*Qt::Horizontal flip; done in-place, so no separate dest array is required */ +/* Horizontal flip; done in-place, so no separate dest array is required */ { JDIMENSION MCU_cols, comp_width, blk_x, blk_y; int ci, k, offset_y; @@ -1669,7 +1669,7 @@ do_flip_h (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, JCOEF temp1, temp2; jpeg_component_info *compptr; - /*Qt::Horizontal mirroring of DCT blocks is accomplished by swapping + /* Horizontal mirroring of DCT blocks is accomplished by swapping * pairs of blocks in-place. Within a DCT block, we perform horizontal * mirroring by changing the signs of odd-numbered columns. * Partial iMCUs at the right edge are left untouched. @@ -1710,7 +1710,7 @@ LOCAL(void) do_flip_v (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, jvirt_barray_ptr *src_coef_arrays, jvirt_barray_ptr *dst_coef_arrays) -/*Qt::Vertical flip */ +/* Vertical flip */ { JDIMENSION MCU_rows, comp_height, dst_blk_x, dst_blk_y; int ci, i, j, offset_y; @@ -1827,7 +1827,7 @@ do_rot_90 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, jvirt_barray_ptr *dst_coef_arrays) /* 90 degree rotation is equivalent to * 1. Transposing the image; - * 2.Qt::Horizontal mirroring. + * 2. Horizontal mirroring. * These two steps are merged into a single processing routine. */ { @@ -1890,7 +1890,7 @@ do_rot_270 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, jvirt_barray_ptr *src_coef_arrays, jvirt_barray_ptr *dst_coef_arrays) /* 270 degree rotation is equivalent to - * 1.Qt::Horizontal mirroring; + * 1. Horizontal mirroring; * 2. Transposing the image. * These two steps are merged into a single processing routine. */ @@ -1954,8 +1954,8 @@ do_rot_180 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, jvirt_barray_ptr *src_coef_arrays, jvirt_barray_ptr *dst_coef_arrays) /* 180 degree rotation is equivalent to - * 1.Qt::Vertical mirroring; - * 2.Qt::Horizontal mirroring. + * 1. Vertical mirroring; + * 2. Horizontal mirroring. * These two steps are merged into a single processing routine. */ { @@ -2058,9 +2058,9 @@ do_transverse (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, * 1. 180 degree rotation; * 2. Transposition; * or - * 1.Qt::Horizontal mirroring; + * 1. Horizontal mirroring; * 2. Transposition; - * 3.Qt::Horizontal mirroring. + * 3. Horizontal mirroring. * These steps are merged into a single processing routine. */ { diff --git a/digikam/libs/themeengine/themeengine.cpp b/digikam/libs/themeengine/themeengine.cpp index f788def..331ffa5 100644 --- a/digikam/libs/themeengine/themeengine.cpp +++ b/digikam/libs/themeengine/themeengine.cpp @@ -248,7 +248,7 @@ void ThemeEngine::setCurrentTheme(const TQString& name) changePalette(); - TQTimer::singleShot(0, this, TQT_SIGNAL(signalThemeChanged())); + TQTimer::singleShot(0, this, TQ_SIGNAL(signalThemeChanged())); } void ThemeEngine::setCurrentTheme(const Theme& theme, const TQString& name, bool loadFromDisk) @@ -271,7 +271,7 @@ void ThemeEngine::setCurrentTheme(const Theme& theme, const TQString& name, bool changePalette(); - TQTimer::singleShot(0, this, TQT_SIGNAL(signalThemeChanged())); + TQTimer::singleShot(0, this, TQ_SIGNAL(signalThemeChanged())); } void ThemeEngine::changePalette() diff --git a/digikam/libs/themeengine/themeengine.h b/digikam/libs/themeengine/themeengine.h index e19eae7..33abfb0 100644 --- a/digikam/libs/themeengine/themeengine.h +++ b/digikam/libs/themeengine/themeengine.h @@ -45,7 +45,7 @@ class ThemeEnginePriv; class DIGIKAM_EXPORT ThemeEngine : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/threadimageio/loadingcache.cpp b/digikam/libs/threadimageio/loadingcache.cpp index e2b39fe..04dd3e4 100644 --- a/digikam/libs/threadimageio/loadingcache.cpp +++ b/digikam/libs/threadimageio/loadingcache.cpp @@ -78,8 +78,8 @@ LoadingCache::LoadingCache() d->watch = new KDirWatch; - connect(d->watch, TQT_SIGNAL(dirty(const TQString &)), - this, TQT_SLOT(slotFileDirty(const TQString &))); + connect(d->watch, TQ_SIGNAL(dirty(const TQString &)), + this, TQ_SLOT(slotFileDirty(const TQString &))); } LoadingCache::~LoadingCache() diff --git a/digikam/libs/threadimageio/loadingcache.h b/digikam/libs/threadimageio/loadingcache.h index bbd27c7..d468930 100644 --- a/digikam/libs/threadimageio/loadingcache.h +++ b/digikam/libs/threadimageio/loadingcache.h @@ -63,7 +63,7 @@ class LoadingCachePriv; class LoadingCache : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/threadimageio/loadsavethread.h b/digikam/libs/threadimageio/loadsavethread.h index c3031ad..c935e47 100644 --- a/digikam/libs/threadimageio/loadsavethread.h +++ b/digikam/libs/threadimageio/loadsavethread.h @@ -49,7 +49,7 @@ class LoadSaveTask; class DIGIKAM_EXPORT LoadSaveThread : public TQObject, public TQThread { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/threadimageio/previewloadthread.h b/digikam/libs/threadimageio/previewloadthread.h index 231308f..59cc6d7 100644 --- a/digikam/libs/threadimageio/previewloadthread.h +++ b/digikam/libs/threadimageio/previewloadthread.h @@ -31,7 +31,7 @@ namespace Digikam class DIGIKAM_EXPORT PreviewLoadThread : public ManagedLoadSaveThread { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/thumbbar/thumbbar.cpp b/digikam/libs/thumbbar/thumbbar.cpp index 53fa9b0..f5b3276 100644 --- a/digikam/libs/thumbbar/thumbbar.cpp +++ b/digikam/libs/thumbbar/thumbbar.cpp @@ -163,8 +163,8 @@ ThumbBarView::ThumbBarView(TQWidget* parent, int orientation, bool exifRotate, d->toolTip = new ThumbBarToolTip(this); d->timer = new TQTimer(this); - connect(d->timer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotUpdate())); + connect(d->timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotUpdate())); viewport()->setBackgroundMode(TQt::NoBackground); viewport()->setMouseTracking(true); @@ -173,7 +173,7 @@ ThumbBarView::ThumbBarView(TQWidget* parent, int orientation, bool exifRotate, setFrameStyle(TQFrame::NoFrame); setAcceptDrops(true); - if (d->orientation ==Qt::Vertical) + if (d->orientation ==TQt::Vertical) { setHScrollBarMode(TQScrollView::AlwaysOff); } @@ -204,7 +204,7 @@ void ThumbBarView::resizeEvent(TQResizeEvent* e) TQScrollView::resizeEvent(e); - if (d->orientation ==Qt::Vertical) + if (d->orientation ==TQt::Vertical) { d->tileSize = width() - 2*d->margin - verticalScrollBar()->sizeHint().width(); verticalScrollBar()->setLineStep(d->tileSize); @@ -345,7 +345,7 @@ ThumbBarItem* ThumbBarView::findItem(const TQPoint& pos) const { int itemPos; - if (d->orientation ==Qt::Vertical) + if (d->orientation ==TQt::Vertical) itemPos = pos.y(); else itemPos = pos.x(); @@ -403,7 +403,7 @@ void ThumbBarView::ensureItemVisible(ThumbBarItem* item) // We want the complete thumb visible and the next one. // find the middle of the image and give a margin of 1,5 image // When changed, watch regression for bug 104031 - if (d->orientation ==Qt::Vertical) + if (d->orientation ==TQt::Vertical) ensureVisible(0, (int)(item->d->pos + d->margin + d->tileSize*.5), 0, (int)(d->tileSize*1.5 + 3*d->margin)); else @@ -442,11 +442,11 @@ void ThumbBarView::invalidateThumb(ThumbBarItem* item) d->thumbJob = new ThumbnailJob(item->url(), ThumbnailSize::Huge, true, d->exifRotate); - connect(d->thumbJob, TQT_SIGNAL(signalThumbnail(const KURL&, const TQPixmap&)), - this, TQT_SLOT(slotGotThumbnail(const KURL&, const TQPixmap&))); + connect(d->thumbJob, TQ_SIGNAL(signalThumbnail(const KURL&, const TQPixmap&)), + this, TQ_SLOT(slotGotThumbnail(const KURL&, const TQPixmap&))); - connect(d->thumbJob, TQT_SIGNAL(signalFailed(const KURL&)), - this, TQT_SLOT(slotFailedThumbnail(const KURL&))); + connect(d->thumbJob, TQ_SIGNAL(signalFailed(const KURL&)), + this, TQ_SLOT(slotFailedThumbnail(const KURL&))); } void ThumbBarView::viewportPaintEvent(TQPaintEvent* e) @@ -455,7 +455,7 @@ void ThumbBarView::viewportPaintEvent(TQPaintEvent* e) TQPixmap bgPix, tile; TQRect er(e->rect()); - if (d->orientation ==Qt::Vertical) + if (d->orientation ==TQt::Vertical) { cy = viewportToContents(er.topLeft()).y(); @@ -484,7 +484,7 @@ void ThumbBarView::viewportPaintEvent(TQPaintEvent* e) for (ThumbBarItem *item = d->firstItem; item; item = item->d->next) { - if (d->orientation ==Qt::Vertical) + if (d->orientation ==TQt::Vertical) { if (y1 <= item->d->pos && item->d->pos <= y2) { @@ -502,7 +502,7 @@ void ThumbBarView::viewportPaintEvent(TQPaintEvent* e) { TQPixmap pix; pix.convertFromImage(TQImage(item->d->pixmap->convertToImage()). - smoothScale(d->tileSize, d->tileSize, TQ_ScaleMin)); + smoothScale(d->tileSize, d->tileSize, TQImage::ScaleMin)); int x = (tile.width() - pix.width())/2; int y = (tile.height() - pix.height())/2; bitBlt(&tile, x, y, &pix); @@ -529,7 +529,7 @@ void ThumbBarView::viewportPaintEvent(TQPaintEvent* e) { TQPixmap pix; pix.convertFromImage(TQImage(item->d->pixmap->convertToImage()). - smoothScale(d->tileSize, d->tileSize, TQ_ScaleMin)); + smoothScale(d->tileSize, d->tileSize, TQImage::ScaleMin)); int x = (tile.width() - pix.width())/2; int y = (tile.height()- pix.height())/2; bitBlt(&tile, x, y, &pix); @@ -540,7 +540,7 @@ void ThumbBarView::viewportPaintEvent(TQPaintEvent* e) } } - if (d->orientation ==Qt::Vertical) + if (d->orientation ==TQt::Vertical) bitBlt(viewport(), 0, er.y(), &bgPix); else bitBlt(viewport(), er.x(), 0, &bgPix); @@ -570,7 +570,7 @@ void ThumbBarView::contentsMouseMoveEvent(TQMouseEvent *e) { if (!e) return; - if (d->dragging && (e->state() & Qt::LeftButton)) + if (d->dragging && (e->state() & TQt::LeftButton)) { if ( findItem(d->dragStartPos) && (d->dragStartPos - e->pos()).manhattanLength() > TQApplication::startDragDistance() ) @@ -600,14 +600,14 @@ void ThumbBarView::contentsWheelEvent(TQWheelEvent *e) { if (e->state() & TQt::ShiftButton) { - if (d->orientation ==Qt::Vertical) + if (d->orientation ==TQt::Vertical) scrollBy(0, verticalScrollBar()->pageStep()); else scrollBy(horizontalScrollBar()->pageStep(), 0); } else { - if (d->orientation ==Qt::Vertical) + if (d->orientation ==TQt::Vertical) scrollBy(0, verticalScrollBar()->lineStep()); else scrollBy(horizontalScrollBar()->lineStep(), 0); @@ -618,14 +618,14 @@ void ThumbBarView::contentsWheelEvent(TQWheelEvent *e) { if (e->state() & TQt::ShiftButton) { - if (d->orientation ==Qt::Vertical) + if (d->orientation ==TQt::Vertical) scrollBy(0, (-1)*verticalScrollBar()->pageStep()); else scrollBy((-1)*horizontalScrollBar()->pageStep(), 0); } else { - if (d->orientation ==Qt::Vertical) + if (d->orientation ==TQt::Vertical) scrollBy(0, (-1)*verticalScrollBar()->lineStep()); else scrollBy((-1)*horizontalScrollBar()->lineStep(), 0); @@ -736,7 +736,7 @@ void ThumbBarView::rearrangeItems() item = item->d->next; } - if (d->orientation ==Qt::Vertical) + if (d->orientation ==TQt::Vertical) resizeContents(visibleWidth(), d->count*(d->tileSize+2*d->margin)); else resizeContents(d->count*(d->tileSize+2*d->margin), visibleHeight()); @@ -751,11 +751,11 @@ void ThumbBarView::rearrangeItems() d->thumbJob = new ThumbnailJob(urlList, ThumbnailSize::Huge, true, d->exifRotate); - connect(d->thumbJob, TQT_SIGNAL(signalThumbnail(const KURL&, const TQPixmap&)), - this, TQT_SLOT(slotGotThumbnail(const KURL&, const TQPixmap&))); + connect(d->thumbJob, TQ_SIGNAL(signalThumbnail(const KURL&, const TQPixmap&)), + this, TQ_SLOT(slotGotThumbnail(const KURL&, const TQPixmap&))); - connect(d->thumbJob, TQT_SIGNAL(signalFailed(const KURL&)), - this, TQT_SLOT(slotFailedThumbnail(const KURL&))); + connect(d->thumbJob, TQ_SIGNAL(signalFailed(const KURL&)), + this, TQ_SLOT(slotFailedThumbnail(const KURL&))); } } @@ -763,7 +763,7 @@ void ThumbBarView::repaintItem(ThumbBarItem* item) { if (item) { - if (d->orientation ==Qt::Vertical) + if (d->orientation ==TQt::Vertical) repaintContents(0, item->d->pos, visibleWidth(), d->tileSize+2*d->margin); else repaintContents(item->d->pos, 0, d->tileSize+2*d->margin, visibleHeight()); diff --git a/digikam/libs/thumbbar/thumbbar.h b/digikam/libs/thumbbar/thumbbar.h index fb02576..48ac574 100644 --- a/digikam/libs/thumbbar/thumbbar.h +++ b/digikam/libs/thumbbar/thumbbar.h @@ -87,7 +87,7 @@ public: class DIGIKAM_EXPORT ThumbBarView : public TQScrollView { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/thumbbar/thumbnailjob.cpp b/digikam/libs/thumbbar/thumbnailjob.cpp index 46d4e46..dcabb39 100644 --- a/digikam/libs/thumbbar/thumbnailjob.cpp +++ b/digikam/libs/thumbbar/thumbnailjob.cpp @@ -206,8 +206,8 @@ void ThumbnailJob::processNext() if (d->exifRotate) job->addMetaData("exif", "yes"); - connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - this, TQT_SLOT(slotThumbData(TDEIO::Job *, const TQByteArray &))); + connect(job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + this, TQ_SLOT(slotThumbData(TDEIO::Job *, const TQByteArray &))); addSubjob(job); d->running = true; diff --git a/digikam/libs/thumbbar/thumbnailjob.h b/digikam/libs/thumbbar/thumbnailjob.h index 637304d..cc7080e 100644 --- a/digikam/libs/thumbbar/thumbnailjob.h +++ b/digikam/libs/thumbbar/thumbnailjob.h @@ -44,7 +44,7 @@ class ThumbnailJobPriv; class ThumbnailJob : public TDEIO::Job { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/widgets/common/colorgradientwidget.cpp b/digikam/libs/widgets/common/colorgradientwidget.cpp index 9270fd5..df4c96c 100644 --- a/digikam/libs/widgets/common/colorgradientwidget.cpp +++ b/digikam/libs/widgets/common/colorgradientwidget.cpp @@ -61,7 +61,7 @@ ColorGradientWidget::ColorGradientWidget(int o, int size, TQWidget *parent) setFrameStyle(TQFrame::Box|TQFrame::Plain); setLineWidth(1); - if ( d->orientation ==Qt::Horizontal ) + if ( d->orientation ==TQt::Horizontal ) setFixedHeight( size ); else setFixedWidth( size ); @@ -105,7 +105,7 @@ void ColorGradientWidget::drawContents(TQPainter *p) int greenDiff = color2.green() - color1.green(); int blueDiff = color2.blue() - color1.blue(); - if ( d->orientation ==Qt::Vertical ) + if ( d->orientation ==TQt::Vertical ) { for ( int y = 0; y < image.height(); y++ ) { diff --git a/digikam/libs/widgets/common/colorgradientwidget.h b/digikam/libs/widgets/common/colorgradientwidget.h index 2b63dc9..aafc3df 100644 --- a/digikam/libs/widgets/common/colorgradientwidget.h +++ b/digikam/libs/widgets/common/colorgradientwidget.h @@ -40,7 +40,7 @@ class ColorGradientWidgetPriv; class DIGIKAM_EXPORT ColorGradientWidget : public TQFrame { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/common/curveswidget.cpp b/digikam/libs/widgets/common/curveswidget.cpp index 6409a0b..281aecc 100644 --- a/digikam/libs/widgets/common/curveswidget.cpp +++ b/digikam/libs/widgets/common/curveswidget.cpp @@ -153,8 +153,8 @@ void CurvesWidget::setup(int w, int h, bool readOnly) d->blinkTimer = new TQTimer( this ); - connect(d->blinkTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotBlinkTimerDone())); + connect(d->blinkTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotBlinkTimerDone())); } void CurvesWidget::updateData(uchar *i_data, uint i_w, uint i_h, bool i_sixteenBits) @@ -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; @@ -312,7 +312,7 @@ void CurvesWidget::paintEvent(TQPaintEvent*) int asize = 24; TQPixmap anim(asize, asize); TQPainter p2; - p2.begin(TQT_TQPAINTDEVICE(&anim), this); + p2.begin(&anim, this); p2.fillRect(0, 0, asize, asize, palette().active().background()); p2.translate(asize/2, asize/2); @@ -330,7 +330,7 @@ void CurvesWidget::paintEvent(TQPaintEvent*) TQPixmap pm(size()); TQPainter p1; - p1.begin(TQT_TQPAINTDEVICE(&pm), 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()); @@ -353,7 +353,7 @@ void CurvesWidget::paintEvent(TQPaintEvent*) { TQPixmap pm(size()); TQPainter p1; - p1.begin(TQT_TQPAINTDEVICE(&pm), 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()); @@ -418,7 +418,7 @@ void CurvesWidget::paintEvent(TQPaintEvent*) TQPixmap pm(size()); TQPainter p1; - p1.begin(TQT_TQPAINTDEVICE(&pm), this); + p1.begin(&pm, this); int curvePrevVal = 0; @@ -616,7 +616,7 @@ void CurvesWidget::mousePressEvent(TQMouseEvent *e) int closest_point; int distance; - if (e->button() != Qt::LeftButton || d->clearFlag == CurvesWidgetPriv::HistogramStarted) + if (e->button() != TQt::LeftButton || d->clearFlag == CurvesWidgetPriv::HistogramStarted) return; int x = CLAMP((int)(e->pos().x() * @@ -701,7 +701,7 @@ void CurvesWidget::mouseReleaseEvent(TQMouseEvent *e) { if (d->readOnlyMode || !m_imageHistogram) return; - if (e->button() != Qt::LeftButton || d->clearFlag == CurvesWidgetPriv::HistogramStarted) + if (e->button() != TQt::LeftButton || d->clearFlag == CurvesWidgetPriv::HistogramStarted) return; setCursor(KCursor::arrowCursor()); diff --git a/digikam/libs/widgets/common/curveswidget.h b/digikam/libs/widgets/common/curveswidget.h index c85cfff..c9cfed4 100644 --- a/digikam/libs/widgets/common/curveswidget.h +++ b/digikam/libs/widgets/common/curveswidget.h @@ -44,7 +44,7 @@ class CurvesWidgetPriv; class DIGIKAM_EXPORT CurvesWidget : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/common/dcursortracker.cpp b/digikam/libs/widgets/common/dcursortracker.cpp index 2e3ae53..bb9490c 100644 --- a/digikam/libs/widgets/common/dcursortracker.cpp +++ b/digikam/libs/widgets/common/dcursortracker.cpp @@ -58,15 +58,15 @@ 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()) { case TQEvent::MouseMove: { - TQMouseEvent *event = TQT_TQMOUSEEVENT(e); - if (m_enable && (TQT_TQRECT_OBJECT(widget->rect()).contains(event->pos()) || - (event->stateAfter() & Qt::LeftButton))) + TQMouseEvent *event = static_cast<TQMouseEvent*>(e); + if (m_enable && (widget->rect().contains(event->pos()) || + (event->stateAfter() & TQt::LeftButton))) { show(); TQPoint p = widget->mapToGlobal(TQPoint(widget->width()/2, 0)); @@ -81,8 +81,8 @@ bool DCursorTracker::eventFilter(TQObject *object, TQEvent *e) case TQEvent::MouseButtonRelease: { - TQMouseEvent* event = TQT_TQMOUSEEVENT(e); - if ( !TQT_TQRECT_OBJECT(widget->rect()).contains(event->pos()) ) + TQMouseEvent* event = static_cast<TQMouseEvent*>(e); + if ( !widget->rect().contains(event->pos()) ) { hide(); } diff --git a/digikam/libs/widgets/common/dlogoaction.cpp b/digikam/libs/widgets/common/dlogoaction.cpp index eea2bc4..60cfd77 100644 --- a/digikam/libs/widgets/common/dlogoaction.cpp +++ b/digikam/libs/widgets/common/dlogoaction.cpp @@ -67,18 +67,18 @@ int DLogoAction::plug(TQWidget *widget, int index) TDEGlobal::dirs()->addResourceType("banner-digikam", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); TQString directory = TDEGlobal::dirs()->findResourceDir("banner-digikam", "banner-digikam.png"); pixmapLogo->setPixmap(TQPixmap( directory + "banner-digikam.png" )); - pixmapLogo->setFocusPolicy(TQ_NoFocus); + pixmapLogo->setFocusPolicy(TQWidget::NoFocus); bar->insertWidget(id, pixmapLogo->width(), pixmapLogo); bar->alignItemRight(id); addContainer(bar, id); - connect(bar, TQT_SIGNAL(destroyed()), - this, TQT_SLOT(slotDestroyed())); + connect(bar, TQ_SIGNAL(destroyed()), + this, TQ_SLOT(slotDestroyed())); - connect(pixmapLogo, TQT_SIGNAL(leftClickedURL(const TQString&)), - this, TQT_SLOT(slotProcessURL(const TQString&))); + connect(pixmapLogo, TQ_SIGNAL(leftClickedURL(const TQString&)), + this, TQ_SLOT(slotProcessURL(const TQString&))); return containerCount() - 1; } diff --git a/digikam/libs/widgets/common/dlogoaction.h b/digikam/libs/widgets/common/dlogoaction.h index c731ab1..11a0052 100644 --- a/digikam/libs/widgets/common/dlogoaction.h +++ b/digikam/libs/widgets/common/dlogoaction.h @@ -37,7 +37,7 @@ namespace Digikam class DIGIKAM_EXPORT DLogoAction : public TDEAction { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/widgets/common/dpopupmenu.cpp b/digikam/libs/widgets/common/dpopupmenu.cpp index 55139df..f41404c 100644 --- a/digikam/libs/widgets/common/dpopupmenu.cpp +++ b/digikam/libs/widgets/common/dpopupmenu.cpp @@ -188,7 +188,7 @@ void DPopupMenu::paintEvent(TQPaintEvent* e) drawContents(&p); - style().tqdrawPrimitive(TQStyle::PE_PanelPopup, &p, + style().drawPrimitive(TQStyle::PE_PanelPopup, &p, TQRect(0, 0, width(), height()), colorGroup(), TQStyle::Style_Default, TQStyleOption( frameWidth(), 0)); diff --git a/digikam/libs/widgets/common/filesaveoptionsbox.h b/digikam/libs/widgets/common/filesaveoptionsbox.h index 64ba44f..9d9f84f 100644 --- a/digikam/libs/widgets/common/filesaveoptionsbox.h +++ b/digikam/libs/widgets/common/filesaveoptionsbox.h @@ -42,7 +42,7 @@ class FileSaveOptionsBoxPriv; class DIGIKAM_EXPORT FileSaveOptionsBox : public TQWidgetStack { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/common/histogramwidget.cpp b/digikam/libs/widgets/common/histogramwidget.cpp index 44b52c7..b301720 100644 --- a/digikam/libs/widgets/common/histogramwidget.cpp +++ b/digikam/libs/widgets/common/histogramwidget.cpp @@ -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() @@ -184,8 +184,8 @@ void HistogramWidget::setup(int w, int h, bool selectMode, bool showProgress, bo d->blinkTimer = new TQTimer( this ); - connect( d->blinkTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotBlinkTimerDone()) ); + connect( d->blinkTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotBlinkTimerDone()) ); } void HistogramWidget::setHistogramGuideByColor(const DColor& color) @@ -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(TQT_TQPAINTDEVICE(&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(TQT_TQPAINTDEVICE(&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(TQT_TQPAINTDEVICE(&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(TQT_TQPAINTDEVICE(&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(TQT_TQPAINTDEVICE(&pm), TQT_TQOBJECT(this)); + p1.begin(&pm, this); p1.fillRect(0, 0, width(), height(), palette().active().background()); // Drawing selection or all histogram values. diff --git a/digikam/libs/widgets/common/histogramwidget.h b/digikam/libs/widgets/common/histogramwidget.h index 6c7a4d6..2615717 100644 --- a/digikam/libs/widgets/common/histogramwidget.h +++ b/digikam/libs/widgets/common/histogramwidget.h @@ -43,7 +43,7 @@ class HistogramWidgetPriv; class DIGIKAM_EXPORT HistogramWidget : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/common/paniconwidget.cpp b/digikam/libs/widgets/common/paniconwidget.cpp index a64ba02..d554969 100644 --- a/digikam/libs/widgets/common/paniconwidget.cpp +++ b/digikam/libs/widgets/common/paniconwidget.cpp @@ -247,7 +247,7 @@ void PanIconWidget::hideEvent(TQHideEvent *e) void PanIconWidget::mousePressEvent ( TQMouseEvent * e ) { - if ( (e->button() == Qt::LeftButton || e->button() == Qt::MidButton) && + if ( (e->button() == TQt::LeftButton || e->button() == TQt::MidButton) && m_localRegionSelection.contains( e->x(), e->y() ) ) { d->xpos = e->x(); @@ -261,7 +261,7 @@ void PanIconWidget::mousePressEvent ( TQMouseEvent * e ) void PanIconWidget::mouseMoveEvent ( TQMouseEvent * e ) { if ( d->moveSelection && - (e->state() == Qt::LeftButton || e->state() == Qt::MidButton) ) + (e->state() == TQt::LeftButton || e->state() == TQt::MidButton) ) { int newxpos = e->x(); int newypos = e->y(); diff --git a/digikam/libs/widgets/common/paniconwidget.h b/digikam/libs/widgets/common/paniconwidget.h index 62dbaf3..40b0758 100644 --- a/digikam/libs/widgets/common/paniconwidget.h +++ b/digikam/libs/widgets/common/paniconwidget.h @@ -43,7 +43,7 @@ class PanIconWidgetPriv; class PanIconWidget : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/common/previewwidget.cpp b/digikam/libs/widgets/common/previewwidget.cpp index 9e34d00..0fe5cb2 100644 --- a/digikam/libs/widgets/common/previewwidget.cpp +++ b/digikam/libs/widgets/common/previewwidget.cpp @@ -545,16 +545,16 @@ void PreviewWidget::viewportPaintEvent(TQPaintEvent *e) void PreviewWidget::contentsMousePressEvent(TQMouseEvent *e) { - if (!e || e->button() == Qt::RightButton) + if (!e || e->button() == TQt::RightButton) return; m_movingInProgress = false; - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) { emit signalLeftButtonClicked(); } - else if (e->button() == Qt::MidButton) + else if (e->button() == TQt::MidButton) { if (visibleWidth() < d->zoomWidth || visibleHeight() < d->zoomHeight) @@ -575,7 +575,7 @@ void PreviewWidget::contentsMouseMoveEvent(TQMouseEvent *e) { if (!e) return; - if (e->state() & Qt::MidButton) + if (e->state() & TQt::MidButton) { if (m_movingInProgress) { @@ -592,14 +592,14 @@ void PreviewWidget::contentsMouseReleaseEvent(TQMouseEvent *e) m_movingInProgress = false; - if (e->button() == Qt::MidButton) + if (e->button() == TQt::MidButton) { emit signalContentsMovedEvent(true); viewport()->unsetCursor(); viewport()->repaint(false); } - if (e->button() == Qt::RightButton) + if (e->button() == TQt::RightButton) { emit signalRightButtonClicked(); } diff --git a/digikam/libs/widgets/common/previewwidget.h b/digikam/libs/widgets/common/previewwidget.h index 6d284dc..03369a4 100644 --- a/digikam/libs/widgets/common/previewwidget.h +++ b/digikam/libs/widgets/common/previewwidget.h @@ -43,7 +43,7 @@ class PreviewWidgetPriv; class DIGIKAM_EXPORT PreviewWidget : public TQScrollView { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/common/searchtextbar.cpp b/digikam/libs/widgets/common/searchtextbar.cpp index a6379c4..1a81c03 100644 --- a/digikam/libs/widgets/common/searchtextbar.cpp +++ b/digikam/libs/widgets/common/searchtextbar.cpp @@ -156,7 +156,7 @@ SearchTextBar::SearchTextBar(TQWidget *parent, const char* name, const TQString : TQWidget(parent, 0, TQt::WDestructiveClose) { d = new SearchTextBarPriv; - setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); setName(name); TQHBoxLayout *hlay = new TQHBoxLayout(this); @@ -179,11 +179,11 @@ SearchTextBar::SearchTextBar(TQWidget *parent, const char* name, const TQString hlay->addWidget(d->searchEdit); hlay->addWidget(d->clearButton); - connect(d->clearButton, TQT_SIGNAL(clicked()), - d->searchEdit, TQT_SLOT(clear())); + connect(d->clearButton, TQ_SIGNAL(clicked()), + d->searchEdit, TQ_SLOT(clear())); - connect(d->searchEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotTextChanged(const TQString&))); + connect(d->searchEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotTextChanged(const TQString&))); TDEConfig *config = kapp->config(); config->setGroup(name + TQString(" Search Text Tool")); diff --git a/digikam/libs/widgets/common/searchtextbar.h b/digikam/libs/widgets/common/searchtextbar.h index 9e59976..04ef994 100644 --- a/digikam/libs/widgets/common/searchtextbar.h +++ b/digikam/libs/widgets/common/searchtextbar.h @@ -46,7 +46,7 @@ class SearchTextBarPriv; class DIGIKAM_EXPORT DLineEdit : public KLineEdit { - Q_OBJECT + TQ_OBJECT public: @@ -73,7 +73,7 @@ private : class DIGIKAM_EXPORT SearchTextBar : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/common/sidebar.cpp b/digikam/libs/widgets/common/sidebar.cpp index 57dd502..a1bcd75 100644 --- a/digikam/libs/widgets/common/sidebar.cpp +++ b/digikam/libs/widgets/common/sidebar.cpp @@ -94,8 +94,8 @@ Sidebar::Sidebar(TQWidget *parent, const char *name, Side side, bool minimizedDe d->side = side; d->dragSwitchTimer = new TQTimer(this); - connect(d->dragSwitchTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotDragSwitchTimer())); + connect(d->dragSwitchTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotDragSwitchTimer())); } Sidebar::~Sidebar() @@ -201,8 +201,8 @@ void Sidebar::appendTab(TQWidget *w, const TQPixmap &pic, const TQString &title) tab(d->tabs)->setAcceptDrops(true); tab(d->tabs)->installEventFilter(this); - connect(tab(d->tabs), TQT_SIGNAL(clicked(int)), - this, TQT_SLOT(clicked(int))); + connect(tab(d->tabs), TQ_SIGNAL(clicked(int)), + this, TQ_SLOT(clicked(int))); d->tabs++; } @@ -312,7 +312,7 @@ bool Sidebar::eventFilter(TQObject *obj, TQEvent *ev) for (TQPtrListIterator<KMultiTabBarTab> it(*pTabs); it.current(); ++it) { - if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(*it) ) + if ( obj == *it ) { if ( ev->type() == TQEvent::DragEnter) { diff --git a/digikam/libs/widgets/common/sidebar.h b/digikam/libs/widgets/common/sidebar.h index ef7f544..8d2dc51 100644 --- a/digikam/libs/widgets/common/sidebar.h +++ b/digikam/libs/widgets/common/sidebar.h @@ -51,7 +51,7 @@ class SidebarPriv; */ class DIGIKAM_EXPORT Sidebar : public KMultiTabBar { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/widgets/common/splashscreen.cpp b/digikam/libs/widgets/common/splashscreen.cpp index 20abac7..7a8cbba 100644 --- a/digikam/libs/widgets/common/splashscreen.cpp +++ b/digikam/libs/widgets/common/splashscreen.cpp @@ -72,8 +72,8 @@ SplashScreen::SplashScreen(const TQString& splash, WFlags f) TQTimer *timer = new TQTimer(this); - connect(timer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(animate())); + connect(timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(animate())); timer->start(150); } diff --git a/digikam/libs/widgets/common/splashscreen.h b/digikam/libs/widgets/common/splashscreen.h index ef82cce..d2d4cf4 100644 --- a/digikam/libs/widgets/common/splashscreen.h +++ b/digikam/libs/widgets/common/splashscreen.h @@ -44,7 +44,7 @@ class SplashScreenPriv; class DIGIKAM_EXPORT SplashScreen : public KSplashScreen { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/common/squeezedcombobox.cpp b/digikam/libs/widgets/common/squeezedcombobox.cpp index 996b9cf..b70da09 100644 --- a/digikam/libs/widgets/common/squeezedcombobox.cpp +++ b/digikam/libs/widgets/common/squeezedcombobox.cpp @@ -75,11 +75,11 @@ SqueezedComboBox::SqueezedComboBox(TQWidget *parent, const char *name) d->tooltip = new SqueezedComboBoxTip(listBox()->viewport(), this); setMinimumWidth(100); - connect(d->timer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotTimeOut())); + connect(d->timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotTimeOut())); - connect(this, TQT_SIGNAL(activated( int )), - this, TQT_SLOT(slotUpdateToolTip( int ))); + connect(this, TQ_SIGNAL(activated( int )), + this, TQ_SLOT(slotUpdateToolTip( int ))); } SqueezedComboBox::~SqueezedComboBox() @@ -97,7 +97,7 @@ TQSize SqueezedComboBox::sizeHint() const int maxW = count() ? 18 : 7 * fm.width(TQChar('x')) + 18; int maxH = TQMAX( fm.lineSpacing(), 14 ) + 2; - return style().tqsizeFromContents(TQStyle::CT_ComboBox, this, + return style().sizeFromContents(TQStyle::CT_ComboBox, this, TQSize(maxW, maxH)).expandedTo(TQApplication::globalStrut()); } diff --git a/digikam/libs/widgets/common/squeezedcombobox.h b/digikam/libs/widgets/common/squeezedcombobox.h index f6b0a4f..7baaeca 100644 --- a/digikam/libs/widgets/common/squeezedcombobox.h +++ b/digikam/libs/widgets/common/squeezedcombobox.h @@ -55,7 +55,7 @@ class SqueezedComboBoxPriv; */ class DIGIKAM_EXPORT SqueezedComboBox : public TQComboBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/widgets/common/statusled.cpp b/digikam/libs/widgets/common/statusled.cpp index 7d71c7f..e047505 100644 --- a/digikam/libs/widgets/common/statusled.cpp +++ b/digikam/libs/widgets/common/statusled.cpp @@ -43,7 +43,7 @@ StatusLed::StatusLed(TQWidget *parent) : TQLabel(parent) { setLedColor(Gray); - setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); } StatusLed::~StatusLed() diff --git a/digikam/libs/widgets/common/statusled.h b/digikam/libs/widgets/common/statusled.h index 9b55eda..2fd94cb 100644 --- a/digikam/libs/widgets/common/statusled.h +++ b/digikam/libs/widgets/common/statusled.h @@ -39,7 +39,7 @@ class StatusNavigateBarPriv; class DIGIKAM_EXPORT StatusLed : public TQLabel { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/common/statusnavigatebar.cpp b/digikam/libs/widgets/common/statusnavigatebar.cpp index c2a3d40..0ebcaf8 100644 --- a/digikam/libs/widgets/common/statusnavigatebar.cpp +++ b/digikam/libs/widgets/common/statusnavigatebar.cpp @@ -66,30 +66,30 @@ StatusNavigateBar::StatusNavigateBar(TQWidget *parent) : TQWidget(parent, 0, TQt::WDestructiveClose) { d = new StatusNavigateBarPriv; - setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); TQHBoxLayout *lay = new TQHBoxLayout(this); d->firstButton = new TQToolButton(this); - d->firstButton->setFocusPolicy(TQ_NoFocus); + d->firstButton->setFocusPolicy(TQWidget::NoFocus); d->firstButton->setAutoRaise(true); d->firstButton->setIconSet(SmallIconSet("go-first")); TQToolTip::add(d->firstButton, i18n("Go to the first item")); d->prevButton = new TQToolButton(this); - d->prevButton->setFocusPolicy(TQ_NoFocus); + d->prevButton->setFocusPolicy(TQWidget::NoFocus); d->prevButton->setAutoRaise(true); d->prevButton->setIconSet(SmallIconSet("back")); TQToolTip::add(d->prevButton, i18n("Go to the previous item")); d->nextButton = new TQToolButton(this); - d->nextButton->setFocusPolicy(TQ_NoFocus); + d->nextButton->setFocusPolicy(TQWidget::NoFocus); d->nextButton->setAutoRaise(true); d->nextButton->setIconSet(SmallIconSet("forward")); TQToolTip::add(d->nextButton, i18n("Go to the next item")); d->lastButton = new TQToolButton(this); - d->lastButton->setFocusPolicy(TQ_NoFocus); + d->lastButton->setFocusPolicy(TQWidget::NoFocus); d->lastButton->setAutoRaise(true); d->lastButton->setIconSet(SmallIconSet("go-last")); TQToolTip::add(d->lastButton, i18n("Go to the last item")); @@ -99,17 +99,17 @@ StatusNavigateBar::StatusNavigateBar(TQWidget *parent) lay->addWidget(d->nextButton); lay->addWidget(d->lastButton); - connect(d->firstButton, TQT_SIGNAL(clicked()), - this, TQT_SIGNAL(signalFirstItem())); + connect(d->firstButton, TQ_SIGNAL(clicked()), + this, TQ_SIGNAL(signalFirstItem())); - connect(d->prevButton, TQT_SIGNAL(clicked()), - this, TQT_SIGNAL(signalPrevItem())); + connect(d->prevButton, TQ_SIGNAL(clicked()), + this, TQ_SIGNAL(signalPrevItem())); - connect(d->nextButton, TQT_SIGNAL(clicked()), - this, TQT_SIGNAL(signalNextItem())); + connect(d->nextButton, TQ_SIGNAL(clicked()), + this, TQ_SIGNAL(signalNextItem())); - connect(d->lastButton, TQT_SIGNAL(clicked()), - this, TQT_SIGNAL(signalLastItem())); + connect(d->lastButton, TQ_SIGNAL(clicked()), + this, TQ_SIGNAL(signalLastItem())); } StatusNavigateBar::~StatusNavigateBar() diff --git a/digikam/libs/widgets/common/statusnavigatebar.h b/digikam/libs/widgets/common/statusnavigatebar.h index 1918687..7972f74 100644 --- a/digikam/libs/widgets/common/statusnavigatebar.h +++ b/digikam/libs/widgets/common/statusnavigatebar.h @@ -41,7 +41,7 @@ class StatusNavigateBarPriv; class DIGIKAM_EXPORT StatusNavigateBar : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/common/statusprogressbar.cpp b/digikam/libs/widgets/common/statusprogressbar.cpp index 54c7f3b..215f81f 100644 --- a/digikam/libs/widgets/common/statusprogressbar.cpp +++ b/digikam/libs/widgets/common/statusprogressbar.cpp @@ -77,7 +77,7 @@ StatusProgressBar::StatusProgressBar(TQWidget *parent) : TQWidgetStack(parent, 0, TQt::WDestructiveClose) { d = new StatusProgressBarPriv; - setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); d->textLabel = new KSqueezedTextLabel(this); d->progressWidget = new TQWidget(this); @@ -85,7 +85,7 @@ StatusProgressBar::StatusProgressBar(TQWidget *parent) d->progressBar = new KProgress(d->progressWidget); setProgressTotalSteps(100); d->cancelButton = new TQPushButton(d->progressWidget); - d->cancelButton->setFocusPolicy(TQ_NoFocus); + d->cancelButton->setFocusPolicy(TQWidget::NoFocus); d->cancelButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); d->cancelButton->setPixmap(SmallIcon("cancel")); @@ -99,8 +99,8 @@ StatusProgressBar::StatusProgressBar(TQWidget *parent) addWidget(d->textLabel, StatusProgressBarPriv::TextLabel); addWidget(d->progressWidget, StatusProgressBarPriv::ProgressBar); - connect( d->cancelButton, TQT_SIGNAL( clicked() ), - this, TQT_SIGNAL( signalCancelButtonPressed() ) ); + connect( d->cancelButton, TQ_SIGNAL( clicked() ), + this, TQ_SIGNAL( signalCancelButtonPressed() ) ); progressBarMode(TextMode); } diff --git a/digikam/libs/widgets/common/statusprogressbar.h b/digikam/libs/widgets/common/statusprogressbar.h index 512f029..e227a6d 100644 --- a/digikam/libs/widgets/common/statusprogressbar.h +++ b/digikam/libs/widgets/common/statusprogressbar.h @@ -41,7 +41,7 @@ class StatusProgressBarPriv; class DIGIKAM_EXPORT StatusProgressBar : public TQWidgetStack { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/common/statuszoombar.cpp b/digikam/libs/widgets/common/statuszoombar.cpp index 2bc4e06..4430248 100644 --- a/digikam/libs/widgets/common/statuszoombar.cpp +++ b/digikam/libs/widgets/common/statuszoombar.cpp @@ -56,7 +56,7 @@ TQSliderReverseWheel::~TQSliderReverseWheel() void TQSliderReverseWheel::wheelEvent(TQWheelEvent * e) { - if ( e->orientation() != orientation() && !TQT_TQRECT_OBJECT(rect()).contains(e->pos()) ) + if ( e->orientation() != orientation() && !rect().contains(e->pos()) ) return; static float offset = 0; @@ -104,11 +104,11 @@ StatusZoomBar::StatusZoomBar(TQWidget *parent) : TQHBox(parent, 0, TQt::WDestructiveClose) { d = new StatusZoomBarPriv; - setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); d->zoomMinusButton = new TQToolButton(this); d->zoomMinusButton->setAutoRaise(true); - d->zoomMinusButton->setFocusPolicy(TQ_NoFocus); + d->zoomMinusButton->setFocusPolicy(TQWidget::NoFocus); d->zoomMinusButton->setIconSet(SmallIconSet("zoom-out")); TQToolTip::add(d->zoomMinusButton, i18n("Zoom Out")); @@ -117,36 +117,36 @@ StatusZoomBar::StatusZoomBar(TQWidget *parent) d->zoomSlider->setMaxValue(ThumbnailSize::Huge); d->zoomSlider->setPageStep(ThumbnailSize::Step); d->zoomSlider->setValue(ThumbnailSize::Medium); - d->zoomSlider->setOrientation(Qt::Horizontal); + d->zoomSlider->setOrientation(TQt::Horizontal); d->zoomSlider->setLineStep(ThumbnailSize::Step); d->zoomSlider->setMaximumHeight(fontMetrics().height()+2); d->zoomSlider->setFixedWidth(120); - d->zoomSlider->setFocusPolicy(TQ_NoFocus); + d->zoomSlider->setFocusPolicy(TQWidget::NoFocus); d->zoomPlusButton = new TQToolButton(this); d->zoomPlusButton->setAutoRaise(true); d->zoomPlusButton->setIconSet(SmallIconSet("zoom-in")); - d->zoomPlusButton->setFocusPolicy(TQ_NoFocus); + d->zoomPlusButton->setFocusPolicy(TQWidget::NoFocus); TQToolTip::add(d->zoomPlusButton, i18n("Zoom In")); d->zoomTracker = new DTipTracker("", d->zoomSlider); // ------------------------------------------------------------- - connect(d->zoomMinusButton, TQT_SIGNAL(clicked()), - this, TQT_SIGNAL(signalZoomMinusClicked())); + connect(d->zoomMinusButton, TQ_SIGNAL(clicked()), + this, TQ_SIGNAL(signalZoomMinusClicked())); - connect(d->zoomPlusButton, TQT_SIGNAL(clicked()), - this, TQT_SIGNAL(signalZoomPlusClicked())); + connect(d->zoomPlusButton, TQ_SIGNAL(clicked()), + this, TQ_SIGNAL(signalZoomPlusClicked())); - connect(d->zoomSlider, TQT_SIGNAL(valueChanged(int)), - this, TQT_SIGNAL(signalZoomSliderChanged(int))); + connect(d->zoomSlider, TQ_SIGNAL(valueChanged(int)), + this, TQ_SIGNAL(signalZoomSliderChanged(int))); - connect(d->zoomSlider, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotZoomSliderChanged(int))); + connect(d->zoomSlider, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotZoomSliderChanged(int))); - connect(d->zoomSlider, TQT_SIGNAL(sliderReleased()), - this, TQT_SLOT(slotZoomSliderReleased())); + connect(d->zoomSlider, TQ_SIGNAL(sliderReleased()), + this, TQ_SLOT(slotZoomSliderReleased())); } StatusZoomBar::~StatusZoomBar() @@ -167,8 +167,8 @@ void StatusZoomBar::slotZoomSliderChanged(int) } d->zoomTimer = new TQTimer( this ); - connect(d->zoomTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotDelayedZoomSliderChanged()) ); + connect(d->zoomTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotDelayedZoomSliderChanged()) ); d->zoomTimer->start(300, true); } diff --git a/digikam/libs/widgets/common/statuszoombar.h b/digikam/libs/widgets/common/statuszoombar.h index fc86a81..adf6941 100644 --- a/digikam/libs/widgets/common/statuszoombar.h +++ b/digikam/libs/widgets/common/statuszoombar.h @@ -62,7 +62,7 @@ private: class DIGIKAM_EXPORT StatusZoomBar : public TQHBox { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/iccprofiles/cietonguewidget.cpp b/digikam/libs/widgets/iccprofiles/cietonguewidget.cpp index cd2efd5..2ec738b 100644 --- a/digikam/libs/widgets/iccprofiles/cietonguewidget.cpp +++ b/digikam/libs/widgets/iccprofiles/cietonguewidget.cpp @@ -213,8 +213,8 @@ CIETongueWidget::CIETongueWidget(int w, int h, TQWidget *parent, cmsHPROFILE hMo d->hMonitorProfile, TYPE_RGB_8, INTENT_PERCEPTUAL, 0); - connect(d->blinkTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotBlinkTimerDone())); + connect(d->blinkTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotBlinkTimerDone())); } CIETongueWidget::~CIETongueWidget() @@ -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); diff --git a/digikam/libs/widgets/iccprofiles/cietonguewidget.h b/digikam/libs/widgets/iccprofiles/cietonguewidget.h index c91c0c6..9fc8503 100644 --- a/digikam/libs/widgets/iccprofiles/cietonguewidget.h +++ b/digikam/libs/widgets/iccprofiles/cietonguewidget.h @@ -57,7 +57,7 @@ class CIETongueWidgetPriv; class DIGIKAM_EXPORT CIETongueWidget : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/iccprofiles/iccpreviewwidget.h b/digikam/libs/widgets/iccprofiles/iccpreviewwidget.h index f93f592..89b1f4b 100644 --- a/digikam/libs/widgets/iccprofiles/iccpreviewwidget.h +++ b/digikam/libs/widgets/iccprofiles/iccpreviewwidget.h @@ -43,7 +43,7 @@ class ICCProfileWidget; class DIGIKAM_EXPORT ICCPreviewWidget : public KPreviewWidgetBase { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/iccprofiles/iccprofilewidget.h b/digikam/libs/widgets/iccprofiles/iccprofilewidget.h index 4296246..d753f30 100644 --- a/digikam/libs/widgets/iccprofiles/iccprofilewidget.h +++ b/digikam/libs/widgets/iccprofiles/iccprofilewidget.h @@ -41,7 +41,7 @@ class ICCProfileWidgetPriv; class DIGIKAM_EXPORT ICCProfileWidget : public MetadataWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/widgets/imageplugins/imageguidewidget.cpp b/digikam/libs/widgets/imageplugins/imageguidewidget.cpp index c8d3045..4ed7f25 100644 --- a/digikam/libs/widgets/imageplugins/imageguidewidget.cpp +++ b/digikam/libs/widgets/imageplugins/imageguidewidget.cpp @@ -253,7 +253,7 @@ void ImageGuideWidget::updatePixmap() else if (d->renderingPreviewMode == PreviewTargetImage || d->renderingPreviewMode == NoPreviewMode || (d->renderingPreviewMode == PreviewToggleOnMouseOver && d->onMouseMovePreviewToggled == true )) { - d->iface->paint(TQT_TQPAINTDEVICE(d->pixmap), d->rect.x(), d->rect.y(), + d->iface->paint(d->pixmap, d->rect.x(), d->rect.y(), d->rect.width(), d->rect.height(), d->underExposureIndicator, d->overExposureIndicator); @@ -278,7 +278,7 @@ void ImageGuideWidget::updatePixmap() p.drawPixmap(d->rect, d->iface->convertToPixmap(d->preview)); // Drawing the target image under the original. - d->iface->paint(TQT_TQPAINTDEVICE(d->pixmap), + d->iface->paint(d->pixmap, d->rect.x()+d->rect.width()/2, d->rect.y(), d->rect.width()/2, @@ -289,7 +289,7 @@ void ImageGuideWidget::updatePixmap() else { // Drawing the target image. - d->iface->paint(TQT_TQPAINTDEVICE(d->pixmap), + d->iface->paint(d->pixmap, d->rect.x(), d->rect.y(), d->rect.width(), @@ -344,7 +344,7 @@ void ImageGuideWidget::updatePixmap() p.drawPixmap(d->rect, d->iface->convertToPixmap(d->preview)); // Drawing the target image under the original. - d->iface->paint(TQT_TQPAINTDEVICE(d->pixmap), + d->iface->paint(d->pixmap, d->rect.x(), d->rect.y()+d->rect.height()/2, d->rect.width(), @@ -355,7 +355,7 @@ void ImageGuideWidget::updatePixmap() else { // Drawing the target image. - d->iface->paint(TQT_TQPAINTDEVICE(d->pixmap), + d->iface->paint(d->pixmap, d->rect.x(), d->rect.y(), d->rect.width(), @@ -496,7 +496,7 @@ void ImageGuideWidget::resizeEvent(TQResizeEvent* e) void ImageGuideWidget::mousePressEvent(TQMouseEvent* e) { - if ( !d->focus && e->button() == Qt::LeftButton && + if ( !d->focus && e->button() == TQt::LeftButton && d->rect.contains( e->x(), e->y() ) && d->spotVisible ) { d->focus = true; diff --git a/digikam/libs/widgets/imageplugins/imageguidewidget.h b/digikam/libs/widgets/imageplugins/imageguidewidget.h index 5cf7a11..48d6d24 100644 --- a/digikam/libs/widgets/imageplugins/imageguidewidget.h +++ b/digikam/libs/widgets/imageplugins/imageguidewidget.h @@ -46,7 +46,7 @@ class ImageGuideWidgetPriv; class DIGIKAM_EXPORT ImageGuideWidget : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp b/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp index 4b6ab95..4551e09 100644 --- a/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp +++ b/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp @@ -179,24 +179,24 @@ ImagePanelWidget::ImagePanelWidget(uint w, uint h, const TQString& settingsSecti // ------------------------------------------------------------- - TQTimer::singleShot(0, this, TQT_SLOT(slotInitGui())); + TQTimer::singleShot(0, this, TQ_SLOT(slotInitGui())); // ------------------------------------------------------------- - connect(d->imageRegionWidget, TQT_SIGNAL(signalContentsMovedEvent(bool)), - this, TQT_SLOT(slotOriginalImageRegionChanged(bool))); + connect(d->imageRegionWidget, TQ_SIGNAL(signalContentsMovedEvent(bool)), + this, TQ_SLOT(slotOriginalImageRegionChanged(bool))); - connect(d->imagePanIconWidget, TQT_SIGNAL(signalSelectionMoved(const TQRect&, bool)), - this, TQT_SLOT(slotSetImageRegionPosition(const TQRect&, bool))); + connect(d->imagePanIconWidget, TQ_SIGNAL(signalSelectionMoved(const TQRect&, bool)), + this, TQ_SLOT(slotSetImageRegionPosition(const TQRect&, bool))); - connect(d->imagePanIconWidget, TQT_SIGNAL(signalSelectionTakeFocus()), - this, TQT_SLOT(slotPanIconTakeFocus())); + connect(d->imagePanIconWidget, TQ_SIGNAL(signalSelectionTakeFocus()), + this, TQ_SLOT(slotPanIconTakeFocus())); - connect(d->separateView, TQT_SIGNAL(released(int)), - d->imagePanIconWidget, TQT_SLOT(slotSeparateViewToggled(int))); + connect(d->separateView, TQ_SIGNAL(released(int)), + d->imagePanIconWidget, TQ_SLOT(slotSeparateViewToggled(int))); - connect(d->separateView, TQT_SIGNAL(released(int)), - d->imageRegionWidget, TQT_SLOT(slotSeparateViewToggled(int))); + connect(d->separateView, TQ_SIGNAL(released(int)), + d->imageRegionWidget, TQ_SLOT(slotSeparateViewToggled(int))); } ImagePanelWidget::~ImagePanelWidget() diff --git a/digikam/libs/widgets/imageplugins/imagepanelwidget.h b/digikam/libs/widgets/imageplugins/imagepanelwidget.h index 292ba74..32179da 100644 --- a/digikam/libs/widgets/imageplugins/imagepanelwidget.h +++ b/digikam/libs/widgets/imageplugins/imagepanelwidget.h @@ -47,7 +47,7 @@ class ImagePanIconWidget; class DIGIKAM_EXPORT ImagePanelWidget : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/imageplugins/imagepaniconwidget.cpp b/digikam/libs/widgets/imageplugins/imagepaniconwidget.cpp index 8fbeb17..3856422 100644 --- a/digikam/libs/widgets/imageplugins/imagepaniconwidget.cpp +++ b/digikam/libs/widgets/imageplugins/imagepaniconwidget.cpp @@ -104,7 +104,7 @@ void ImagePanIconWidget::updatePixmap() { // Drawing background and image. m_pixmap->fill(colorGroup().background()); - d->iface->paint(TQT_TQPAINTDEVICE(m_pixmap), m_rect.x(), m_rect.y(), m_rect.width(), m_rect.height()); + d->iface->paint(m_pixmap, m_rect.x(), m_rect.y(), m_rect.width(), m_rect.height()); TQPainter p(m_pixmap); diff --git a/digikam/libs/widgets/imageplugins/imagepaniconwidget.h b/digikam/libs/widgets/imageplugins/imagepaniconwidget.h index dbb3480..e7d6ffb 100644 --- a/digikam/libs/widgets/imageplugins/imagepaniconwidget.h +++ b/digikam/libs/widgets/imageplugins/imagepaniconwidget.h @@ -40,7 +40,7 @@ class ImagePanIconWidgetPriv; class ImagePanIconWidget : public PanIconWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp b/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp index 27444a0..cebf0f3 100644 --- a/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp +++ b/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp @@ -253,33 +253,33 @@ ImagePannelWidget::ImagePannelWidget(uint w, uint h, const TQString& settingsSec // ------------------------------------------------------------- setProgressVisible(false); - TQTimer::singleShot(0, this, TQT_SLOT(slotInitGui())); + TQTimer::singleShot(0, this, TQ_SLOT(slotInitGui())); // ------------------------------------------------------------- - connect(d->imageRegionWidget, TQT_SIGNAL(signalContentsMovedEvent(bool)), - this, TQT_SLOT(slotOriginalImageRegionChanged(bool))); + connect(d->imageRegionWidget, TQ_SIGNAL(signalContentsMovedEvent(bool)), + this, TQ_SLOT(slotOriginalImageRegionChanged(bool))); - connect(d->imagePanIconWidget, TQT_SIGNAL(signalSelectionMoved(const TQRect&, bool)), - this, TQT_SLOT(slotSetImageRegionPosition(const TQRect&, bool))); + connect(d->imagePanIconWidget, TQ_SIGNAL(signalSelectionMoved(const TQRect&, bool)), + this, TQ_SLOT(slotSetImageRegionPosition(const TQRect&, bool))); - connect(d->imagePanIconWidget, TQT_SIGNAL(signalSelectionTakeFocus()), - this, TQT_SLOT(slotPanIconTakeFocus())); + connect(d->imagePanIconWidget, TQ_SIGNAL(signalSelectionTakeFocus()), + this, TQ_SLOT(slotPanIconTakeFocus())); - connect(d->separateView, TQT_SIGNAL(released(int)), - d->imageRegionWidget, TQT_SLOT(slotSeparateViewToggled(int))); + connect(d->separateView, TQ_SIGNAL(released(int)), + d->imageRegionWidget, TQ_SLOT(slotSeparateViewToggled(int))); - connect(d->separateView, TQT_SIGNAL(released(int)), - d->imagePanIconWidget, TQT_SLOT(slotSeparateViewToggled(int))); + connect(d->separateView, TQ_SIGNAL(released(int)), + d->imagePanIconWidget, TQ_SLOT(slotSeparateViewToggled(int))); - connect(d->zoomBar, TQT_SIGNAL(signalZoomMinusClicked()), - d->imageRegionWidget, TQT_SLOT(slotDecreaseZoom())); + connect(d->zoomBar, TQ_SIGNAL(signalZoomMinusClicked()), + d->imageRegionWidget, TQ_SLOT(slotDecreaseZoom())); - connect(d->zoomBar, TQT_SIGNAL(signalZoomPlusClicked()), - d->imageRegionWidget, TQT_SLOT(slotIncreaseZoom())); + connect(d->zoomBar, TQ_SIGNAL(signalZoomPlusClicked()), + d->imageRegionWidget, TQ_SLOT(slotIncreaseZoom())); - connect(d->zoomBar, TQT_SIGNAL(signalZoomSliderReleased(int)), - this, TQT_SLOT(slotZoomSliderChanged(int))); + connect(d->zoomBar, TQ_SIGNAL(signalZoomSliderReleased(int)), + this, TQ_SLOT(slotZoomSliderChanged(int))); } ImagePannelWidget::~ImagePannelWidget() diff --git a/digikam/libs/widgets/imageplugins/imagepannelwidget.h b/digikam/libs/widgets/imageplugins/imagepannelwidget.h index a839372..a342988 100644 --- a/digikam/libs/widgets/imageplugins/imagepannelwidget.h +++ b/digikam/libs/widgets/imageplugins/imagepannelwidget.h @@ -46,7 +46,7 @@ class ImageRegionWidget; class DIGIKAM_EXPORT ImagePannelWidget : public TQHBox { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/imageplugins/imageregionwidget.cpp b/digikam/libs/widgets/imageplugins/imageregionwidget.cpp index db80604..c1392cc 100644 --- a/digikam/libs/widgets/imageplugins/imageregionwidget.cpp +++ b/digikam/libs/widgets/imageplugins/imageregionwidget.cpp @@ -95,8 +95,8 @@ ImageRegionWidget::ImageRegionWidget(int wp, int hp, TQWidget *parent, bool scro setHScrollBarMode( TQScrollView::AlwaysOff ); } - connect(this, TQT_SIGNAL(signalZoomFactorChanged(double)), - this, TQT_SLOT(slotZoomFactorChanged())); + connect(this, TQ_SIGNAL(signalZoomFactorChanged(double)), + this, TQ_SLOT(slotZoomFactorChanged())); } ImageRegionWidget::~ImageRegionWidget() diff --git a/digikam/libs/widgets/imageplugins/imageregionwidget.h b/digikam/libs/widgets/imageplugins/imageregionwidget.h index fbd70ba..8555703 100644 --- a/digikam/libs/widgets/imageplugins/imageregionwidget.h +++ b/digikam/libs/widgets/imageplugins/imageregionwidget.h @@ -41,7 +41,7 @@ class ImageRegionWidgetPriv; class DIGIKAM_EXPORT ImageRegionWidget : public PreviewWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/imageplugins/imagewidget.cpp b/digikam/libs/widgets/imageplugins/imagewidget.cpp index 909dba9..ab73bbf 100644 --- a/digikam/libs/widgets/imageplugins/imagewidget.cpp +++ b/digikam/libs/widgets/imageplugins/imagewidget.cpp @@ -217,29 +217,29 @@ ImageWidget::ImageWidget(const TQString& settingsSection, TQWidget *parent, // ------------------------------------------------------------- - connect(d->previewWidget, TQT_SIGNAL(signalResized()), - this, TQT_SIGNAL(signalResized())); + connect(d->previewWidget, TQ_SIGNAL(signalResized()), + this, TQ_SIGNAL(signalResized())); - connect(d->previewWidget, TQT_SIGNAL(spotPositionChangedFromOriginal( const Digikam::DColor &, const TQPoint & )), - this, TQT_SIGNAL(spotPositionChangedFromOriginal( const Digikam::DColor &, const TQPoint & ))); + connect(d->previewWidget, TQ_SIGNAL(spotPositionChangedFromOriginal( const Digikam::DColor &, const TQPoint & )), + this, TQ_SIGNAL(spotPositionChangedFromOriginal( const Digikam::DColor &, const TQPoint & ))); - connect(d->previewWidget, TQT_SIGNAL(spotPositionChangedFromOriginal( const Digikam::DColor &, const TQPoint & )), - this, TQT_SLOT(slotUpdateSpotInfo( const Digikam::DColor &, const TQPoint & ))); + connect(d->previewWidget, TQ_SIGNAL(spotPositionChangedFromOriginal( const Digikam::DColor &, const TQPoint & )), + this, TQ_SLOT(slotUpdateSpotInfo( const Digikam::DColor &, const TQPoint & ))); - connect(d->previewWidget, TQT_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), - this, TQT_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & ))); + connect(d->previewWidget, TQ_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), + this, TQ_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & ))); - connect(d->previewWidget, TQT_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), - this, TQT_SLOT(slotUpdateSpotInfo( const Digikam::DColor &, const TQPoint & ))); + connect(d->previewWidget, TQ_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), + this, TQ_SLOT(slotUpdateSpotInfo( const Digikam::DColor &, const TQPoint & ))); - connect(d->previewButtons, TQT_SIGNAL(released(int)), - d->previewWidget, TQT_SLOT(slotChangeRenderingPreviewMode(int))); + connect(d->previewButtons, TQ_SIGNAL(released(int)), + d->previewWidget, TQ_SLOT(slotChangeRenderingPreviewMode(int))); - connect(d->underExposureButton, TQT_SIGNAL(toggled(bool)), - d->previewWidget, TQT_SLOT(slotToggleUnderExposure(bool))); + connect(d->underExposureButton, TQ_SIGNAL(toggled(bool)), + d->previewWidget, TQ_SLOT(slotToggleUnderExposure(bool))); - connect(d->overExposureButton, TQT_SIGNAL(toggled(bool)), - d->previewWidget, TQT_SLOT(slotToggleOverExposure(bool))); + connect(d->overExposureButton, TQ_SIGNAL(toggled(bool)), + d->previewWidget, TQ_SLOT(slotToggleOverExposure(bool))); // ------------------------------------------------------------- diff --git a/digikam/libs/widgets/imageplugins/imagewidget.h b/digikam/libs/widgets/imageplugins/imagewidget.h index 0192bdf..ebdf92e 100644 --- a/digikam/libs/widgets/imageplugins/imagewidget.h +++ b/digikam/libs/widgets/imageplugins/imagewidget.h @@ -46,7 +46,7 @@ class ImageWidgetPriv; class DIGIKAM_EXPORT ImageWidget : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/metadata/exifwidget.h b/digikam/libs/widgets/metadata/exifwidget.h index ead60bc..ba66d08 100644 --- a/digikam/libs/widgets/metadata/exifwidget.h +++ b/digikam/libs/widgets/metadata/exifwidget.h @@ -38,7 +38,7 @@ namespace Digikam class DIGIKAM_EXPORT ExifWidget : public MetadataWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/widgets/metadata/gpswidget.cpp b/digikam/libs/widgets/metadata/gpswidget.cpp index fcb1646..033423e 100644 --- a/digikam/libs/widgets/metadata/gpswidget.cpp +++ b/digikam/libs/widgets/metadata/gpswidget.cpp @@ -110,7 +110,7 @@ GPSWidget::GPSWidget(TQWidget* parent, const char* name) // -------------------------------------------------------- - TQGroupBox* box2 = new TQGroupBox( 0, Qt::Vertical, gpsInfo ); + TQGroupBox* box2 = new TQGroupBox( 0, TQt::Vertical, gpsInfo ); box2->setInsideMargin(0); box2->setInsideSpacing(0); box2->setFrameStyle( TQFrame::NoFrame ); @@ -138,8 +138,8 @@ GPSWidget::GPSWidget(TQWidget* parent, const char* name) // -------------------------------------------------------- - connect(d->detailsButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotGPSDetails())); + connect(d->detailsButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotGPSDetails())); setUserAreaWidget(gpsInfo); decodeMetadata(); diff --git a/digikam/libs/widgets/metadata/gpswidget.h b/digikam/libs/widgets/metadata/gpswidget.h index 2d1d92e..fd787d6 100644 --- a/digikam/libs/widgets/metadata/gpswidget.h +++ b/digikam/libs/widgets/metadata/gpswidget.h @@ -42,7 +42,7 @@ class WorldMapWidget; class DIGIKAM_EXPORT GPSWidget : public MetadataWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/widgets/metadata/iptcwidget.h b/digikam/libs/widgets/metadata/iptcwidget.h index df4fb36..58f1449 100644 --- a/digikam/libs/widgets/metadata/iptcwidget.h +++ b/digikam/libs/widgets/metadata/iptcwidget.h @@ -34,7 +34,7 @@ namespace Digikam class DIGIKAM_EXPORT IptcWidget : public MetadataWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/widgets/metadata/makernotewidget.h b/digikam/libs/widgets/metadata/makernotewidget.h index ae10381..f654959 100644 --- a/digikam/libs/widgets/metadata/makernotewidget.h +++ b/digikam/libs/widgets/metadata/makernotewidget.h @@ -35,7 +35,7 @@ namespace Digikam class DIGIKAM_EXPORT MakerNoteWidget : public MetadataWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/widgets/metadata/metadatalistview.cpp b/digikam/libs/widgets/metadata/metadatalistview.cpp index f2cd414..612eed1 100644 --- a/digikam/libs/widgets/metadata/metadatalistview.cpp +++ b/digikam/libs/widgets/metadata/metadatalistview.cpp @@ -59,8 +59,8 @@ MetadataListView::MetadataListView(TQWidget* parent) m_parent = dynamic_cast<MetadataWidget *>(parent); - connect(this, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(slotSelectionChanged(TQListViewItem*))); + connect(this, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(slotSelectionChanged(TQListViewItem*))); } MetadataListView::~MetadataListView() @@ -185,7 +185,7 @@ void MetadataListView::setIfdList(const DMetadata::MetaDataMap& ifds, const TQSt delete parentifDItem; setCurrentItemByKey(m_selectedItemKey); - TQTimer::singleShot( 0, this, TQT_SLOT( triggerUpdate() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( triggerUpdate() ) ); } void MetadataListView::setIfdList(const DMetadata::MetaDataMap& ifds, const TQStringList& keysFilter, @@ -244,13 +244,13 @@ void MetadataListView::setIfdList(const DMetadata::MetaDataMap& ifds, const TQSt } setCurrentItemByKey(m_selectedItemKey); - TQTimer::singleShot( 0, this, TQT_SLOT( triggerUpdate() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( triggerUpdate() ) ); } void MetadataListView::viewportResizeEvent(TQResizeEvent* e) { TQListView::viewportResizeEvent(e); - TQTimer::singleShot( 0, this, TQT_SLOT( triggerUpdate() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( triggerUpdate() ) ); } void MetadataListView::slotSearchTextChanged(const TQString& filter) diff --git a/digikam/libs/widgets/metadata/metadatalistview.h b/digikam/libs/widgets/metadata/metadatalistview.h index 92d6fb7..aefe649 100644 --- a/digikam/libs/widgets/metadata/metadatalistview.h +++ b/digikam/libs/widgets/metadata/metadatalistview.h @@ -42,7 +42,7 @@ namespace Digikam class DIGIKAM_EXPORT MetadataListView : public TQListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/widgets/metadata/metadatawidget.cpp b/digikam/libs/widgets/metadata/metadatawidget.cpp index 525effd..d0bd5b1 100644 --- a/digikam/libs/widgets/metadata/metadatawidget.cpp +++ b/digikam/libs/widgets/metadata/metadatawidget.cpp @@ -158,23 +158,23 @@ MetadataWidget::MetadataWidget(TQWidget* parent, const char* name) // ----------------------------------------------------------------- - connect(d->levelButtons, TQT_SIGNAL(released(int)), - this, TQT_SLOT(slotModeChanged(int))); + connect(d->levelButtons, TQ_SIGNAL(released(int)), + this, TQ_SLOT(slotModeChanged(int))); - connect(copy2ClipBoard, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotCopy2Clipboard())); + connect(copy2ClipBoard, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotCopy2Clipboard())); - connect(printMetadata, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotPrintMetadata())); + connect(printMetadata, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotPrintMetadata())); - connect(saveMetadata, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSaveMetadataToFile())); + connect(saveMetadata, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSaveMetadataToFile())); - connect(d->searchBar, TQT_SIGNAL(signalTextChanged(const TQString&)), - d->view, TQT_SLOT(slotSearchTextChanged(const TQString&))); + connect(d->searchBar, TQ_SIGNAL(signalTextChanged(const TQString&)), + d->view, TQ_SLOT(slotSearchTextChanged(const TQString&))); - connect(d->view, TQT_SIGNAL(signalTextFilterMatch(bool)), - d->searchBar, TQT_SLOT(slotSearchResult(bool))); + connect(d->view, TQ_SIGNAL(signalTextFilterMatch(bool)), + d->searchBar, TQ_SLOT(slotSearchResult(bool))); } MetadataWidget::~MetadataWidget() diff --git a/digikam/libs/widgets/metadata/metadatawidget.h b/digikam/libs/widgets/metadata/metadatawidget.h index c109338..5d2feb6 100644 --- a/digikam/libs/widgets/metadata/metadatawidget.h +++ b/digikam/libs/widgets/metadata/metadatawidget.h @@ -46,7 +46,7 @@ class MetadataWidgetPriv; class DIGIKAM_EXPORT MetadataWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/widgets/metadata/worldmapwidget.cpp b/digikam/libs/widgets/metadata/worldmapwidget.cpp index 17d07cc..811e914 100644 --- a/digikam/libs/widgets/metadata/worldmapwidget.cpp +++ b/digikam/libs/widgets/metadata/worldmapwidget.cpp @@ -176,7 +176,7 @@ void WorldMapWidget::drawContents(TQPainter *p, int x, int y, int w, int h) void WorldMapWidget::contentsMousePressEvent ( TQMouseEvent * e ) { - if ( e->button() == Qt::LeftButton ) + if ( e->button() == TQt::LeftButton ) { d->xMousePos = e->x(); d->yMousePos = e->y(); @@ -191,7 +191,7 @@ void WorldMapWidget::contentsMouseReleaseEvent ( TQMouseEvent * ) void WorldMapWidget::contentsMouseMoveEvent( TQMouseEvent * e ) { - if ( e->state() == Qt::LeftButton ) + if ( e->state() == TQt::LeftButton ) { uint newxpos = e->x(); uint newypos = e->y(); diff --git a/digikam/libs/widgets/metadata/worldmapwidget.h b/digikam/libs/widgets/metadata/worldmapwidget.h index 2bfa10f..bfb8ad8 100644 --- a/digikam/libs/widgets/metadata/worldmapwidget.h +++ b/digikam/libs/widgets/metadata/worldmapwidget.h @@ -39,7 +39,7 @@ class WorldMapWidgetPriv; class DIGIKAM_EXPORT WorldMapWidget : public TQScrollView { -Q_OBJECT +TQ_OBJECT public: |