diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-18 06:46:40 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-18 06:46:40 +0000 |
commit | 7c19562ad065b6729bac8eb9b40dfe0452a72272 (patch) | |
tree | 33325d1e02ecc9ca614c7209296f8f796a1c3478 /kipi-plugins/metadataedit | |
parent | a65baa328fac0a1ce12971fef8d998ce7bfbe237 (diff) | |
download | kipi-plugins-7c19562ad065b6729bac8eb9b40dfe0452a72272.tar.gz kipi-plugins-7c19562ad065b6729bac8eb9b40dfe0452a72272.zip |
TQt4 port kipi-plugins
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/libraries/kipi-plugins@1232561 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kipi-plugins/metadataedit')
40 files changed, 1522 insertions, 1502 deletions
diff --git a/kipi-plugins/metadataedit/commenteditdialog.cpp b/kipi-plugins/metadataedit/commenteditdialog.cpp index ba13195..8082632 100644 --- a/kipi-plugins/metadataedit/commenteditdialog.cpp +++ b/kipi-plugins/metadataedit/commenteditdialog.cpp @@ -20,14 +20,14 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qlabel.h> -#include <qframe.h> -#include <qlayout.h> -#include <qpushbutton.h> -#include <qcheckbox.h> -#include <qwhatsthis.h> +#include <tqlabel.h> +#include <tqframe.h> +#include <tqlayout.h> +#include <tqpushbutton.h> +#include <tqcheckbox.h> +#include <tqwhatsthis.h> // KDE includes. @@ -64,19 +64,19 @@ public: syncIPTCCaptionCheck = 0; } - QCheckBox *syncJFIFCommentCheck; - QCheckBox *syncEXIFCommentCheck; - QCheckBox *syncIPTCCaptionCheck; + TQCheckBox *syncJFIFCommentCheck; + TQCheckBox *syncEXIFCommentCheck; + TQCheckBox *syncIPTCCaptionCheck; KTextEdit *userCommentEdit; KIPIPlugins::KPAboutData *about; }; -CommentEditDialog::CommentEditDialog(QWidget* parent) +CommentEditDialog::CommentEditDialog(TQWidget* tqparent) : KDialogBase(Plain, i18n("Edit Image Caption"), Help|Ok|Cancel, Ok, - parent, 0, true, true) + tqparent, 0, true, true) { d = new CommentEditDialogDialogPrivate; @@ -95,27 +95,27 @@ CommentEditDialog::CommentEditDialog(QWidget* parent) KHelpMenu* helpMenu = new KHelpMenu(this, d->about, false); helpMenu->menu()->removeItemAt(0); helpMenu->menu()->insertItem(i18n("Plugin Handbook"), - this, SLOT(slotHelp()), 0, -1, 0); + this, TQT_SLOT(slotHelp()), 0, -1, 0); actionButton(Help)->setPopup( helpMenu->menu() ); // ------------------------------------------------------------ - QVBoxLayout *vlay = new QVBoxLayout(plainPage(), 0, KDialog::spacingHint()); + TQVBoxLayout *vlay = new TQVBoxLayout(plainPage(), 0, KDialog::spacingHint()); - QLabel *title = new QLabel(i18n("<p>Enter the image caption hosted by <b>%1</b>. " + TQLabel *title = new TQLabel(i18n("<p>Enter the image caption hosted by <b>%1</b>. " "This field is not limited (excepted with IPTC). UTF-8 encoding " "will be used to save text.") - .arg(KApplication::kApplication()->aboutData()->appName()), + .tqarg(KApplication::kApplication()->aboutData()->appName()), plainPage()); d->userCommentEdit = new KTextEdit(plainPage()); - d->syncJFIFCommentCheck = new QCheckBox(i18n("Sync JFIF Comment section"), plainPage()); - d->syncEXIFCommentCheck = new QCheckBox(i18n("Sync EXIF Comment"), plainPage()); - d->syncIPTCCaptionCheck = new QCheckBox(i18n("Sync IPTC caption (warning: limited to 2000 printable " + d->syncJFIFCommentCheck = new TQCheckBox(i18n("Sync JFIF Comment section"), plainPage()); + d->syncEXIFCommentCheck = new TQCheckBox(i18n("Sync EXIF Comment"), plainPage()); + d->syncIPTCCaptionCheck = new TQCheckBox(i18n("Sync IPTC caption (warning: limited to 2000 printable " "Ascii characters set)"), plainPage()); - QLabel *note = new QLabel(i18n("<b>Note: captions from currently selected images " + TQLabel *note = new TQLabel(i18n("<b>Note: captions from currently selected images " "will be permanently replaced.</b>"), plainPage()); // ------------------------------------------------------------ @@ -143,7 +143,7 @@ void CommentEditDialog::slotHelp() KApplication::kApplication()->invokeHelp("metadataedit", "kipi-plugins"); } -void CommentEditDialog::closeEvent(QCloseEvent *e) +void CommentEditDialog::closeEvent(TQCloseEvent *e) { if (!e) return; saveSettings(); @@ -163,7 +163,7 @@ void CommentEditDialog::readSettings() setCheckedSyncJFIFComment(config.readBoolEntry("Sync JFIF Comment", true)); setCheckedSyncEXIFComment(config.readBoolEntry("Sync EXIF Comment", true)); setCheckedSyncIPTCCaption(config.readBoolEntry("Sync IPTC Caption", true)); - resize(configDialogSize(config, QString("Comments Edit Dialog"))); + resize(configDialogSize(config, TQString("Comments Edit Dialog"))); } void CommentEditDialog::saveSettings() @@ -173,7 +173,7 @@ void CommentEditDialog::saveSettings() config.writeEntry("Sync JFIF Comment", syncJFIFCommentIsChecked()); config.writeEntry("Sync EXIF Comment", syncEXIFCommentIsChecked()); config.writeEntry("Sync IPTC Caption", syncIPTCCaptionIsChecked()); - saveDialogSize(config, QString("Comments Edit Dialog")); + saveDialogSize(config, TQString("Comments Edit Dialog")); config.sync(); } @@ -198,7 +198,7 @@ bool CommentEditDialog::syncIPTCCaptionIsChecked() return d->syncIPTCCaptionCheck->isChecked(); } -QString CommentEditDialog::getComments() +TQString CommentEditDialog::getComments() { return d->userCommentEdit->text(); } diff --git a/kipi-plugins/metadataedit/commenteditdialog.h b/kipi-plugins/metadataedit/commenteditdialog.h index 876d64a..280d6db 100644 --- a/kipi-plugins/metadataedit/commenteditdialog.h +++ b/kipi-plugins/metadataedit/commenteditdialog.h @@ -23,9 +23,9 @@ #ifndef COMMENTEDITDIALOG_H #define COMMENTEDITDIALOG_H -// Qt includes. +// TQt includes. -#include <qstring.h> +#include <tqstring.h> // KDE includes. @@ -39,10 +39,11 @@ class CommentEditDialogDialogPrivate; class CommentEditDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - CommentEditDialog(QWidget* parent); + CommentEditDialog(TQWidget* tqparent); ~CommentEditDialog(); bool syncJFIFCommentIsChecked(); @@ -53,7 +54,7 @@ public: void setCheckedSyncEXIFComment(bool c); void setCheckedSyncIPTCCaption(bool c); - QString getComments(); + TQString getComments(); protected slots: @@ -63,7 +64,7 @@ protected slots: protected: - void closeEvent(QCloseEvent *); + void closeEvent(TQCloseEvent *); private: diff --git a/kipi-plugins/metadataedit/commentremovedialog.cpp b/kipi-plugins/metadataedit/commentremovedialog.cpp index de18d0e..4e6b271 100644 --- a/kipi-plugins/metadataedit/commentremovedialog.cpp +++ b/kipi-plugins/metadataedit/commentremovedialog.cpp @@ -20,14 +20,14 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qlabel.h> -#include <qframe.h> -#include <qlayout.h> -#include <qpushbutton.h> -#include <qcheckbox.h> -#include <qwhatsthis.h> +#include <tqlabel.h> +#include <tqframe.h> +#include <tqlayout.h> +#include <tqpushbutton.h> +#include <tqcheckbox.h> +#include <tqwhatsthis.h> // KDE includes. @@ -63,18 +63,18 @@ public: removeIPTCCaptionCheck = 0; } - QCheckBox *removeHOSTCommentCheck; - QCheckBox *removeJFIFCommentCheck; - QCheckBox *removeEXIFCommentCheck; - QCheckBox *removeIPTCCaptionCheck; + TQCheckBox *removeHOSTCommentCheck; + TQCheckBox *removeJFIFCommentCheck; + TQCheckBox *removeEXIFCommentCheck; + TQCheckBox *removeIPTCCaptionCheck; KIPIPlugins::KPAboutData *about; }; -CommentRemoveDialog::CommentRemoveDialog(QWidget* parent) +CommentRemoveDialog::CommentRemoveDialog(TQWidget* tqparent) : KDialogBase(Plain, i18n("Remove Image Captions"), Help|Ok|Cancel, Ok, - parent, 0, true, true) + tqparent, 0, true, true) { d = new CommentRemoveDialogDialogPrivate; @@ -93,21 +93,21 @@ CommentRemoveDialog::CommentRemoveDialog(QWidget* parent) KHelpMenu* helpMenu = new KHelpMenu(this, d->about, false); helpMenu->menu()->removeItemAt(0); helpMenu->menu()->insertItem(i18n("Plugin Handbook"), - this, SLOT(slotHelp()), 0, -1, 0); + this, TQT_SLOT(slotHelp()), 0, -1, 0); actionButton(Help)->setPopup( helpMenu->menu() ); // ------------------------------------------------------------ - QVBoxLayout *vlay = new QVBoxLayout(plainPage(), 0, KDialog::spacingHint()); + TQVBoxLayout *vlay = new TQVBoxLayout(plainPage(), 0, KDialog::spacingHint()); - d->removeHOSTCommentCheck = new QCheckBox(i18n("Remove caption created by %1") - .arg(KApplication::kApplication()->aboutData()->appName()), + d->removeHOSTCommentCheck = new TQCheckBox(i18n("Remove caption created by %1") + .tqarg(KApplication::kApplication()->aboutData()->appName()), plainPage()); - d->removeJFIFCommentCheck = new QCheckBox(i18n("Remove JFIF Comment section"), plainPage()); - d->removeEXIFCommentCheck = new QCheckBox(i18n("Remove EXIF Comment"), plainPage()); - d->removeIPTCCaptionCheck = new QCheckBox(i18n("Remove IPTC caption"), plainPage()); + d->removeJFIFCommentCheck = new TQCheckBox(i18n("Remove JFIF Comment section"), plainPage()); + d->removeEXIFCommentCheck = new TQCheckBox(i18n("Remove EXIF Comment"), plainPage()); + d->removeIPTCCaptionCheck = new TQCheckBox(i18n("Remove IPTC caption"), plainPage()); - QLabel *note = new QLabel(i18n("<b>Note: Captions from currently selected images " + TQLabel *note = new TQLabel(i18n("<b>Note: Captions from currently selected images " "will be permanently removed.</b>"), plainPage()); // ------------------------------------------------------------ @@ -134,7 +134,7 @@ void CommentRemoveDialog::slotHelp() KApplication::kApplication()->invokeHelp("metadataedit", "kipi-plugins"); } -void CommentRemoveDialog::closeEvent(QCloseEvent *e) +void CommentRemoveDialog::closeEvent(TQCloseEvent *e) { if (!e) return; saveSettings(); @@ -155,7 +155,7 @@ void CommentRemoveDialog::readSettings() setCheckedRemoveJFIFComment(config.readBoolEntry("Remove JFIF Comment", true)); setCheckedRemoveEXIFComment(config.readBoolEntry("Remove EXIF Comment", true)); setCheckedRemoveIPTCCaption(config.readBoolEntry("Remove IPTC Caption", true)); - resize(configDialogSize(config, QString("Comments Remove Dialog"))); + resize(configDialogSize(config, TQString("Comments Remove Dialog"))); } void CommentRemoveDialog::saveSettings() @@ -166,7 +166,7 @@ void CommentRemoveDialog::saveSettings() config.writeEntry("Remove JFIF Comment", removeJFIFCommentIsChecked()); config.writeEntry("Remove EXIF Comment", removeEXIFCommentIsChecked()); config.writeEntry("Remove IPTC Caption", removeIPTCCaptionIsChecked()); - saveDialogSize(config, QString("Comments Remove Dialog")); + saveDialogSize(config, TQString("Comments Remove Dialog")); config.sync(); } diff --git a/kipi-plugins/metadataedit/commentremovedialog.h b/kipi-plugins/metadataedit/commentremovedialog.h index 4d812dc..2506364 100644 --- a/kipi-plugins/metadataedit/commentremovedialog.h +++ b/kipi-plugins/metadataedit/commentremovedialog.h @@ -35,10 +35,11 @@ class CommentRemoveDialogDialogPrivate; class CommentRemoveDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - CommentRemoveDialog(QWidget* parent); + CommentRemoveDialog(TQWidget* tqparent); ~CommentRemoveDialog(); bool removeHOSTCommentIsChecked(); @@ -59,7 +60,7 @@ protected slots: protected: - void closeEvent(QCloseEvent *); + void closeEvent(TQCloseEvent *); private: diff --git a/kipi-plugins/metadataedit/exifadjust.cpp b/kipi-plugins/metadataedit/exifadjust.cpp index f80320a..aad43f8 100644 --- a/kipi-plugins/metadataedit/exifadjust.cpp +++ b/kipi-plugins/metadataedit/exifadjust.cpp @@ -26,10 +26,10 @@ // QT includes. -#include <qlayout.h> -#include <qlabel.h> -#include <qwhatsthis.h> -#include <qcombobox.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqwhatsthis.h> +#include <tqcombobox.h> // KDE includes. @@ -70,13 +70,13 @@ public: customRenderedCB = 0; } - QCheckBox *brightnessCheck; + TQCheckBox *brightnessCheck; - QComboBox *gainControlCB; - QComboBox *contrastCB; - QComboBox *saturationCB; - QComboBox *sharpnessCB; - QComboBox *customRenderedCB; + TQComboBox *gainControlCB; + TQComboBox *contrastCB; + TQComboBox *saturationCB; + TQComboBox *sharpnessCB; + TQComboBox *customRenderedCB; KDoubleSpinBox *brightnessEdit; @@ -87,26 +87,26 @@ public: MetadataCheckBox *customRenderedCheck; }; -EXIFAdjust::EXIFAdjust(QWidget* parent) - : QWidget(parent) +EXIFAdjust::EXIFAdjust(TQWidget* tqparent) + : TQWidget(tqparent) { d = new EXIFAdjustPriv; - QGridLayout* grid = new QGridLayout(parent, 6, 2, KDialog::spacingHint()); + TQGridLayout* grid = new TQGridLayout(tqparent, 6, 2, KDialog::spacingHint()); // -------------------------------------------------------- - d->brightnessCheck = new QCheckBox(i18n("Brightness (APEX):"), parent); - d->brightnessEdit = new KDoubleSpinBox(-99.99, 99.99, 0.1, 0.0, 2, parent); + d->brightnessCheck = new TQCheckBox(i18n("Brightness (APEX):"), tqparent); + d->brightnessEdit = new KDoubleSpinBox(-99.99, 99.99, 0.1, 0.0, 2, tqparent); grid->addMultiCellWidget(d->brightnessCheck, 0, 0, 0, 0); grid->addMultiCellWidget(d->brightnessEdit, 0, 0, 2, 2); - QWhatsThis::add(d->brightnessEdit, i18n("<p>Set here the brightness adjustment value in APEX unit " + TQWhatsThis::add(d->brightnessEdit, i18n("<p>Set here the brightness adjustment value in APEX unit " "used by camera to take the picture.")); // -------------------------------------------------------- - d->gainControlCheck = new MetadataCheckBox(i18n("Gain Control:"), parent); - d->gainControlCB = new QComboBox(false, parent); + d->gainControlCheck = new MetadataCheckBox(i18n("Gain Control:"), tqparent); + d->gainControlCB = new TQComboBox(false, tqparent); d->gainControlCB->insertItem(i18n("None"), 0); d->gainControlCB->insertItem(i18n("Low gain up"), 1); d->gainControlCB->insertItem(i18n("High gain up"), 2); @@ -114,54 +114,54 @@ EXIFAdjust::EXIFAdjust(QWidget* parent) d->gainControlCB->insertItem(i18n("High gain down"), 4); grid->addMultiCellWidget(d->gainControlCheck, 1, 1, 0, 0); grid->addMultiCellWidget(d->gainControlCB, 1, 1, 2, 2); - QWhatsThis::add(d->gainControlCB, i18n("<p>Set here the degree of overall image gain adjustment " + TQWhatsThis::add(d->gainControlCB, i18n("<p>Set here the degree of overall image gain adjustment " "used by camera to take the picture.")); // -------------------------------------------------------- - d->contrastCheck = new MetadataCheckBox(i18n("Contrast:"), parent); - d->contrastCB = new QComboBox(false, parent); + d->contrastCheck = new MetadataCheckBox(i18n("Contrast:"), tqparent); + d->contrastCB = new TQComboBox(false, tqparent); d->contrastCB->insertItem(i18n("Normal"), 0); d->contrastCB->insertItem(i18n("Soft"), 1); d->contrastCB->insertItem(i18n("Hard"), 2); grid->addMultiCellWidget(d->contrastCheck, 2, 2, 0, 0); grid->addMultiCellWidget(d->contrastCB, 2, 2, 2, 2); - QWhatsThis::add(d->contrastCB, i18n("<p>Set here the direction of contrast processing " + TQWhatsThis::add(d->contrastCB, i18n("<p>Set here the direction of contrast processing " "applied by the camera to take the picture.")); // -------------------------------------------------------- - d->saturationCheck = new MetadataCheckBox(i18n("Saturation:"), parent); - d->saturationCB = new QComboBox(false, parent); + d->saturationCheck = new MetadataCheckBox(i18n("Saturation:"), tqparent); + d->saturationCB = new TQComboBox(false, tqparent); d->saturationCB->insertItem(i18n("Normal"), 0); d->saturationCB->insertItem(i18n("Low"), 1); d->saturationCB->insertItem(i18n("High"), 2); grid->addMultiCellWidget(d->saturationCheck, 3, 3, 0, 0); grid->addMultiCellWidget(d->saturationCB, 3, 3, 2, 2); - QWhatsThis::add(d->saturationCB, i18n("<p>Set here the direction of saturation processing " + TQWhatsThis::add(d->saturationCB, i18n("<p>Set here the direction of saturation processing " "applied by the camera to take the picture.")); // -------------------------------------------------------- - d->sharpnessCheck = new MetadataCheckBox(i18n("Sharpness:"), parent); - d->sharpnessCB = new QComboBox(false, parent); + d->sharpnessCheck = new MetadataCheckBox(i18n("Sharpness:"), tqparent); + d->sharpnessCB = new TQComboBox(false, tqparent); d->sharpnessCB->insertItem(i18n("Normal"), 0); d->sharpnessCB->insertItem(i18n("Soft"), 1); d->sharpnessCB->insertItem(i18n("Hard"), 2); grid->addMultiCellWidget(d->sharpnessCheck, 4, 4, 0, 0); grid->addMultiCellWidget(d->sharpnessCB, 4, 4, 2, 2); - QWhatsThis::add(d->sharpnessCB, i18n("<p>Set here the direction of sharpness processing " + TQWhatsThis::add(d->sharpnessCB, i18n("<p>Set here the direction of sharpness processing " "applied by the camera to take the picture.")); // -------------------------------------------------------- - d->customRenderedCheck = new MetadataCheckBox(i18n("Custom rendered:"), parent); - d->customRenderedCB = new QComboBox(false, parent); + d->customRenderedCheck = new MetadataCheckBox(i18n("Custom rendered:"), tqparent); + d->customRenderedCB = new TQComboBox(false, tqparent); d->customRenderedCB->insertItem(i18n("Normal process"), 0); d->customRenderedCB->insertItem(i18n("Custom process"), 1); grid->addMultiCellWidget(d->customRenderedCheck, 5, 5, 0, 0); grid->addMultiCellWidget(d->customRenderedCB, 5, 5, 2, 2); - QWhatsThis::add(d->customRenderedCB, i18n("<p>Set here the use of special processing on " + TQWhatsThis::add(d->customRenderedCB, i18n("<p>Set here the use of special processing on " "image data, such as rendering geared to output.")); grid->setColStretch(1, 10); @@ -169,63 +169,63 @@ EXIFAdjust::EXIFAdjust(QWidget* parent) // -------------------------------------------------------- - connect(d->brightnessCheck, SIGNAL(toggled(bool)), - d->brightnessEdit, SLOT(setEnabled(bool))); + connect(d->brightnessCheck, TQT_SIGNAL(toggled(bool)), + d->brightnessEdit, TQT_SLOT(setEnabled(bool))); - connect(d->gainControlCheck, SIGNAL(toggled(bool)), - d->gainControlCB, SLOT(setEnabled(bool))); + connect(d->gainControlCheck, TQT_SIGNAL(toggled(bool)), + d->gainControlCB, TQT_SLOT(setEnabled(bool))); - connect(d->contrastCheck, SIGNAL(toggled(bool)), - d->contrastCB, SLOT(setEnabled(bool))); + connect(d->contrastCheck, TQT_SIGNAL(toggled(bool)), + d->contrastCB, TQT_SLOT(setEnabled(bool))); - connect(d->saturationCheck, SIGNAL(toggled(bool)), - d->saturationCB, SLOT(setEnabled(bool))); + connect(d->saturationCheck, TQT_SIGNAL(toggled(bool)), + d->saturationCB, TQT_SLOT(setEnabled(bool))); - connect(d->sharpnessCheck, SIGNAL(toggled(bool)), - d->sharpnessCB, SLOT(setEnabled(bool))); + connect(d->sharpnessCheck, TQT_SIGNAL(toggled(bool)), + d->sharpnessCB, TQT_SLOT(setEnabled(bool))); - connect(d->customRenderedCheck, SIGNAL(toggled(bool)), - d->customRenderedCB, SLOT(setEnabled(bool))); + connect(d->customRenderedCheck, TQT_SIGNAL(toggled(bool)), + d->customRenderedCB, TQT_SLOT(setEnabled(bool))); // -------------------------------------------------------- - connect(d->brightnessCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->brightnessCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->gainControlCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->gainControlCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->contrastCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->contrastCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->saturationCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->saturationCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->sharpnessCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->sharpnessCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->customRenderedCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->customRenderedCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); // -------------------------------------------------------- - connect(d->gainControlCB, SIGNAL(activated(int)), - this, SIGNAL(signalModified())); + connect(d->gainControlCB, TQT_SIGNAL(activated(int)), + this, TQT_SIGNAL(signalModified())); - connect(d->contrastCB, SIGNAL(activated(int)), - this, SIGNAL(signalModified())); + connect(d->contrastCB, TQT_SIGNAL(activated(int)), + this, TQT_SIGNAL(signalModified())); - connect(d->saturationCB, SIGNAL(activated(int)), - this, SIGNAL(signalModified())); + connect(d->saturationCB, TQT_SIGNAL(activated(int)), + this, TQT_SIGNAL(signalModified())); - connect(d->sharpnessCB, SIGNAL(activated(int)), - this, SIGNAL(signalModified())); + connect(d->sharpnessCB, TQT_SIGNAL(activated(int)), + this, TQT_SIGNAL(signalModified())); - connect(d->customRenderedCB, SIGNAL(activated(int)), - this, SIGNAL(signalModified())); + connect(d->customRenderedCB, TQT_SIGNAL(activated(int)), + this, TQT_SIGNAL(signalModified())); - connect(d->brightnessEdit, SIGNAL(valueChanged(double)), - this, SIGNAL(signalModified())); + connect(d->brightnessEdit, TQT_SIGNAL(valueChanged(double)), + this, TQT_SIGNAL(signalModified())); } EXIFAdjust::~EXIFAdjust() @@ -233,7 +233,7 @@ EXIFAdjust::~EXIFAdjust() delete d; } -void EXIFAdjust::readMetadata(QByteArray& exifData) +void EXIFAdjust::readMetadata(TQByteArray& exifData) { blockSignals(true); KExiv2Iface::KExiv2 exiv2Iface; @@ -323,7 +323,7 @@ void EXIFAdjust::readMetadata(QByteArray& exifData) blockSignals(false); } -void EXIFAdjust::applyMetadata(QByteArray& exifData) +void EXIFAdjust::applyMetadata(TQByteArray& exifData) { KExiv2Iface::KExiv2 exiv2Iface; exiv2Iface.setExif(exifData); diff --git a/kipi-plugins/metadataedit/exifadjust.h b/kipi-plugins/metadataedit/exifadjust.h index bf7be12..1acabaf 100644 --- a/kipi-plugins/metadataedit/exifadjust.h +++ b/kipi-plugins/metadataedit/exifadjust.h @@ -23,27 +23,28 @@ #ifndef EXIF_ADJUST_H #define EXIF_ADJUST_H -// Qt includes. +// TQt includes. -#include <qwidget.h> -#include <qcstring.h> +#include <tqwidget.h> +#include <tqcstring.h> namespace KIPIMetadataEditPlugin { class EXIFAdjustPriv; -class EXIFAdjust : public QWidget +class EXIFAdjust : public TQWidget { Q_OBJECT + TQ_OBJECT public: - EXIFAdjust(QWidget* parent); + EXIFAdjust(TQWidget* tqparent); ~EXIFAdjust(); - void applyMetadata(QByteArray& exifData); - void readMetadata(QByteArray& exifData); + void applyMetadata(TQByteArray& exifData); + void readMetadata(TQByteArray& exifData); signals: diff --git a/kipi-plugins/metadataedit/exifcaption.cpp b/kipi-plugins/metadataedit/exifcaption.cpp index abab570..b41ac1b 100644 --- a/kipi-plugins/metadataedit/exifcaption.cpp +++ b/kipi-plugins/metadataedit/exifcaption.cpp @@ -22,13 +22,13 @@ // QT includes. -#include <qlayout.h> -#include <qhgroupbox.h> -#include <qgroupbox.h> -#include <qlabel.h> -#include <qwhatsthis.h> -#include <qvalidator.h> -#include <qcheckbox.h> +#include <tqlayout.h> +#include <tqhgroupbox.h> +#include <tqgroupbox.h> +#include <tqlabel.h> +#include <tqwhatsthis.h> +#include <tqvalidator.h> +#include <tqcheckbox.h> // KDE includes. @@ -74,14 +74,14 @@ public: syncIPTCCaptionCheck = 0; } - QCheckBox *documentNameCheck; - QCheckBox *imageDescCheck; - QCheckBox *artistCheck; - QCheckBox *copyrightCheck; - QCheckBox *userCommentCheck; - QCheckBox *syncJFIFCommentCheck; - QCheckBox *syncHOSTCommentCheck; - QCheckBox *syncIPTCCaptionCheck; + TQCheckBox *documentNameCheck; + TQCheckBox *imageDescCheck; + TQCheckBox *artistCheck; + TQCheckBox *copyrightCheck; + TQCheckBox *userCommentCheck; + TQCheckBox *syncJFIFCommentCheck; + TQCheckBox *syncHOSTCommentCheck; + TQCheckBox *syncIPTCCaptionCheck; KTextEdit *userCommentEdit; @@ -91,71 +91,71 @@ public: KLineEdit *copyrightEdit; }; -EXIFCaption::EXIFCaption(QWidget* parent) - : QWidget(parent) +EXIFCaption::EXIFCaption(TQWidget* tqparent) + : TQWidget(tqparent) { d = new EXIFCaptionPriv; - QVBoxLayout *vlay = new QVBoxLayout( parent, 0, KDialog::spacingHint() ); + TQVBoxLayout *vlay = new TQVBoxLayout( tqparent, 0, KDialog::spacingHint() ); // EXIF only accept printable Ascii char. - QRegExp asciiRx("[\x20-\x7F]+$"); - QValidator *asciiValidator = new QRegExpValidator(asciiRx, this); + TQRegExp asciiRx("[\x20-\x7F]+$"); + TQValidator *asciiValidator = new TQRegExpValidator(asciiRx, TQT_TQOBJECT(this)); // -------------------------------------------------------- - d->documentNameCheck = new QCheckBox(i18n("Document name (*):"), parent); - d->documentNameEdit = new KLineEdit(parent); + d->documentNameCheck = new TQCheckBox(i18n("Document name (*):"), tqparent); + d->documentNameEdit = new KLineEdit(tqparent); d->documentNameEdit->setValidator(asciiValidator); vlay->addWidget(d->documentNameCheck); vlay->addWidget(d->documentNameEdit); - QWhatsThis::add(d->documentNameEdit, i18n("<p>Enter the name of the document from which " + TQWhatsThis::add(d->documentNameEdit, i18n("<p>Enter the name of the document from which " "this image was been scanned. This field is limited " "to ASCII characters.")); // -------------------------------------------------------- - d->imageDescCheck = new QCheckBox(i18n("Image description (*):"), parent); - d->imageDescEdit = new KLineEdit(parent); + d->imageDescCheck = new TQCheckBox(i18n("Image description (*):"), tqparent); + d->imageDescEdit = new KLineEdit(tqparent); d->imageDescEdit->setValidator(asciiValidator); vlay->addWidget(d->imageDescCheck); vlay->addWidget(d->imageDescEdit); - QWhatsThis::add(d->imageDescEdit, i18n("<p>Enter the image title. This field is limited " + TQWhatsThis::add(d->imageDescEdit, i18n("<p>Enter the image title. This field is limited " "to ASCII characters.")); // -------------------------------------------------------- - d->artistCheck = new QCheckBox(i18n("Artist (*):"), parent); - d->artistEdit = new KLineEdit(parent); + d->artistCheck = new TQCheckBox(i18n("Artist (*):"), tqparent); + d->artistEdit = new KLineEdit(tqparent); d->artistEdit->setValidator(asciiValidator); vlay->addWidget(d->artistCheck); vlay->addWidget(d->artistEdit); - QWhatsThis::add(d->artistEdit, i18n("<p>Enter the image author's name. " + TQWhatsThis::add(d->artistEdit, i18n("<p>Enter the image author's name. " "This field is limited to ASCII characters.")); // -------------------------------------------------------- - d->copyrightCheck = new QCheckBox(i18n("Copyright (*):"), parent); - d->copyrightEdit = new KLineEdit(parent); + d->copyrightCheck = new TQCheckBox(i18n("Copyright (*):"), tqparent); + d->copyrightEdit = new KLineEdit(tqparent); d->copyrightEdit->setValidator(asciiValidator); vlay->addWidget(d->copyrightCheck); vlay->addWidget(d->copyrightEdit); - QWhatsThis::add(d->copyrightEdit, i18n("<p>Enter the copyright owner of the image. " + TQWhatsThis::add(d->copyrightEdit, i18n("<p>Enter the copyright owner of the image. " "This field is limited to ASCII characters.")); // -------------------------------------------------------- - d->userCommentCheck = new QCheckBox(i18n("Caption:"), parent); - d->userCommentEdit = new KTextEdit(parent); - QWhatsThis::add(d->userCommentEdit, i18n("<p>Enter the image's caption. " + d->userCommentCheck = new TQCheckBox(i18n("Caption:"), tqparent); + d->userCommentEdit = new KTextEdit(tqparent); + TQWhatsThis::add(d->userCommentEdit, i18n("<p>Enter the image's caption. " "This field is not limited. UTF8 encoding " "will be used to save the text.")); - d->syncHOSTCommentCheck = new QCheckBox(i18n("Sync captions entered through %1") - .arg(KApplication::kApplication()->aboutData()->appName()), - parent); - d->syncJFIFCommentCheck = new QCheckBox(i18n("Sync JFIF Comment section"), parent); - d->syncIPTCCaptionCheck = new QCheckBox(i18n("Sync IPTC caption (warning: limited to 2000 printable " - "Ascii characters set)"), parent); + d->syncHOSTCommentCheck = new TQCheckBox(i18n("Sync captions entered through %1") + .tqarg(KApplication::kApplication()->aboutData()->appName()), + tqparent); + d->syncJFIFCommentCheck = new TQCheckBox(i18n("Sync JFIF Comment section"), tqparent); + d->syncIPTCCaptionCheck = new TQCheckBox(i18n("Sync IPTC caption (warning: limited to 2000 printable " + "Ascii characters set)"), tqparent); vlay->addWidget(d->userCommentCheck); vlay->addWidget(d->userCommentEdit); @@ -169,69 +169,69 @@ EXIFCaption::EXIFCaption(QWidget* parent) "<b><a href='http://en.wikipedia.org/wiki/EXIF'>EXIF</a></b> " "text tags marked by (*) only support printable " "<b><a href='http://en.wikipedia.org/wiki/Ascii'>ASCII</a></b> " - "characters set.</b>"), parent); + "characters set.</b>"), tqparent); vlay->addWidget(note); vlay->addStretch(); // -------------------------------------------------------- - connect(d->documentNameCheck, SIGNAL(toggled(bool)), - d->documentNameEdit, SLOT(setEnabled(bool))); + connect(d->documentNameCheck, TQT_SIGNAL(toggled(bool)), + d->documentNameEdit, TQT_SLOT(setEnabled(bool))); - connect(d->imageDescCheck, SIGNAL(toggled(bool)), - d->imageDescEdit, SLOT(setEnabled(bool))); + connect(d->imageDescCheck, TQT_SIGNAL(toggled(bool)), + d->imageDescEdit, TQT_SLOT(setEnabled(bool))); - connect(d->artistCheck, SIGNAL(toggled(bool)), - d->artistEdit, SLOT(setEnabled(bool))); + connect(d->artistCheck, TQT_SIGNAL(toggled(bool)), + d->artistEdit, TQT_SLOT(setEnabled(bool))); - connect(d->copyrightCheck, SIGNAL(toggled(bool)), - d->copyrightEdit, SLOT(setEnabled(bool))); + connect(d->copyrightCheck, TQT_SIGNAL(toggled(bool)), + d->copyrightEdit, TQT_SLOT(setEnabled(bool))); - connect(d->userCommentCheck, SIGNAL(toggled(bool)), - d->userCommentEdit, SLOT(setEnabled(bool))); + connect(d->userCommentCheck, TQT_SIGNAL(toggled(bool)), + d->userCommentEdit, TQT_SLOT(setEnabled(bool))); - connect(d->userCommentCheck, SIGNAL(toggled(bool)), - d->syncJFIFCommentCheck, SLOT(setEnabled(bool))); + connect(d->userCommentCheck, TQT_SIGNAL(toggled(bool)), + d->syncJFIFCommentCheck, TQT_SLOT(setEnabled(bool))); - connect(d->userCommentCheck, SIGNAL(toggled(bool)), - d->syncHOSTCommentCheck, SLOT(setEnabled(bool))); + connect(d->userCommentCheck, TQT_SIGNAL(toggled(bool)), + d->syncHOSTCommentCheck, TQT_SLOT(setEnabled(bool))); - connect(d->userCommentCheck, SIGNAL(toggled(bool)), - d->syncIPTCCaptionCheck, SLOT(setEnabled(bool))); + connect(d->userCommentCheck, TQT_SIGNAL(toggled(bool)), + d->syncIPTCCaptionCheck, TQT_SLOT(setEnabled(bool))); // -------------------------------------------------------- - connect(d->documentNameCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->documentNameCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->imageDescCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->imageDescCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->artistCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->artistCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->copyrightCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->copyrightCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->userCommentCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->userCommentCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); // -------------------------------------------------------- - connect(d->userCommentEdit, SIGNAL(textChanged()), - this, SIGNAL(signalModified())); + connect(d->userCommentEdit, TQT_SIGNAL(textChanged()), + this, TQT_SIGNAL(signalModified())); - connect(d->documentNameEdit, SIGNAL(textChanged(const QString &)), - this, SIGNAL(signalModified())); + connect(d->documentNameEdit, TQT_SIGNAL(textChanged(const TQString &)), + this, TQT_SIGNAL(signalModified())); - connect(d->imageDescEdit, SIGNAL(textChanged(const QString &)), - this, SIGNAL(signalModified())); + connect(d->imageDescEdit, TQT_SIGNAL(textChanged(const TQString &)), + this, TQT_SIGNAL(signalModified())); - connect(d->artistEdit, SIGNAL(textChanged(const QString &)), - this, SIGNAL(signalModified())); + connect(d->artistEdit, TQT_SIGNAL(textChanged(const TQString &)), + this, TQT_SIGNAL(signalModified())); - connect(d->copyrightEdit, SIGNAL(textChanged(const QString &)), - this, SIGNAL(signalModified())); + connect(d->copyrightEdit, TQT_SIGNAL(textChanged(const TQString &)), + this, TQT_SIGNAL(signalModified())); } EXIFCaption::~EXIFCaption() @@ -254,7 +254,7 @@ bool EXIFCaption::syncIPTCCaptionIsChecked() return d->syncIPTCCaptionCheck->isChecked(); } -QString EXIFCaption::getEXIFUserComments() +TQString EXIFCaption::getEXIFUserComments() { return d->userCommentEdit->text(); } @@ -274,12 +274,12 @@ void EXIFCaption::setCheckedSyncIPTCCaption(bool c) d->syncIPTCCaptionCheck->setChecked(c); } -void EXIFCaption::readMetadata(QByteArray& exifData) +void EXIFCaption::readMetadata(TQByteArray& exifData) { blockSignals(true); KExiv2Iface::KExiv2 exiv2Iface; exiv2Iface.setExif(exifData); - QString data; + TQString data; d->documentNameEdit->clear(); d->documentNameCheck->setChecked(false); @@ -337,7 +337,7 @@ void EXIFCaption::readMetadata(QByteArray& exifData) blockSignals(false); } -void EXIFCaption::applyMetadata(QByteArray& exifData, QByteArray& iptcData) +void EXIFCaption::applyMetadata(TQByteArray& exifData, TQByteArray& iptcData) { KExiv2Iface::KExiv2 exiv2Iface; exiv2Iface.setExif(exifData); @@ -376,7 +376,7 @@ void EXIFCaption::applyMetadata(QByteArray& exifData, QByteArray& iptcData) else exiv2Iface.removeExifTag("Exif.Photo.UserComment"); - exiv2Iface.setImageProgramId(QString("Kipi-plugins"), QString(kipiplugins_version)); + exiv2Iface.setImageProgramId(TQString("Kipi-plugins"), TQString(kipiplugins_version)); exifData = exiv2Iface.getExif(); iptcData = exiv2Iface.getIptc(); diff --git a/kipi-plugins/metadataedit/exifcaption.h b/kipi-plugins/metadataedit/exifcaption.h index 5aa52c0..8c231d8 100644 --- a/kipi-plugins/metadataedit/exifcaption.h +++ b/kipi-plugins/metadataedit/exifcaption.h @@ -23,28 +23,29 @@ #ifndef EXIF_CAPTION_H #define EXIF_CAPTION_H -// Qt includes. +// TQt includes. -#include <qwidget.h> -#include <qcstring.h> -#include <qstring.h> +#include <tqwidget.h> +#include <tqcstring.h> +#include <tqstring.h> namespace KIPIMetadataEditPlugin { class EXIFCaptionPriv; -class EXIFCaption : public QWidget +class EXIFCaption : public TQWidget { Q_OBJECT + TQ_OBJECT public: - EXIFCaption(QWidget* parent); + EXIFCaption(TQWidget* tqparent); ~EXIFCaption(); - void applyMetadata(QByteArray& exifData, QByteArray& iptcData); - void readMetadata(QByteArray& exifData); + void applyMetadata(TQByteArray& exifData, TQByteArray& iptcData); + void readMetadata(TQByteArray& exifData); bool syncJFIFCommentIsChecked(); bool syncHOSTCommentIsChecked(); @@ -54,7 +55,7 @@ public: void setCheckedSyncHOSTComment(bool c); void setCheckedSyncIPTCCaption(bool c); - QString getEXIFUserComments(); + TQString getEXIFUserComments(); signals: diff --git a/kipi-plugins/metadataedit/exifdatetime.cpp b/kipi-plugins/metadataedit/exifdatetime.cpp index 7388703..c9d3c94 100644 --- a/kipi-plugins/metadataedit/exifdatetime.cpp +++ b/kipi-plugins/metadataedit/exifdatetime.cpp @@ -22,11 +22,11 @@ // QT includes. -#include <qlayout.h> -#include <qlabel.h> -#include <qwhatsthis.h> -#include <qvalidator.h> -#include <qcheckbox.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqwhatsthis.h> +#include <tqvalidator.h> +#include <tqcheckbox.h> // KDE includes. @@ -73,14 +73,14 @@ public: syncIPTCDateCheck = 0; } - QCheckBox *dateCreatedCheck; - QCheckBox *dateOriginalCheck; - QCheckBox *dateDigitalizedCheck; - QCheckBox *dateCreatedSubSecCheck; - QCheckBox *dateOriginalSubSecCheck; - QCheckBox *dateDigitalizedSubSecCheck; - QCheckBox *syncHOSTDateCheck; - QCheckBox *syncIPTCDateCheck; + TQCheckBox *dateCreatedCheck; + TQCheckBox *dateOriginalCheck; + TQCheckBox *dateDigitalizedCheck; + TQCheckBox *dateCreatedSubSecCheck; + TQCheckBox *dateOriginalSubSecCheck; + TQCheckBox *dateDigitalizedSubSecCheck; + TQCheckBox *syncHOSTDateCheck; + TQCheckBox *syncIPTCDateCheck; KIntSpinBox *dateCreatedSubSecEdit; KIntSpinBox *dateOriginalSubSecEdit; @@ -91,25 +91,25 @@ public: KDateTimeWidget *dateDigitalizedSel; }; -EXIFDateTime::EXIFDateTime(QWidget* parent) - : QWidget(parent) +EXIFDateTime::EXIFDateTime(TQWidget* tqparent) + : TQWidget(tqparent) { d = new EXIFDateTimePriv; - QGridLayout* grid = new QGridLayout(parent, 9, 3, KDialog::spacingHint()); + TQGridLayout* grid = new TQGridLayout(tqparent, 9, 3, KDialog::spacingHint()); // -------------------------------------------------------- - d->dateCreatedCheck = new QCheckBox(i18n("Creation date and time"), parent); - d->dateCreatedSubSecCheck = new QCheckBox(i18n("Creation sub-second"), parent); - d->dateCreatedSel = new KDateTimeWidget(parent); - d->dateCreatedSubSecEdit = new KIntSpinBox(0, 999, 1, 0, 10, parent); - d->dateCreatedSel->setDateTime(QDateTime::currentDateTime()); - d->syncHOSTDateCheck = new QCheckBox(i18n("Sync creation date entered through %1") - .arg(KApplication::kApplication()->aboutData()->appName()), - parent); - d->syncIPTCDateCheck = new QCheckBox(i18n("Sync IPTC creation date"), parent); - KSeparator *line = new KSeparator(Horizontal, parent); + d->dateCreatedCheck = new TQCheckBox(i18n("Creation date and time"), tqparent); + d->dateCreatedSubSecCheck = new TQCheckBox(i18n("Creation sub-second"), tqparent); + d->dateCreatedSel = new KDateTimeWidget(tqparent); + d->dateCreatedSubSecEdit = new KIntSpinBox(0, 999, 1, 0, 10, tqparent); + d->dateCreatedSel->setDateTime(TQDateTime::tqcurrentDateTime()); + d->syncHOSTDateCheck = new TQCheckBox(i18n("Sync creation date entered through %1") + .tqarg(KApplication::kApplication()->aboutData()->appName()), + tqparent); + d->syncIPTCDateCheck = new TQCheckBox(i18n("Sync IPTC creation date"), tqparent); + KSeparator *line = new KSeparator(Qt::Horizontal, tqparent); grid->addMultiCellWidget(d->dateCreatedCheck, 0, 0, 0, 0); grid->addMultiCellWidget(d->dateCreatedSubSecCheck, 0, 0, 1, 2); @@ -119,45 +119,45 @@ EXIFDateTime::EXIFDateTime(QWidget* parent) grid->addMultiCellWidget(d->syncIPTCDateCheck, 3, 3, 0, 3); grid->addMultiCellWidget(line, 4, 4, 0, 3); - QWhatsThis::add(d->dateCreatedSel, i18n("<p>Set here the date and time of image creation. " + TQWhatsThis::add(d->dateCreatedSel, i18n("<p>Set here the date and time of image creation. " "In this standard it is the date and time the file was changed.")); - QWhatsThis::add(d->dateCreatedSubSecEdit, i18n("<p>Set here the fractions of seconds for the date " + TQWhatsThis::add(d->dateCreatedSubSecEdit, i18n("<p>Set here the fractions of seconds for the date " "and time of image creation.")); // -------------------------------------------------------- - d->dateOriginalCheck = new QCheckBox(i18n("Original date and time"), parent); - d->dateOriginalSubSecCheck = new QCheckBox(i18n("Original sub-second"), parent); - d->dateOriginalSel = new KDateTimeWidget(parent); - d->dateOriginalSubSecEdit = new KIntSpinBox(0, 999, 1, 0, 10, parent); - d->dateOriginalSel->setDateTime(QDateTime::currentDateTime()); + d->dateOriginalCheck = new TQCheckBox(i18n("Original date and time"), tqparent); + d->dateOriginalSubSecCheck = new TQCheckBox(i18n("Original sub-second"), tqparent); + d->dateOriginalSel = new KDateTimeWidget(tqparent); + d->dateOriginalSubSecEdit = new KIntSpinBox(0, 999, 1, 0, 10, tqparent); + d->dateOriginalSel->setDateTime(TQDateTime::tqcurrentDateTime()); grid->addMultiCellWidget(d->dateOriginalCheck, 5, 5, 0, 0); grid->addMultiCellWidget(d->dateOriginalSubSecCheck, 5, 5, 1, 2); grid->addMultiCellWidget(d->dateOriginalSel, 6, 6, 0, 0); grid->addMultiCellWidget(d->dateOriginalSubSecEdit, 6, 6, 1, 1); - QWhatsThis::add(d->dateOriginalSel, i18n("<p>Set here the date and time when the original image " + TQWhatsThis::add(d->dateOriginalSel, i18n("<p>Set here the date and time when the original image " "data was generated. For a digital still camera the date and " "time the picture was taken are recorded.")); - QWhatsThis::add(d->dateOriginalSubSecEdit, i18n("<p>Set here the fractions of seconds for the date " + TQWhatsThis::add(d->dateOriginalSubSecEdit, i18n("<p>Set here the fractions of seconds for the date " "and time when the original image data was generated.")); // -------------------------------------------------------- - d->dateDigitalizedCheck = new QCheckBox(i18n("Digitization date and time"), parent); - d->dateDigitalizedSubSecCheck = new QCheckBox(i18n("Digitization sub-second"), parent); - d->dateDigitalizedSel = new KDateTimeWidget(parent); - d->dateDigitalizedSubSecEdit = new KIntSpinBox(0, 999, 1, 0, 10, parent); - d->dateDigitalizedSel->setDateTime(QDateTime::currentDateTime()); + d->dateDigitalizedCheck = new TQCheckBox(i18n("Digitization date and time"), tqparent); + d->dateDigitalizedSubSecCheck = new TQCheckBox(i18n("Digitization sub-second"), tqparent); + d->dateDigitalizedSel = new KDateTimeWidget(tqparent); + d->dateDigitalizedSubSecEdit = new KIntSpinBox(0, 999, 1, 0, 10, tqparent); + d->dateDigitalizedSel->setDateTime(TQDateTime::tqcurrentDateTime()); grid->addMultiCellWidget(d->dateDigitalizedCheck, 7, 7, 0, 0); grid->addMultiCellWidget(d->dateDigitalizedSubSecCheck, 7, 7, 1, 2); grid->addMultiCellWidget(d->dateDigitalizedSel, 8, 8, 0, 0); grid->addMultiCellWidget(d->dateDigitalizedSubSecEdit, 8, 8, 1, 1); - QWhatsThis::add(d->dateDigitalizedSel, i18n("<p>Set here the date and time when the image was " + TQWhatsThis::add(d->dateDigitalizedSel, i18n("<p>Set here the date and time when the image was " "stored as digital data. If, for example, an image was " "captured by a digital still camera and at the same " "time the file was recorded, then Original and Digitization " "date and time will have the same contents.")); - QWhatsThis::add(d->dateDigitalizedSubSecEdit, i18n("<p>Set here the fractions of seconds for the date " + TQWhatsThis::add(d->dateDigitalizedSubSecEdit, i18n("<p>Set here the fractions of seconds for the date " "and time when the image was stored as digital data.")); grid->setColStretch(3, 10); @@ -165,69 +165,69 @@ EXIFDateTime::EXIFDateTime(QWidget* parent) // -------------------------------------------------------- - connect(d->dateCreatedCheck, SIGNAL(toggled(bool)), - d->dateCreatedSel, SLOT(setEnabled(bool))); + connect(d->dateCreatedCheck, TQT_SIGNAL(toggled(bool)), + d->dateCreatedSel, TQT_SLOT(setEnabled(bool))); - connect(d->dateOriginalCheck, SIGNAL(toggled(bool)), - d->dateOriginalSel, SLOT(setEnabled(bool))); + connect(d->dateOriginalCheck, TQT_SIGNAL(toggled(bool)), + d->dateOriginalSel, TQT_SLOT(setEnabled(bool))); - connect(d->dateDigitalizedCheck, SIGNAL(toggled(bool)), - d->dateDigitalizedSel, SLOT(setEnabled(bool))); + connect(d->dateDigitalizedCheck, TQT_SIGNAL(toggled(bool)), + d->dateDigitalizedSel, TQT_SLOT(setEnabled(bool))); - connect(d->dateCreatedSubSecCheck, SIGNAL(toggled(bool)), - d->dateCreatedSubSecEdit, SLOT(setEnabled(bool))); + connect(d->dateCreatedSubSecCheck, TQT_SIGNAL(toggled(bool)), + d->dateCreatedSubSecEdit, TQT_SLOT(setEnabled(bool))); - connect(d->dateOriginalSubSecCheck, SIGNAL(toggled(bool)), - d->dateOriginalSubSecEdit, SLOT(setEnabled(bool))); + connect(d->dateOriginalSubSecCheck, TQT_SIGNAL(toggled(bool)), + d->dateOriginalSubSecEdit, TQT_SLOT(setEnabled(bool))); - connect(d->dateDigitalizedSubSecCheck, SIGNAL(toggled(bool)), - d->dateDigitalizedSubSecEdit, SLOT(setEnabled(bool))); + connect(d->dateDigitalizedSubSecCheck, TQT_SIGNAL(toggled(bool)), + d->dateDigitalizedSubSecEdit, TQT_SLOT(setEnabled(bool))); - connect(d->dateCreatedCheck, SIGNAL(toggled(bool)), - d->syncHOSTDateCheck, SLOT(setEnabled(bool))); + connect(d->dateCreatedCheck, TQT_SIGNAL(toggled(bool)), + d->syncHOSTDateCheck, TQT_SLOT(setEnabled(bool))); - connect(d->dateCreatedCheck, SIGNAL(toggled(bool)), - d->syncIPTCDateCheck, SLOT(setEnabled(bool))); + connect(d->dateCreatedCheck, TQT_SIGNAL(toggled(bool)), + d->syncIPTCDateCheck, TQT_SLOT(setEnabled(bool))); // -------------------------------------------------------- - connect(d->dateCreatedCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->dateCreatedCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->dateOriginalCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->dateOriginalCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->dateDigitalizedCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->dateDigitalizedCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->dateCreatedSubSecCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->dateCreatedSubSecCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->dateOriginalSubSecCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->dateOriginalSubSecCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->dateDigitalizedSubSecCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->dateDigitalizedSubSecCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); // -------------------------------------------------------- - connect(d->dateCreatedSubSecEdit, SIGNAL(valueChanged(int)), - this, SIGNAL(signalModified())); + connect(d->dateCreatedSubSecEdit, TQT_SIGNAL(valueChanged(int)), + this, TQT_SIGNAL(signalModified())); - connect(d->dateOriginalSubSecEdit, SIGNAL(valueChanged(int)), - this, SIGNAL(signalModified())); + connect(d->dateOriginalSubSecEdit, TQT_SIGNAL(valueChanged(int)), + this, TQT_SIGNAL(signalModified())); - connect(d->dateDigitalizedSubSecEdit, SIGNAL(valueChanged(int)), - this, SIGNAL(signalModified())); + connect(d->dateDigitalizedSubSecEdit, TQT_SIGNAL(valueChanged(int)), + this, TQT_SIGNAL(signalModified())); - connect(d->dateCreatedSel, SIGNAL(valueChanged (const QDateTime &)), - this, SIGNAL(signalModified())); + connect(d->dateCreatedSel, TQT_SIGNAL(valueChanged (const TQDateTime &)), + this, TQT_SIGNAL(signalModified())); - connect(d->dateOriginalSel, SIGNAL(valueChanged (const QDateTime &)), - this, SIGNAL(signalModified())); + connect(d->dateOriginalSel, TQT_SIGNAL(valueChanged (const TQDateTime &)), + this, TQT_SIGNAL(signalModified())); - connect(d->dateDigitalizedSel, SIGNAL(valueChanged (const QDateTime &)), - this, SIGNAL(signalModified())); + connect(d->dateDigitalizedSel, TQT_SIGNAL(valueChanged (const TQDateTime &)), + this, TQT_SIGNAL(signalModified())); } EXIFDateTime::~EXIFDateTime() @@ -255,26 +255,26 @@ void EXIFDateTime::setCheckedSyncIPTCDate(bool c) d->syncIPTCDateCheck->setChecked(c); } -QDateTime EXIFDateTime::getEXIFCreationDate() +TQDateTime EXIFDateTime::getEXIFCreationDate() { return d->dateCreatedSel->dateTime(); } -void EXIFDateTime::readMetadata(QByteArray& exifData) +void EXIFDateTime::readMetadata(TQByteArray& exifData) { blockSignals(true); KExiv2Iface::KExiv2 exiv2Iface; exiv2Iface.setExif(exifData); - QDateTime datetime; - QString datetimeStr, data; + TQDateTime datetime; + TQString datetimeStr, data; - d->dateCreatedSel->setDateTime(QDateTime::currentDateTime()); + d->dateCreatedSel->setDateTime(TQDateTime::tqcurrentDateTime()); d->dateCreatedCheck->setChecked(false); datetimeStr = exiv2Iface.getExifTagString("Exif.Image.DateTime", false); if (!datetimeStr.isEmpty()) { - datetime = QDateTime::fromString(datetimeStr, Qt::ISODate); + datetime = TQDateTime::fromString(datetimeStr, Qt::ISODate); if (datetime.isValid()) { d->dateCreatedSel->setDateTime(datetime); @@ -300,12 +300,12 @@ void EXIFDateTime::readMetadata(QByteArray& exifData) } d->dateCreatedSubSecEdit->setEnabled(d->dateCreatedSubSecCheck->isChecked()); - d->dateOriginalSel->setDateTime(QDateTime::currentDateTime()); + d->dateOriginalSel->setDateTime(TQDateTime::tqcurrentDateTime()); d->dateOriginalCheck->setChecked(false); datetimeStr = exiv2Iface.getExifTagString("Exif.Photo.DateTimeOriginal", false); if (!datetimeStr.isEmpty()) { - datetime = QDateTime::fromString(datetimeStr, Qt::ISODate); + datetime = TQDateTime::fromString(datetimeStr, Qt::ISODate); if (datetime.isValid()) { d->dateOriginalSel->setDateTime(datetime); @@ -329,12 +329,12 @@ void EXIFDateTime::readMetadata(QByteArray& exifData) } d->dateOriginalSubSecEdit->setEnabled(d->dateOriginalSubSecCheck->isChecked()); - d->dateDigitalizedSel->setDateTime(QDateTime::currentDateTime()); + d->dateDigitalizedSel->setDateTime(TQDateTime::tqcurrentDateTime()); d->dateDigitalizedCheck->setChecked(false); datetimeStr = exiv2Iface.getExifTagString("Exif.Photo.DateTimeDigitized", false); if (!datetimeStr.isEmpty()) { - datetime = QDateTime::fromString(datetimeStr, Qt::ISODate); + datetime = TQDateTime::fromString(datetimeStr, Qt::ISODate); if (datetime.isValid()) { d->dateDigitalizedSel->setDateTime(datetime); @@ -361,7 +361,7 @@ void EXIFDateTime::readMetadata(QByteArray& exifData) blockSignals(false); } -void EXIFDateTime::applyMetadata(QByteArray& exifData, QByteArray& iptcData) +void EXIFDateTime::applyMetadata(TQByteArray& exifData, TQByteArray& iptcData) { KExiv2Iface::KExiv2 exiv2Iface; exiv2Iface.setExif(exifData); @@ -370,7 +370,7 @@ void EXIFDateTime::applyMetadata(QByteArray& exifData, QByteArray& iptcData) if (d->dateCreatedCheck->isChecked()) { exiv2Iface.setExifTagString("Exif.Image.DateTime", - d->dateCreatedSel->dateTime().toString(QString("yyyy:MM:dd hh:mm:ss")).ascii()); + d->dateCreatedSel->dateTime().toString(TQString("yyyy:MM:dd hh:mm:ss")).ascii()); if (syncIPTCDateIsChecked()) { @@ -385,31 +385,31 @@ void EXIFDateTime::applyMetadata(QByteArray& exifData, QByteArray& iptcData) if (d->dateCreatedSubSecCheck->isChecked()) exiv2Iface.setExifTagString("Exif.Photo.SubSecTime", - QString::number(d->dateCreatedSubSecEdit->value()).ascii()); + TQString::number(d->dateCreatedSubSecEdit->value()).ascii()); else exiv2Iface.removeExifTag("Exif.Photo.SubSecTime"); if (d->dateOriginalCheck->isChecked()) exiv2Iface.setExifTagString("Exif.Photo.DateTimeOriginal", - d->dateOriginalSel->dateTime().toString(QString("yyyy:MM:dd hh:mm:ss")).ascii()); + d->dateOriginalSel->dateTime().toString(TQString("yyyy:MM:dd hh:mm:ss")).ascii()); else exiv2Iface.removeExifTag("Exif.Photo.DateTimeOriginal"); if (d->dateOriginalSubSecCheck->isChecked()) exiv2Iface.setExifTagString("Exif.Photo.SubSecTimeOriginal", - QString::number(d->dateOriginalSubSecEdit->value()).ascii()); + TQString::number(d->dateOriginalSubSecEdit->value()).ascii()); else exiv2Iface.removeExifTag("Exif.Photo.SubSecTimeOriginal"); if (d->dateDigitalizedCheck->isChecked()) exiv2Iface.setExifTagString("Exif.Photo.DateTimeDigitized", - d->dateDigitalizedSel->dateTime().toString(QString("yyyy:MM:dd hh:mm:ss")).ascii()); + d->dateDigitalizedSel->dateTime().toString(TQString("yyyy:MM:dd hh:mm:ss")).ascii()); else exiv2Iface.removeExifTag("Exif.Photo.DateTimeDigitized"); if (d->dateDigitalizedSubSecCheck->isChecked()) exiv2Iface.setExifTagString("Exif.Photo.SubSecTimeDigitized", - QString::number(d->dateDigitalizedSubSecEdit->value()).ascii()); + TQString::number(d->dateDigitalizedSubSecEdit->value()).ascii()); else exiv2Iface.removeExifTag("Exif.Photo.SubSecTimeDigitized"); diff --git a/kipi-plugins/metadataedit/exifdatetime.h b/kipi-plugins/metadataedit/exifdatetime.h index 254b007..6b41fb5 100644 --- a/kipi-plugins/metadataedit/exifdatetime.h +++ b/kipi-plugins/metadataedit/exifdatetime.h @@ -23,28 +23,29 @@ #ifndef EXIF_DATETIME_H #define EXIF_DATETIME_H -// Qt includes. +// TQt includes. -#include <qwidget.h> -#include <qcstring.h> -#include <qdatetime.h> +#include <tqwidget.h> +#include <tqcstring.h> +#include <tqdatetime.h> namespace KIPIMetadataEditPlugin { class EXIFDateTimePriv; -class EXIFDateTime : public QWidget +class EXIFDateTime : public TQWidget { Q_OBJECT + TQ_OBJECT public: - EXIFDateTime(QWidget* parent); + EXIFDateTime(TQWidget* tqparent); ~EXIFDateTime(); - void applyMetadata(QByteArray& exifData, QByteArray& iptcData); - void readMetadata(QByteArray& exifData); + void applyMetadata(TQByteArray& exifData, TQByteArray& iptcData); + void readMetadata(TQByteArray& exifData); bool syncHOSTDateIsChecked(); bool syncIPTCDateIsChecked(); @@ -52,7 +53,7 @@ public: void setCheckedSyncHOSTDate(bool c); void setCheckedSyncIPTCDate(bool c); - QDateTime getEXIFCreationDate(); + TQDateTime getEXIFCreationDate(); signals: diff --git a/kipi-plugins/metadataedit/exifdevice.cpp b/kipi-plugins/metadataedit/exifdevice.cpp index fde3a1b..c5a28bf 100644 --- a/kipi-plugins/metadataedit/exifdevice.cpp +++ b/kipi-plugins/metadataedit/exifdevice.cpp @@ -26,11 +26,11 @@ // QT includes. -#include <qlayout.h> -#include <qlabel.h> -#include <qwhatsthis.h> -#include <qcombobox.h> -#include <qvalidator.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqwhatsthis.h> +#include <tqcombobox.h> +#include <tqvalidator.h> // KDE includes. @@ -86,19 +86,19 @@ public: modelEdit = 0; } - QCheckBox *makeCheck; - QCheckBox *modelCheck; - QCheckBox *exposureTimeCheck; - QCheckBox *exposureBiasCheck; + TQCheckBox *makeCheck; + TQCheckBox *modelCheck; + TQCheckBox *exposureTimeCheck; + TQCheckBox *exposureBiasCheck; - QComboBox *deviceTypeCB; - QComboBox *exposureProgramCB; - QComboBox *exposureModeCB; - QComboBox *ISOSpeedCB; - QComboBox *meteringModeCB; - QComboBox *sensingMethodCB; - QComboBox *sceneTypeCB; - QComboBox *subjectDistanceTypeCB; + TQComboBox *deviceTypeCB; + TQComboBox *exposureProgramCB; + TQComboBox *exposureModeCB; + TQComboBox *ISOSpeedCB; + TQComboBox *meteringModeCB; + TQComboBox *sensingMethodCB; + TQComboBox *sceneTypeCB; + TQComboBox *subjectDistanceTypeCB; KLineEdit *makeEdit; KLineEdit *modelEdit; @@ -118,76 +118,76 @@ public: MetadataCheckBox *subjectDistanceTypeCheck; }; -EXIFDevice::EXIFDevice(QWidget* parent) - : QWidget(parent) +EXIFDevice::EXIFDevice(TQWidget* tqparent) + : TQWidget(tqparent) { d = new EXIFDevicePriv; - QGridLayout* grid = new QGridLayout(parent, 16, 5, KDialog::spacingHint()); + TQGridLayout* grid = new TQGridLayout(tqparent, 16, 5, KDialog::spacingHint()); // EXIF only accept printable Ascii char. - QRegExp asciiRx("[\x20-\x7F]+$"); - QValidator *asciiValidator = new QRegExpValidator(asciiRx, this); + TQRegExp asciiRx("[\x20-\x7F]+$"); + TQValidator *asciiValidator = new TQRegExpValidator(asciiRx, TQT_TQOBJECT(this)); // -------------------------------------------------------- - d->makeCheck = new QCheckBox(i18n("Device manufacturer (*):"), parent); - d->makeEdit = new KLineEdit(parent); + d->makeCheck = new TQCheckBox(i18n("Device manufacturer (*):"), tqparent); + d->makeEdit = new KLineEdit(tqparent); d->makeEdit->setValidator(asciiValidator); grid->addMultiCellWidget(d->makeCheck, 0, 0, 0, 0); grid->addMultiCellWidget(d->makeEdit, 0, 0, 2, 5); - QWhatsThis::add(d->makeEdit, i18n("<p>Set here the manufacturer of image input equipment used to " + TQWhatsThis::add(d->makeEdit, i18n("<p>Set here the manufacturer of image input equipment used to " "take the picture. This field is limited to ASCII characters.")); // -------------------------------------------------------- - d->modelCheck = new QCheckBox(i18n("Device model (*):"), parent); - d->modelEdit = new KLineEdit(parent); + d->modelCheck = new TQCheckBox(i18n("Device model (*):"), tqparent); + d->modelEdit = new KLineEdit(tqparent); d->modelEdit->setValidator(asciiValidator); grid->addMultiCellWidget(d->modelCheck, 1, 1, 0, 0); grid->addMultiCellWidget(d->modelEdit, 1, 1, 2, 5); - QWhatsThis::add(d->modelEdit, i18n("<p>Set here the model of image input equipment used to " + TQWhatsThis::add(d->modelEdit, i18n("<p>Set here the model of image input equipment used to " "take the picture. This field is limited to ASCII characters.")); // -------------------------------------------------------- - d->deviceTypeCheck = new MetadataCheckBox(i18n("Device type:"), parent); - d->deviceTypeCB = new QComboBox(false, parent); + d->deviceTypeCheck = new MetadataCheckBox(i18n("Device type:"), tqparent); + d->deviceTypeCB = new TQComboBox(false, tqparent); d->deviceTypeCB->insertItem(i18n("Film scanner"), 0); d->deviceTypeCB->insertItem(i18n("Reflection print scanner"), 1); d->deviceTypeCB->insertItem(i18n("Digital still camera"), 2); grid->addMultiCellWidget(d->deviceTypeCheck, 2, 2, 0, 0); grid->addMultiCellWidget(d->deviceTypeCB, 2, 2, 2, 5); - QWhatsThis::add(d->deviceTypeCB, i18n("<p>Select here the image input equipment type used to " + TQWhatsThis::add(d->deviceTypeCB, i18n("<p>Select here the image input equipment type used to " "take the picture.")); KActiveLabel *warning = new KActiveLabel(i18n("<b>Warning: EXIF <b><a href=" "'http://en.wikipedia.org/wiki/Exchangeable_image_file_format#MakerNote_Information'>" "Makernotes</a></b> can be unreadable if you set " - "wrong device manufacturer/model description.</b>"), parent); + "wrong device manufacturer/model description.</b>"), tqparent); - KSeparator *line = new KSeparator(Horizontal, parent); + KSeparator *line = new KSeparator(Qt::Horizontal, tqparent); grid->addMultiCellWidget(warning, 3, 3, 0, 5); grid->addMultiCellWidget(line, 4, 4, 0, 5); // -------------------------------------------------------- - d->exposureTimeCheck = new QCheckBox(i18n("Exposure time (seconds):"), parent); - d->exposureTimeNumEdit = new KIntSpinBox(1, 100000, 1, 1, 10, parent); - d->exposureTimeDenEdit = new KIntSpinBox(1, 100000, 1, 1, 10, parent); - QLabel *exposureLabel = new QLabel("/", parent); - exposureLabel->setAlignment (Qt::AlignRight|Qt::AlignVCenter); + d->exposureTimeCheck = new TQCheckBox(i18n("Exposure time (seconds):"), tqparent); + d->exposureTimeNumEdit = new KIntSpinBox(1, 100000, 1, 1, 10, tqparent); + d->exposureTimeDenEdit = new KIntSpinBox(1, 100000, 1, 1, 10, tqparent); + TQLabel *exposureLabel = new TQLabel("/", tqparent); + exposureLabel->tqsetAlignment (TQt::AlignRight|TQt::AlignVCenter); grid->addMultiCellWidget(d->exposureTimeCheck, 5, 5, 0, 0); grid->addMultiCellWidget(d->exposureTimeNumEdit, 5, 5, 2, 2); grid->addMultiCellWidget(exposureLabel, 5, 5, 3, 3); grid->addMultiCellWidget(d->exposureTimeDenEdit, 5, 5, 4, 4); - QWhatsThis::add(d->exposureTimeCheck, i18n("<p>Set on this option to set the exposure time " + TQWhatsThis::add(d->exposureTimeCheck, i18n("<p>Set on this option to set the exposure time " "of picture, given in seconds.")); // -------------------------------------------------------- - d->exposureProgramCheck = new MetadataCheckBox(i18n("Exposure program:"), parent); - d->exposureProgramCB = new QComboBox(false, parent); + d->exposureProgramCheck = new MetadataCheckBox(i18n("Exposure program:"), tqparent); + d->exposureProgramCB = new TQComboBox(false, tqparent); d->exposureProgramCB->insertItem(i18n("Not defined"), 0); d->exposureProgramCB->insertItem(i18n("Manual"), 1); d->exposureProgramCB->insertItem(i18n("Auto"), 2); @@ -199,19 +199,19 @@ EXIFDevice::EXIFDevice(QWidget* parent) d->exposureProgramCB->insertItem(i18n("Landscape mode"), 8); grid->addMultiCellWidget(d->exposureProgramCheck, 6, 6, 0, 0); grid->addMultiCellWidget(d->exposureProgramCB, 6, 6, 2, 5); - QWhatsThis::add(d->exposureProgramCB, i18n("<p>Select here the program used by the camera " + TQWhatsThis::add(d->exposureProgramCB, i18n("<p>Select here the program used by the camera " "to set exposure when the picture have been taken.")); // -------------------------------------------------------- - d->exposureModeCheck = new MetadataCheckBox(i18n("Exposure mode:"), parent); - d->exposureModeCB = new QComboBox(false, parent); + d->exposureModeCheck = new MetadataCheckBox(i18n("Exposure mode:"), tqparent); + d->exposureModeCB = new TQComboBox(false, tqparent); d->exposureModeCB->insertItem(i18n("Auto"), 0); d->exposureModeCB->insertItem(i18n("Manual"), 1); d->exposureModeCB->insertItem(i18n("Auto bracket"), 2); grid->addMultiCellWidget(d->exposureModeCheck, 7, 7, 0, 0); grid->addMultiCellWidget(d->exposureModeCB, 7, 7, 2, 5); - QWhatsThis::add(d->exposureModeCB, i18n("<p>Select here the mode used by the camera " + TQWhatsThis::add(d->exposureModeCB, i18n("<p>Select here the mode used by the camera " "to set exposure when the picture have been shot. " "In auto-bracketing mode, the camera shoots a " "series of frames of the same scene at different " @@ -219,20 +219,20 @@ EXIFDevice::EXIFDevice(QWidget* parent) // -------------------------------------------------------- - d->exposureBiasCheck = new QCheckBox(i18n("Exposure bias (APEX):"), parent); - d->exposureBiasEdit = new KDoubleSpinBox(-99.99, 99.99, 0.1, 0.0, 2, parent); + d->exposureBiasCheck = new TQCheckBox(i18n("Exposure bias (APEX):"), tqparent); + d->exposureBiasEdit = new KDoubleSpinBox(-99.99, 99.99, 0.1, 0.0, 2, tqparent); grid->addMultiCellWidget(d->exposureBiasCheck, 8, 8, 0, 0); grid->addMultiCellWidget(d->exposureBiasEdit, 8, 8, 2, 2); - QWhatsThis::add(d->exposureBiasEdit, i18n("<p>Set here the exposure bias value in APEX unit " + TQWhatsThis::add(d->exposureBiasEdit, i18n("<p>Set here the exposure bias value in APEX unit " "used by camera to take the picture.")); - KSeparator *line2 = new KSeparator(Horizontal, parent); + KSeparator *line2 = new KSeparator(Qt::Horizontal, tqparent); grid->addMultiCellWidget(line2, 9, 9, 0, 5); // -------------------------------------------------------- - d->meteringModeCheck = new MetadataCheckBox(i18n("Metering mode:"), parent); - d->meteringModeCB = new QComboBox(false, parent); + d->meteringModeCheck = new MetadataCheckBox(i18n("Metering mode:"), tqparent); + d->meteringModeCB = new TQComboBox(false, tqparent); d->meteringModeCB->insertItem(i18n("Unknown"), 0); d->meteringModeCB->insertItem(i18n("Average"), 1); d->meteringModeCB->insertItem(i18n("Center weighted average"), 2); @@ -243,13 +243,13 @@ EXIFDevice::EXIFDevice(QWidget* parent) d->meteringModeCB->insertItem(i18n("Other"), 7); grid->addMultiCellWidget(d->meteringModeCheck, 10, 10, 0, 0); grid->addMultiCellWidget(d->meteringModeCB, 10, 10, 2, 5); - QWhatsThis::add(d->meteringModeCB, i18n("<p>Select here the metering mode used by the camera " + TQWhatsThis::add(d->meteringModeCB, i18n("<p>Select here the metering mode used by the camera " "to set exposure when the picture have been shot.")); // -------------------------------------------------------- - d->ISOSpeedCheck = new MetadataCheckBox(i18n("Sensitivity (ISO):"), parent); - d->ISOSpeedCB = new QComboBox(false, parent); + d->ISOSpeedCheck = new MetadataCheckBox(i18n("Sensitivity (ISO):"), tqparent); + d->ISOSpeedCB = new TQComboBox(false, tqparent); d->ISOSpeedCB->insertItem("10", 0); d->ISOSpeedCB->insertItem("12", 1); d->ISOSpeedCB->insertItem("16", 2); @@ -288,13 +288,13 @@ EXIFDevice::EXIFDevice(QWidget* parent) d->ISOSpeedCB->insertItem("32000", 35); grid->addMultiCellWidget(d->ISOSpeedCheck, 11, 11, 0, 0); grid->addMultiCellWidget(d->ISOSpeedCB, 11, 11, 2, 5); - QWhatsThis::add(d->ISOSpeedCB, i18n("<p>Select here the ISO Speed of the camera " + TQWhatsThis::add(d->ISOSpeedCB, i18n("<p>Select here the ISO Speed of the camera " "witch have taken the picture.")); // -------------------------------------------------------- - d->sensingMethodCheck = new MetadataCheckBox(i18n("Sensing method:"), parent); - d->sensingMethodCB = new QComboBox(false, parent); + d->sensingMethodCheck = new MetadataCheckBox(i18n("Sensing method:"), tqparent); + d->sensingMethodCB = new TQComboBox(false, tqparent); d->sensingMethodCB->insertItem(i18n("Not defined"), 0); d->sensingMethodCB->insertItem(i18n("One-chip color area"), 1); d->sensingMethodCB->insertItem(i18n("Two-chip color area"), 2); @@ -304,33 +304,33 @@ EXIFDevice::EXIFDevice(QWidget* parent) d->sensingMethodCB->insertItem(i18n("Color sequential linear"), 6); grid->addMultiCellWidget(d->sensingMethodCheck, 12, 12, 0, 0); grid->addMultiCellWidget(d->sensingMethodCB, 12, 12, 2, 5); - QWhatsThis::add(d->sensingMethodCB, i18n("<p>Select here the image sensor type used by the camera " + TQWhatsThis::add(d->sensingMethodCB, i18n("<p>Select here the image sensor type used by the camera " "to take the picture.")); // -------------------------------------------------------- - d->sceneTypeCheck = new MetadataCheckBox(i18n("Scene capture type:"), parent); - d->sceneTypeCB = new QComboBox(false, parent); + d->sceneTypeCheck = new MetadataCheckBox(i18n("Scene capture type:"), tqparent); + d->sceneTypeCB = new TQComboBox(false, tqparent); d->sceneTypeCB->insertItem(i18n("Standard"), 0); d->sceneTypeCB->insertItem(i18n("Landscape"), 1); d->sceneTypeCB->insertItem(i18n("Portrait"), 2); d->sceneTypeCB->insertItem(i18n("Night scene"), 3); grid->addMultiCellWidget(d->sceneTypeCheck, 13, 13, 0, 0); grid->addMultiCellWidget(d->sceneTypeCB, 13, 13, 2, 5); - QWhatsThis::add(d->sceneTypeCB, i18n("<p>Select here the type of scene used by the camera " + TQWhatsThis::add(d->sceneTypeCB, i18n("<p>Select here the type of scene used by the camera " "to take the picture.")); // -------------------------------------------------------- - d->subjectDistanceTypeCheck = new MetadataCheckBox(i18n("Subject distance type:"), parent); - d->subjectDistanceTypeCB = new QComboBox(false, parent); + d->subjectDistanceTypeCheck = new MetadataCheckBox(i18n("Subject distance type:"), tqparent); + d->subjectDistanceTypeCB = new TQComboBox(false, tqparent); d->subjectDistanceTypeCB->insertItem(i18n("Unknow"), 0); d->subjectDistanceTypeCB->insertItem(i18n("Macro"), 1); d->subjectDistanceTypeCB->insertItem(i18n("Close view"), 2); d->subjectDistanceTypeCB->insertItem(i18n("Distant view"), 3); grid->addMultiCellWidget(d->subjectDistanceTypeCheck, 14, 14, 0, 0); grid->addMultiCellWidget(d->subjectDistanceTypeCB, 14, 14, 2, 5); - QWhatsThis::add(d->subjectDistanceTypeCB, i18n("<p>Select here the type of distance between " + TQWhatsThis::add(d->subjectDistanceTypeCB, i18n("<p>Select here the type of distance between " "the subject and the image input equipment.")); // -------------------------------------------------------- @@ -339,7 +339,7 @@ EXIFDevice::EXIFDevice(QWidget* parent) "<b><a href='http://en.wikipedia.org/wiki/EXIF'>EXIF</a></b> " "text tags marked by (*) only support printable " "<b><a href='http://en.wikipedia.org/wiki/Ascii'>ASCII</a></b> " - "characters set.</b>"), parent); + "characters set.</b>"), tqparent); grid->addMultiCellWidget(note, 15, 15, 0, 5); grid->setColStretch(1, 10); @@ -348,123 +348,123 @@ EXIFDevice::EXIFDevice(QWidget* parent) // -------------------------------------------------------- - connect(d->makeCheck, SIGNAL(toggled(bool)), - d->makeEdit, SLOT(setEnabled(bool))); + connect(d->makeCheck, TQT_SIGNAL(toggled(bool)), + d->makeEdit, TQT_SLOT(setEnabled(bool))); - connect(d->modelCheck, SIGNAL(toggled(bool)), - d->modelEdit, SLOT(setEnabled(bool))); + connect(d->modelCheck, TQT_SIGNAL(toggled(bool)), + d->modelEdit, TQT_SLOT(setEnabled(bool))); - connect(d->deviceTypeCheck, SIGNAL(toggled(bool)), - d->deviceTypeCB, SLOT(setEnabled(bool))); + connect(d->deviceTypeCheck, TQT_SIGNAL(toggled(bool)), + d->deviceTypeCB, TQT_SLOT(setEnabled(bool))); - connect(d->exposureTimeCheck, SIGNAL(toggled(bool)), - d->exposureTimeNumEdit, SLOT(setEnabled(bool))); + connect(d->exposureTimeCheck, TQT_SIGNAL(toggled(bool)), + d->exposureTimeNumEdit, TQT_SLOT(setEnabled(bool))); - connect(d->exposureTimeCheck, SIGNAL(toggled(bool)), - d->exposureTimeDenEdit, SLOT(setEnabled(bool))); + connect(d->exposureTimeCheck, TQT_SIGNAL(toggled(bool)), + d->exposureTimeDenEdit, TQT_SLOT(setEnabled(bool))); - connect(d->exposureProgramCheck, SIGNAL(toggled(bool)), - d->exposureProgramCB, SLOT(setEnabled(bool))); + connect(d->exposureProgramCheck, TQT_SIGNAL(toggled(bool)), + d->exposureProgramCB, TQT_SLOT(setEnabled(bool))); - connect(d->exposureModeCheck, SIGNAL(toggled(bool)), - d->exposureModeCB, SLOT(setEnabled(bool))); + connect(d->exposureModeCheck, TQT_SIGNAL(toggled(bool)), + d->exposureModeCB, TQT_SLOT(setEnabled(bool))); - connect(d->exposureBiasCheck, SIGNAL(toggled(bool)), - d->exposureBiasEdit, SLOT(setEnabled(bool))); + connect(d->exposureBiasCheck, TQT_SIGNAL(toggled(bool)), + d->exposureBiasEdit, TQT_SLOT(setEnabled(bool))); - connect(d->meteringModeCheck, SIGNAL(toggled(bool)), - d->meteringModeCB, SLOT(setEnabled(bool))); + connect(d->meteringModeCheck, TQT_SIGNAL(toggled(bool)), + d->meteringModeCB, TQT_SLOT(setEnabled(bool))); - connect(d->ISOSpeedCheck, SIGNAL(toggled(bool)), - d->ISOSpeedCB, SLOT(setEnabled(bool))); + connect(d->ISOSpeedCheck, TQT_SIGNAL(toggled(bool)), + d->ISOSpeedCB, TQT_SLOT(setEnabled(bool))); - connect(d->sensingMethodCheck, SIGNAL(toggled(bool)), - d->sensingMethodCB, SLOT(setEnabled(bool))); + connect(d->sensingMethodCheck, TQT_SIGNAL(toggled(bool)), + d->sensingMethodCB, TQT_SLOT(setEnabled(bool))); - connect(d->sceneTypeCheck, SIGNAL(toggled(bool)), - d->sceneTypeCB, SLOT(setEnabled(bool))); + connect(d->sceneTypeCheck, TQT_SIGNAL(toggled(bool)), + d->sceneTypeCB, TQT_SLOT(setEnabled(bool))); - connect(d->subjectDistanceTypeCheck, SIGNAL(toggled(bool)), - d->subjectDistanceTypeCB, SLOT(setEnabled(bool))); + connect(d->subjectDistanceTypeCheck, TQT_SIGNAL(toggled(bool)), + d->subjectDistanceTypeCB, TQT_SLOT(setEnabled(bool))); // -------------------------------------------------------- - connect(d->makeCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->makeCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->modelCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->modelCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->exposureTimeCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->exposureTimeCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->exposureBiasCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->exposureBiasCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->deviceTypeCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->deviceTypeCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->exposureProgramCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->exposureProgramCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->exposureModeCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->exposureModeCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->meteringModeCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->meteringModeCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->ISOSpeedCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->ISOSpeedCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->sensingMethodCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->sensingMethodCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->sceneTypeCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->sceneTypeCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->subjectDistanceTypeCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->subjectDistanceTypeCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); // -------------------------------------------------------- - connect(d->deviceTypeCB, SIGNAL(activated(int)), - this, SIGNAL(signalModified())); + connect(d->deviceTypeCB, TQT_SIGNAL(activated(int)), + this, TQT_SIGNAL(signalModified())); - connect(d->exposureProgramCB, SIGNAL(activated(int)), - this, SIGNAL(signalModified())); + connect(d->exposureProgramCB, TQT_SIGNAL(activated(int)), + this, TQT_SIGNAL(signalModified())); - connect(d->exposureModeCB, SIGNAL(activated(int)), - this, SIGNAL(signalModified())); + connect(d->exposureModeCB, TQT_SIGNAL(activated(int)), + this, TQT_SIGNAL(signalModified())); - connect(d->ISOSpeedCB, SIGNAL(activated(int)), - this, SIGNAL(signalModified())); + connect(d->ISOSpeedCB, TQT_SIGNAL(activated(int)), + this, TQT_SIGNAL(signalModified())); - connect(d->meteringModeCB, SIGNAL(activated(int)), - this, SIGNAL(signalModified())); + connect(d->meteringModeCB, TQT_SIGNAL(activated(int)), + this, TQT_SIGNAL(signalModified())); - connect(d->sensingMethodCB, SIGNAL(activated(int)), - this, SIGNAL(signalModified())); + connect(d->sensingMethodCB, TQT_SIGNAL(activated(int)), + this, TQT_SIGNAL(signalModified())); - connect(d->sceneTypeCB, SIGNAL(activated(int)), - this, SIGNAL(signalModified())); + connect(d->sceneTypeCB, TQT_SIGNAL(activated(int)), + this, TQT_SIGNAL(signalModified())); - connect(d->subjectDistanceTypeCB, SIGNAL(activated(int)), - this, SIGNAL(signalModified())); + connect(d->subjectDistanceTypeCB, TQT_SIGNAL(activated(int)), + this, TQT_SIGNAL(signalModified())); - connect(d->makeEdit, SIGNAL(textChanged(const QString &)), - this, SIGNAL(signalModified())); + connect(d->makeEdit, TQT_SIGNAL(textChanged(const TQString &)), + this, TQT_SIGNAL(signalModified())); - connect(d->modelEdit, SIGNAL(textChanged(const QString &)), - this, SIGNAL(signalModified())); + connect(d->modelEdit, TQT_SIGNAL(textChanged(const TQString &)), + this, TQT_SIGNAL(signalModified())); - connect(d->exposureTimeNumEdit, SIGNAL(valueChanged(int)), - this, SIGNAL(signalModified())); + connect(d->exposureTimeNumEdit, TQT_SIGNAL(valueChanged(int)), + this, TQT_SIGNAL(signalModified())); - connect(d->exposureTimeDenEdit, SIGNAL(valueChanged(int)), - this, SIGNAL(signalModified())); + connect(d->exposureTimeDenEdit, TQT_SIGNAL(valueChanged(int)), + this, TQT_SIGNAL(signalModified())); - connect(d->exposureBiasEdit, SIGNAL(valueChanged(double)), - this, SIGNAL(signalModified())); + connect(d->exposureBiasEdit, TQT_SIGNAL(valueChanged(double)), + this, TQT_SIGNAL(signalModified())); } EXIFDevice::~EXIFDevice() @@ -472,14 +472,14 @@ EXIFDevice::~EXIFDevice() delete d; } -void EXIFDevice::readMetadata(QByteArray& exifData) +void EXIFDevice::readMetadata(TQByteArray& exifData) { blockSignals(true); KExiv2Iface::KExiv2 exiv2Iface; exiv2Iface.setExif(exifData); long int num=1, den=1; long val=0; - QString data; + TQString data; d->makeEdit->clear(); d->makeCheck->setChecked(false); @@ -596,7 +596,7 @@ void EXIFDevice::readMetadata(QByteArray& exifData) { int item = -1; for (int i = 0 ; i < d->ISOSpeedCB->count() ; i++) - if (d->ISOSpeedCB->text(i) == QString::number(val)) + if (d->ISOSpeedCB->text(i) == TQString::number(val)) item = i; if (item != -1) @@ -612,7 +612,7 @@ void EXIFDevice::readMetadata(QByteArray& exifData) val = num / den; int item = -1; for (int i = 0 ; i < d->ISOSpeedCB->count() ; i++) - if (d->ISOSpeedCB->text(i) == QString::number(val)) + if (d->ISOSpeedCB->text(i) == TQString::number(val)) item = i; if (item != -1) @@ -670,7 +670,7 @@ void EXIFDevice::readMetadata(QByteArray& exifData) blockSignals(false); } -void EXIFDevice::applyMetadata(QByteArray& exifData) +void EXIFDevice::applyMetadata(TQByteArray& exifData) { KExiv2Iface::KExiv2 exiv2Iface; exiv2Iface.setExif(exifData); diff --git a/kipi-plugins/metadataedit/exifdevice.h b/kipi-plugins/metadataedit/exifdevice.h index 0e8b204..1d95cb4 100644 --- a/kipi-plugins/metadataedit/exifdevice.h +++ b/kipi-plugins/metadataedit/exifdevice.h @@ -23,27 +23,28 @@ #ifndef EXIF_DEVICE_H #define EXIF_DEVICE_H -// Qt includes. +// TQt includes. -#include <qwidget.h> -#include <qcstring.h> +#include <tqwidget.h> +#include <tqcstring.h> namespace KIPIMetadataEditPlugin { class EXIFDevicePriv; -class EXIFDevice : public QWidget +class EXIFDevice : public TQWidget { Q_OBJECT + TQ_OBJECT public: - EXIFDevice(QWidget* parent); + EXIFDevice(TQWidget* tqparent); ~EXIFDevice(); - void applyMetadata(QByteArray& exifData); - void readMetadata(QByteArray& exifData); + void applyMetadata(TQByteArray& exifData); + void readMetadata(TQByteArray& exifData); signals: diff --git a/kipi-plugins/metadataedit/exifeditdialog.cpp b/kipi-plugins/metadataedit/exifeditdialog.cpp index 9a86113..e802a3d 100644 --- a/kipi-plugins/metadataedit/exifeditdialog.cpp +++ b/kipi-plugins/metadataedit/exifeditdialog.cpp @@ -20,12 +20,12 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qtimer.h> -#include <qframe.h> -#include <qlayout.h> -#include <qpushbutton.h> +#include <tqtimer.h> +#include <tqframe.h> +#include <tqlayout.h> +#include <tqpushbutton.h> // KDE includes. @@ -94,15 +94,15 @@ public: bool modified; bool isReadOnly; - QByteArray exifData; - QByteArray iptcData; + TQByteArray exifData; + TQByteArray iptcData; - QFrame *page_caption; - QFrame *page_datetime; - QFrame *page_lens; - QFrame *page_device; - QFrame *page_light; - QFrame *page_adjust; + TQFrame *page_caption; + TQFrame *page_datetime; + TQFrame *page_lens; + TQFrame *page_device; + TQFrame *page_light; + TQFrame *page_adjust; KURL::List urls; @@ -120,11 +120,11 @@ public: KIPIPlugins::KPAboutData *about; }; -EXIFEditDialog::EXIFEditDialog(QWidget* parent, KURL::List urls, KIPI::Interface *iface) - : KDialogBase(IconList, QString::null, +EXIFEditDialog::EXIFEditDialog(TQWidget* tqparent, KURL::List urls, KIPI::Interface *iface) + : KDialogBase(IconList, TQString(), urls.count() > 1 ? Help|User1|User2|Stretch|Ok|Apply|Close : Help|Stretch|Ok|Apply|Close, - Ok, parent, 0, true, true, + Ok, tqparent, 0, true, true, KStdGuiItem::guiItem(KStdGuiItem::Forward), KStdGuiItem::guiItem(KStdGuiItem::Back) ) { @@ -174,28 +174,28 @@ EXIFEditDialog::EXIFEditDialog(QWidget* parent, KURL::List urls, KIPI::Interface KHelpMenu* helpMenu = new KHelpMenu(this, d->about, false); helpMenu->menu()->removeItemAt(0); helpMenu->menu()->insertItem(i18n("Plugin Handbook"), - this, SLOT(slotHelp()), 0, -1, 0); + this, TQT_SLOT(slotHelp()), 0, -1, 0); actionButton(Help)->setPopup( helpMenu->menu() ); // ------------------------------------------------------------ - connect(d->captionPage, SIGNAL(signalModified()), - this, SLOT(slotModified())); + connect(d->captionPage, TQT_SIGNAL(signalModified()), + this, TQT_SLOT(slotModified())); - connect(d->datetimePage, SIGNAL(signalModified()), - this, SLOT(slotModified())); + connect(d->datetimePage, TQT_SIGNAL(signalModified()), + this, TQT_SLOT(slotModified())); - connect(d->lensPage, SIGNAL(signalModified()), - this, SLOT(slotModified())); + connect(d->lensPage, TQT_SIGNAL(signalModified()), + this, TQT_SLOT(slotModified())); - connect(d->devicePage, SIGNAL(signalModified()), - this, SLOT(slotModified())); + connect(d->devicePage, TQT_SIGNAL(signalModified()), + this, TQT_SLOT(slotModified())); - connect(d->lightPage, SIGNAL(signalModified()), - this, SLOT(slotModified())); + connect(d->lightPage, TQT_SIGNAL(signalModified()), + this, TQT_SLOT(slotModified())); - connect(d->adjustPage, SIGNAL(signalModified()), - this, SLOT(slotModified())); + connect(d->adjustPage, TQT_SIGNAL(signalModified()), + this, TQT_SLOT(slotModified())); // ------------------------------------------------------------ @@ -214,7 +214,7 @@ void EXIFEditDialog::slotHelp() KApplication::kApplication()->invokeHelp("metadataedit", "kipi-plugins"); } -void EXIFEditDialog::closeEvent(QCloseEvent *e) +void EXIFEditDialog::closeEvent(TQCloseEvent *e) { if (!e) return; saveSettings(); @@ -237,7 +237,7 @@ void EXIFEditDialog::readSettings() d->captionPage->setCheckedSyncIPTCCaption(config.readBoolEntry("Sync IPTC Caption", true)); d->datetimePage->setCheckedSyncHOSTDate(config.readBoolEntry("Sync Host Date", true)); d->datetimePage->setCheckedSyncIPTCDate(config.readBoolEntry("Sync IPTC Date", true)); - resize(configDialogSize(config, QString("EXIF Edit Dialog"))); + resize(configDialogSize(config, TQString("EXIF Edit Dialog"))); } void EXIFEditDialog::saveSettings() @@ -250,7 +250,7 @@ void EXIFEditDialog::saveSettings() config.writeEntry("Sync IPTC Caption", d->captionPage->syncIPTCCaptionIsChecked()); config.writeEntry("Sync Host Date", d->datetimePage->syncHOSTDateIsChecked()); config.writeEntry("Sync IPTC Date", d->datetimePage->syncIPTCDateIsChecked()); - saveDialogSize(config, QString("EXIF Edit Dialog")); + saveDialogSize(config, TQString("EXIF Edit Dialog")); config.sync(); } @@ -276,12 +276,12 @@ void EXIFEditDialog::slotItemChanged() d->page_adjust->setEnabled(!d->isReadOnly); enableButton(Apply, !d->isReadOnly); - setCaption(QString("%1 (%2/%3) - %4") - .arg((*d->currItem).filename()) - .arg(d->urls.findIndex(*(d->currItem))+1) - .arg(d->urls.count()) - .arg(i18n("Edit EXIF Metadata")) + - (d->isReadOnly ? QString(" - ") + i18n("(read only)") : QString::null)); + setCaption(TQString("%1 (%2/%3) - %4") + .tqarg((*d->currItem).filename()) + .tqarg(d->urls.tqfindIndex(*(d->currItem))+1) + .tqarg(d->urls.count()) + .tqarg(i18n("Edit EXIF Metadata")) + + (d->isReadOnly ? TQString(" - ") + i18n("(read only)") : TQString())); enableButton(User1, *(d->currItem) != d->urls.last()); enableButton(User2, *(d->currItem) != d->urls.first()); enableButton(Apply, false); @@ -348,14 +348,14 @@ void EXIFEditDialog::slotOk() accept(); } -bool EXIFEditDialog::eventFilter(QObject *, QEvent *e) +bool EXIFEditDialog::eventFilter(TQObject *, TQEvent *e) { - if ( e->type() == QEvent::KeyPress ) + if ( e->type() == TQEvent::KeyPress ) { - QKeyEvent *k = (QKeyEvent *)e; + TQKeyEvent *k = (TQKeyEvent *)e; - if (k->state() == Qt::ControlButton && - (k->key() == Qt::Key_Enter || k->key() == Qt::Key_Return)) + if (k->state() == TQt::ControlButton && + (k->key() == TQt::Key_Enter || k->key() == TQt::Key_Return)) { slotApply(); @@ -364,8 +364,8 @@ bool EXIFEditDialog::eventFilter(QObject *, QEvent *e) return true; } - else if (k->state() == Qt::ShiftButton && - (k->key() == Qt::Key_Enter || k->key() == Qt::Key_Return)) + else if (k->state() == TQt::ShiftButton && + (k->key() == TQt::Key_Enter || k->key() == TQt::Key_Return)) { slotApply(); diff --git a/kipi-plugins/metadataedit/exifeditdialog.h b/kipi-plugins/metadataedit/exifeditdialog.h index f325a6e..3fc0bb7 100644 --- a/kipi-plugins/metadataedit/exifeditdialog.h +++ b/kipi-plugins/metadataedit/exifeditdialog.h @@ -23,9 +23,9 @@ #ifndef EXIFEDITDIALOG_H #define EXIFEDITDIALOG_H -// Qt includes. +// TQt includes. -#include <qcstring.h> +#include <tqcstring.h> // KDE includes. @@ -45,10 +45,11 @@ class EXIFEditDialogDialogPrivate; class EXIFEditDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - EXIFEditDialog(QWidget* parent, KURL::List urls, KIPI::Interface *iface); + EXIFEditDialog(TQWidget* tqparent, KURL::List urls, KIPI::Interface *iface); ~EXIFEditDialog(); public slots: @@ -63,8 +64,8 @@ protected slots: protected: - void closeEvent(QCloseEvent *); - bool eventFilter(QObject *, QEvent *); + void closeEvent(TQCloseEvent *); + bool eventFilter(TQObject *, TQEvent *); private slots: diff --git a/kipi-plugins/metadataedit/exiflens.cpp b/kipi-plugins/metadataedit/exiflens.cpp index ecd6a82..4f75217 100644 --- a/kipi-plugins/metadataedit/exiflens.cpp +++ b/kipi-plugins/metadataedit/exiflens.cpp @@ -26,10 +26,10 @@ // QT includes. -#include <qlayout.h> -#include <qlabel.h> -#include <qwhatsthis.h> -#include <qcombobox.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqwhatsthis.h> +#include <tqcombobox.h> // KDE includes. @@ -127,14 +127,14 @@ public: apertureValues.append("f/91.0"); } - QStringList apertureValues; + TQStringList apertureValues; - QCheckBox *focalLength35mmCheck; - QCheckBox *focalLengthCheck; - QCheckBox *digitalZoomRatioCheck; + TQCheckBox *focalLength35mmCheck; + TQCheckBox *focalLengthCheck; + TQCheckBox *digitalZoomRatioCheck; - QComboBox *apertureCB; - QComboBox *maxApertureCB; + TQComboBox *apertureCB; + TQComboBox *maxApertureCB; KIntSpinBox *focalLength35mmEdit; @@ -145,59 +145,59 @@ public: MetadataCheckBox *maxApertureCheck; }; -EXIFLens::EXIFLens(QWidget* parent) - : QWidget(parent) +EXIFLens::EXIFLens(TQWidget* tqparent) + : TQWidget(tqparent) { d = new EXIFLensPriv; - QGridLayout* grid = new QGridLayout(parent, 5, 2, KDialog::spacingHint()); + TQGridLayout* grid = new TQGridLayout(tqparent, 5, 2, KDialog::spacingHint()); // -------------------------------------------------------- - d->focalLengthCheck = new QCheckBox(i18n("Focal length (mm):"), parent); - d->focalLengthEdit = new KDoubleSpinBox(1.0, 10000.0, 1.0, 50.0, 1, parent); + d->focalLengthCheck = new TQCheckBox(i18n("Focal length (mm):"), tqparent); + d->focalLengthEdit = new KDoubleSpinBox(1.0, 10000.0, 1.0, 50.0, 1, tqparent); grid->addMultiCellWidget(d->focalLengthCheck, 0, 0, 0, 0); grid->addMultiCellWidget(d->focalLengthEdit, 0, 0, 2, 2); - QWhatsThis::add(d->focalLengthEdit, i18n("<p>Set here the lens focal length in milimeters " + TQWhatsThis::add(d->focalLengthEdit, i18n("<p>Set here the lens focal length in milimeters " "used by camera to take the picture.")); // -------------------------------------------------------- - d->focalLength35mmCheck = new QCheckBox(i18n("Focal length in 35mm film (mm):"), parent); - d->focalLength35mmEdit = new KIntSpinBox(1, 10000, 1, 1, 10, parent); + d->focalLength35mmCheck = new TQCheckBox(i18n("Focal length in 35mm film (mm):"), tqparent); + d->focalLength35mmEdit = new KIntSpinBox(1, 10000, 1, 1, 10, tqparent); grid->addMultiCellWidget(d->focalLength35mmCheck, 1, 1, 0, 0); grid->addMultiCellWidget(d->focalLength35mmEdit, 1, 1, 2, 2); - QWhatsThis::add(d->focalLength35mmEdit, i18n("<p>Set here equivalent focal length assuming " + TQWhatsThis::add(d->focalLength35mmEdit, i18n("<p>Set here equivalent focal length assuming " "a 35mm film camera, in mm. A value of 0 means the focal " "length is unknown.")); // -------------------------------------------------------- - d->digitalZoomRatioCheck = new QCheckBox(i18n("Digital zoom ratio:"), parent); - d->digitalZoomRatioEdit = new KDoubleSpinBox(0.0, 100.0, 0.1, 1.0, 1, parent); + d->digitalZoomRatioCheck = new TQCheckBox(i18n("Digital zoom ratio:"), tqparent); + d->digitalZoomRatioEdit = new KDoubleSpinBox(0.0, 100.0, 0.1, 1.0, 1, tqparent); grid->addMultiCellWidget(d->digitalZoomRatioCheck, 2, 2, 0, 0); grid->addMultiCellWidget(d->digitalZoomRatioEdit, 2, 2, 2, 2); - QWhatsThis::add(d->digitalZoomRatioEdit, i18n("<p>Set here the digital zoom ratio " + TQWhatsThis::add(d->digitalZoomRatioEdit, i18n("<p>Set here the digital zoom ratio " "used by camera to take the picture.")); // -------------------------------------------------------- - d->apertureCheck = new MetadataCheckBox(i18n("Lens aperture (f-number):"), parent); - d->apertureCB = new QComboBox(false, parent); + d->apertureCheck = new MetadataCheckBox(i18n("Lens aperture (f-number):"), tqparent); + d->apertureCB = new TQComboBox(false, tqparent); d->apertureCB->insertStringList(d->apertureValues); grid->addMultiCellWidget(d->apertureCheck, 3, 3, 0, 0); grid->addMultiCellWidget(d->apertureCB, 3, 3, 2, 2); - QWhatsThis::add(d->apertureCB, i18n("<p>Select here the lens aperture used by camera " + TQWhatsThis::add(d->apertureCB, i18n("<p>Select here the lens aperture used by camera " "to take the picture.")); // -------------------------------------------------------- - d->maxApertureCheck = new MetadataCheckBox(i18n("Max. lens aperture (f-number):"), parent); - d->maxApertureCB = new QComboBox(false, parent); + d->maxApertureCheck = new MetadataCheckBox(i18n("Max. lens aperture (f-number):"), tqparent); + d->maxApertureCB = new TQComboBox(false, tqparent); d->maxApertureCB->insertStringList(d->apertureValues); grid->addMultiCellWidget(d->maxApertureCheck, 4, 4, 0, 0); grid->addMultiCellWidget(d->maxApertureCB, 4, 4, 2, 2); - QWhatsThis::add(d->maxApertureCB, i18n("<p>Select here the smallest aperture of the lens used by camera " + TQWhatsThis::add(d->maxApertureCB, i18n("<p>Select here the smallest aperture of the lens used by camera " "to take the picture.")); grid->setColStretch(1, 10); @@ -205,54 +205,54 @@ EXIFLens::EXIFLens(QWidget* parent) // -------------------------------------------------------- - connect(d->focalLengthCheck, SIGNAL(toggled(bool)), - d->focalLengthEdit, SLOT(setEnabled(bool))); + connect(d->focalLengthCheck, TQT_SIGNAL(toggled(bool)), + d->focalLengthEdit, TQT_SLOT(setEnabled(bool))); - connect(d->focalLength35mmCheck, SIGNAL(toggled(bool)), - d->focalLength35mmEdit, SLOT(setEnabled(bool))); + connect(d->focalLength35mmCheck, TQT_SIGNAL(toggled(bool)), + d->focalLength35mmEdit, TQT_SLOT(setEnabled(bool))); - connect(d->digitalZoomRatioCheck, SIGNAL(toggled(bool)), - d->digitalZoomRatioEdit, SLOT(setEnabled(bool))); + connect(d->digitalZoomRatioCheck, TQT_SIGNAL(toggled(bool)), + d->digitalZoomRatioEdit, TQT_SLOT(setEnabled(bool))); - connect(d->apertureCheck, SIGNAL(toggled(bool)), - d->apertureCB, SLOT(setEnabled(bool))); + connect(d->apertureCheck, TQT_SIGNAL(toggled(bool)), + d->apertureCB, TQT_SLOT(setEnabled(bool))); - connect(d->maxApertureCheck, SIGNAL(toggled(bool)), - d->maxApertureCB, SLOT(setEnabled(bool))); + connect(d->maxApertureCheck, TQT_SIGNAL(toggled(bool)), + d->maxApertureCB, TQT_SLOT(setEnabled(bool))); // -------------------------------------------------------- - connect(d->focalLength35mmCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->focalLength35mmCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->focalLengthCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->focalLengthCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->digitalZoomRatioCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->digitalZoomRatioCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->apertureCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->apertureCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->maxApertureCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->maxApertureCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); // -------------------------------------------------------- - connect(d->apertureCB, SIGNAL(activated(int)), - this, SIGNAL(signalModified())); + connect(d->apertureCB, TQT_SIGNAL(activated(int)), + this, TQT_SIGNAL(signalModified())); - connect(d->maxApertureCB, SIGNAL(activated(int)), - this, SIGNAL(signalModified())); + connect(d->maxApertureCB, TQT_SIGNAL(activated(int)), + this, TQT_SIGNAL(signalModified())); - connect(d->focalLength35mmEdit, SIGNAL(valueChanged(int)), - this, SIGNAL(signalModified())); + connect(d->focalLength35mmEdit, TQT_SIGNAL(valueChanged(int)), + this, TQT_SIGNAL(signalModified())); - connect(d->focalLengthEdit, SIGNAL(valueChanged(double)), - this, SIGNAL(signalModified())); + connect(d->focalLengthEdit, TQT_SIGNAL(valueChanged(double)), + this, TQT_SIGNAL(signalModified())); - connect(d->digitalZoomRatioEdit, SIGNAL(valueChanged(double)), - this, SIGNAL(signalModified())); + connect(d->digitalZoomRatioEdit, TQT_SIGNAL(valueChanged(double)), + this, TQT_SIGNAL(signalModified())); } EXIFLens::~EXIFLens() @@ -260,7 +260,7 @@ EXIFLens::~EXIFLens() delete d; } -void EXIFLens::readMetadata(QByteArray& exifData) +void EXIFLens::readMetadata(TQByteArray& exifData) { blockSignals(true); KExiv2Iface::KExiv2 exiv2Iface; @@ -299,7 +299,7 @@ void EXIFLens::readMetadata(QByteArray& exifData) d->apertureCheck->setChecked(false); if (exiv2Iface.getExifTagRational("Exif.Photo.FNumber", num, den)) { - QString fnumber = QString::number((double)(num)/(double)(den), 'f', 1); + TQString fnumber = TQString::number((double)(num)/(double)(den), 'f', 1); int item = -1; for (int i = 0 ; i < d->apertureCB->count() ; i++) @@ -318,7 +318,7 @@ void EXIFLens::readMetadata(QByteArray& exifData) { double aperture = pow(2.0, ((double)(num)/(double)(den))/2.0); - QString fnumber = QString::number(aperture, 'f', 1); + TQString fnumber = TQString::number(aperture, 'f', 1); int item = -1; for (int i = 0 ; i < d->apertureCB->count() ; i++) @@ -343,7 +343,7 @@ void EXIFLens::readMetadata(QByteArray& exifData) { double maxAperture = pow(2.0, ((double)(num)/(double)(den))/2.0); - QString fnumber = QString::number(maxAperture, 'f', 1); + TQString fnumber = TQString::number(maxAperture, 'f', 1); int item = -1; for (int i = 0 ; i < d->apertureCB->count() ; i++) @@ -365,7 +365,7 @@ void EXIFLens::readMetadata(QByteArray& exifData) blockSignals(false); } -void EXIFLens::applyMetadata(QByteArray& exifData) +void EXIFLens::applyMetadata(TQByteArray& exifData) { KExiv2Iface::KExiv2 exiv2Iface; exiv2Iface.setExif(exifData); diff --git a/kipi-plugins/metadataedit/exiflens.h b/kipi-plugins/metadataedit/exiflens.h index de91970..d0b19ab 100644 --- a/kipi-plugins/metadataedit/exiflens.h +++ b/kipi-plugins/metadataedit/exiflens.h @@ -23,27 +23,28 @@ #ifndef EXIF_LENS_H #define EXIF_LENS_H -// Qt includes. +// TQt includes. -#include <qwidget.h> -#include <qcstring.h> +#include <tqwidget.h> +#include <tqcstring.h> namespace KIPIMetadataEditPlugin { class EXIFLensPriv; -class EXIFLens : public QWidget +class EXIFLens : public TQWidget { Q_OBJECT + TQ_OBJECT public: - EXIFLens(QWidget* parent); + EXIFLens(TQWidget* tqparent); ~EXIFLens(); - void applyMetadata(QByteArray& exifData); - void readMetadata(QByteArray& exifData); + void applyMetadata(TQByteArray& exifData); + void readMetadata(TQByteArray& exifData); signals: diff --git a/kipi-plugins/metadataedit/exiflight.cpp b/kipi-plugins/metadataedit/exiflight.cpp index e0a6d06..8812a90 100644 --- a/kipi-plugins/metadataedit/exiflight.cpp +++ b/kipi-plugins/metadataedit/exiflight.cpp @@ -26,11 +26,11 @@ // QT includes. -#include <qlayout.h> -#include <qlabel.h> -#include <qwhatsthis.h> -#include <qcombobox.h> -#include <qmap.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqwhatsthis.h> +#include <tqcombobox.h> +#include <tqmap.h> // KDE includes. @@ -56,15 +56,15 @@ namespace KIPIMetadataEditPlugin public: FlashMode() {} - FlashMode(int id, const QString& desc) : m_id(id), m_desc(desc) {} + FlashMode(int id, const TQString& desc) : m_id(id), m_desc(desc) {} int id() const { return m_id; } - QString desc() const { return m_desc; } + TQString desc() const { return m_desc; } private: int m_id; - QString m_desc; + TQString m_desc; }; class EXIFLightPriv @@ -106,15 +106,15 @@ public: flashModeMap.insert(21, FlashMode( 0x5f, i18n("Yes, auto, red-eye, return light") )); } - typedef QMap<int, FlashMode> FlashModeMap; + typedef TQMap<int, FlashMode> FlashModeMap; FlashModeMap flashModeMap; - QCheckBox *flashEnergyCheck; + TQCheckBox *flashEnergyCheck; - QComboBox *lightSourceCB; - QComboBox *flashModeCB; - QComboBox *whiteBalanceCB; + TQComboBox *lightSourceCB; + TQComboBox *flashModeCB; + TQComboBox *whiteBalanceCB; KDoubleSpinBox *flashEnergyEdit; @@ -123,17 +123,17 @@ public: MetadataCheckBox *whiteBalanceCheck; }; -EXIFLight::EXIFLight(QWidget* parent) - : QWidget(parent) +EXIFLight::EXIFLight(TQWidget* tqparent) + : TQWidget(tqparent) { d = new EXIFLightPriv; - QGridLayout* grid = new QGridLayout(parent, 4, 3, KDialog::spacingHint()); + TQGridLayout* grid = new TQGridLayout(tqparent, 4, 3, KDialog::spacingHint()); // -------------------------------------------------------- - d->lightSourceCheck = new MetadataCheckBox(i18n("Light source:"), parent); - d->lightSourceCB = new QComboBox(false, parent); + d->lightSourceCheck = new MetadataCheckBox(i18n("Light source:"), tqparent); + d->lightSourceCB = new TQComboBox(false, tqparent); d->lightSourceCB->insertItem(i18n("Unknown"), 0); d->lightSourceCB->insertItem(i18n("Daylight"), 1); d->lightSourceCB->insertItem(i18n("Fluorescent"), 2); @@ -157,13 +157,13 @@ EXIFLight::EXIFLight(QWidget* parent) d->lightSourceCB->insertItem(i18n("Other light source"), 20); grid->addMultiCellWidget(d->lightSourceCheck, 0, 0, 0, 0); grid->addMultiCellWidget(d->lightSourceCB, 0, 0, 2, 3); - QWhatsThis::add(d->lightSourceCB, i18n("<p>Select here the kind of light source used " + TQWhatsThis::add(d->lightSourceCB, i18n("<p>Select here the kind of light source used " "to take the picture.")); // -------------------------------------------------------- - d->flashModeCheck = new MetadataCheckBox(i18n("Flash mode:"), parent); - d->flashModeCB = new QComboBox(false, parent); + d->flashModeCheck = new MetadataCheckBox(i18n("Flash mode:"), tqparent); + d->flashModeCB = new TQComboBox(false, tqparent); for (EXIFLightPriv::FlashModeMap::Iterator it = d->flashModeMap.begin(); it != d->flashModeMap.end(); ++it ) @@ -171,16 +171,16 @@ EXIFLight::EXIFLight(QWidget* parent) grid->addMultiCellWidget(d->flashModeCheck, 1, 1, 0, 0); grid->addMultiCellWidget(d->flashModeCB, 1, 1, 2, 3); - QWhatsThis::add(d->flashModeCB, i18n("<p>Select here the flash program mode used by camera " + TQWhatsThis::add(d->flashModeCB, i18n("<p>Select here the flash program mode used by camera " "to take the picture.")); // -------------------------------------------------------- - d->flashEnergyCheck = new QCheckBox(i18n("Flash energy (BCPS):"), parent); - d->flashEnergyEdit = new KDoubleSpinBox(1.0, 10000.0, 1.0, 1.0, 1, parent); + d->flashEnergyCheck = new TQCheckBox(i18n("Flash energy (BCPS):"), tqparent); + d->flashEnergyEdit = new KDoubleSpinBox(1.0, 10000.0, 1.0, 1.0, 1, tqparent); grid->addMultiCellWidget(d->flashEnergyCheck, 2, 2, 0, 0); grid->addMultiCellWidget(d->flashEnergyEdit, 2, 2, 2, 2); - QWhatsThis::add(d->flashEnergyEdit, i18n("<p>Set here the flash energy used to take the picture " + TQWhatsThis::add(d->flashEnergyEdit, i18n("<p>Set here the flash energy used to take the picture " "in BCPS unit. Beam Candle Power Seconds is the measure " "of effective intensity of a light source when it is " "focused into a beam by a reflector or lens. This value " @@ -188,13 +188,13 @@ EXIFLight::EXIFLight(QWidget* parent) // -------------------------------------------------------- - d->whiteBalanceCheck = new MetadataCheckBox(i18n("White balance:"), parent); - d->whiteBalanceCB = new QComboBox(false, parent); + d->whiteBalanceCheck = new MetadataCheckBox(i18n("White balance:"), tqparent); + d->whiteBalanceCB = new TQComboBox(false, tqparent); d->whiteBalanceCB->insertItem(i18n("Auto"), 0); d->whiteBalanceCB->insertItem(i18n("Manual"), 1); grid->addMultiCellWidget(d->whiteBalanceCheck, 3, 3, 0, 0); grid->addMultiCellWidget(d->whiteBalanceCB, 3, 3, 2, 2); - QWhatsThis::add(d->whiteBalanceCB, i18n("<p>Select here the white balance mode set by camera when " + TQWhatsThis::add(d->whiteBalanceCB, i18n("<p>Select here the white balance mode set by camera when " "the picture have been shot.")); @@ -203,45 +203,45 @@ EXIFLight::EXIFLight(QWidget* parent) // -------------------------------------------------------- - connect(d->lightSourceCheck, SIGNAL(toggled(bool)), - d->lightSourceCB, SLOT(setEnabled(bool))); + connect(d->lightSourceCheck, TQT_SIGNAL(toggled(bool)), + d->lightSourceCB, TQT_SLOT(setEnabled(bool))); - connect(d->flashModeCheck, SIGNAL(toggled(bool)), - d->flashModeCB, SLOT(setEnabled(bool))); + connect(d->flashModeCheck, TQT_SIGNAL(toggled(bool)), + d->flashModeCB, TQT_SLOT(setEnabled(bool))); - connect(d->flashEnergyCheck, SIGNAL(toggled(bool)), - d->flashEnergyEdit, SLOT(setEnabled(bool))); + connect(d->flashEnergyCheck, TQT_SIGNAL(toggled(bool)), + d->flashEnergyEdit, TQT_SLOT(setEnabled(bool))); - connect(d->whiteBalanceCheck, SIGNAL(toggled(bool)), - d->whiteBalanceCB, SLOT(setEnabled(bool))); + connect(d->whiteBalanceCheck, TQT_SIGNAL(toggled(bool)), + d->whiteBalanceCB, TQT_SLOT(setEnabled(bool))); // -------------------------------------------------------- - connect(d->flashEnergyCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->flashEnergyCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->lightSourceCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->lightSourceCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->flashModeCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->flashModeCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->whiteBalanceCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->whiteBalanceCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); // -------------------------------------------------------- - connect(d->lightSourceCB, SIGNAL(activated(int)), - this, SIGNAL(signalModified())); + connect(d->lightSourceCB, TQT_SIGNAL(activated(int)), + this, TQT_SIGNAL(signalModified())); - connect(d->flashModeCB, SIGNAL(activated(int)), - this, SIGNAL(signalModified())); + connect(d->flashModeCB, TQT_SIGNAL(activated(int)), + this, TQT_SIGNAL(signalModified())); - connect(d->whiteBalanceCB, SIGNAL(activated(int)), - this, SIGNAL(signalModified())); + connect(d->whiteBalanceCB, TQT_SIGNAL(activated(int)), + this, TQT_SIGNAL(signalModified())); - connect(d->flashEnergyEdit, SIGNAL(valueChanged(double)), - this, SIGNAL(signalModified())); + connect(d->flashEnergyEdit, TQT_SIGNAL(valueChanged(double)), + this, TQT_SIGNAL(signalModified())); } EXIFLight::~EXIFLight() @@ -249,7 +249,7 @@ EXIFLight::~EXIFLight() delete d; } -void EXIFLight::readMetadata(QByteArray& exifData) +void EXIFLight::readMetadata(TQByteArray& exifData) { blockSignals(true); KExiv2Iface::KExiv2 exiv2Iface; @@ -326,7 +326,7 @@ void EXIFLight::readMetadata(QByteArray& exifData) blockSignals(false); } -void EXIFLight::applyMetadata(QByteArray& exifData) +void EXIFLight::applyMetadata(TQByteArray& exifData) { KExiv2Iface::KExiv2 exiv2Iface; exiv2Iface.setExif(exifData); diff --git a/kipi-plugins/metadataedit/exiflight.h b/kipi-plugins/metadataedit/exiflight.h index 7b2f05c..5ea5611 100644 --- a/kipi-plugins/metadataedit/exiflight.h +++ b/kipi-plugins/metadataedit/exiflight.h @@ -23,27 +23,28 @@ #ifndef EXIF_LIGHT_H #define EXIF_LIGHT_H -// Qt includes. +// TQt includes. -#include <qwidget.h> -#include <qcstring.h> +#include <tqwidget.h> +#include <tqcstring.h> namespace KIPIMetadataEditPlugin { class EXIFLightPriv; -class EXIFLight : public QWidget +class EXIFLight : public TQWidget { Q_OBJECT + TQ_OBJECT public: - EXIFLight(QWidget* parent); + EXIFLight(TQWidget* tqparent); ~EXIFLight(); - void applyMetadata(QByteArray& exifData); - void readMetadata(QByteArray& exifData); + void applyMetadata(TQByteArray& exifData); + void readMetadata(TQByteArray& exifData); signals: diff --git a/kipi-plugins/metadataedit/iptccaption.cpp b/kipi-plugins/metadataedit/iptccaption.cpp index 3569e95..cfe1f88 100644 --- a/kipi-plugins/metadataedit/iptccaption.cpp +++ b/kipi-plugins/metadataedit/iptccaption.cpp @@ -22,13 +22,13 @@ // QT includes. -#include <qlayout.h> -#include <qhgroupbox.h> -#include <qgroupbox.h> -#include <qlabel.h> -#include <qwhatsthis.h> -#include <qvalidator.h> -#include <qcheckbox.h> +#include <tqlayout.h> +#include <tqhgroupbox.h> +#include <tqgroupbox.h> +#include <tqlabel.h> +#include <tqwhatsthis.h> +#include <tqvalidator.h> +#include <tqcheckbox.h> // KDE includes. @@ -72,13 +72,13 @@ public: syncEXIFCommentCheck = 0; } - QCheckBox *captionCheck; - QCheckBox *specialInstructionCheck; - QCheckBox *writerCheck; - QCheckBox *headlineCheck; - QCheckBox *syncJFIFCommentCheck; - QCheckBox *syncHOSTCommentCheck; - QCheckBox *syncEXIFCommentCheck; + TQCheckBox *captionCheck; + TQCheckBox *specialInstructionCheck; + TQCheckBox *writerCheck; + TQCheckBox *headlineCheck; + TQCheckBox *syncJFIFCommentCheck; + TQCheckBox *syncHOSTCommentCheck; + TQCheckBox *syncEXIFCommentCheck; KTextEdit *captionEdit; KTextEdit *specialInstructionEdit; @@ -87,26 +87,26 @@ public: KLineEdit *headlineEdit; }; -IPTCCaption::IPTCCaption(QWidget* parent) - : QWidget(parent) +IPTCCaption::IPTCCaption(TQWidget* tqparent) + : TQWidget(tqparent) { d = new IPTCCaptionPriv; - QVBoxLayout *vlay = new QVBoxLayout( parent, 0, KDialog::spacingHint() ); + TQVBoxLayout *vlay = new TQVBoxLayout( tqparent, 0, KDialog::spacingHint() ); // IPTC only accept printable Ascii char. - QRegExp asciiRx("[\x20-\x7F]+$"); - QValidator *asciiValidator = new QRegExpValidator(asciiRx, this); + TQRegExp asciiRx("[\x20-\x7F]+$"); + TQValidator *asciiValidator = new TQRegExpValidator(asciiRx, TQT_TQOBJECT(this)); // -------------------------------------------------------- - d->captionCheck = new QCheckBox(i18n("Caption:"), parent); - d->captionEdit = new KTextEdit(parent); - d->syncJFIFCommentCheck = new QCheckBox(i18n("Sync JFIF Comment section"), parent); - d->syncHOSTCommentCheck = new QCheckBox(i18n("Sync caption entered through %1") - .arg(KApplication::kApplication()->aboutData()->appName()), - parent); - d->syncEXIFCommentCheck = new QCheckBox(i18n("Sync EXIF Comment"), parent); - KSeparator *line = new KSeparator(Horizontal, parent); + d->captionCheck = new TQCheckBox(i18n("Caption:"), tqparent); + d->captionEdit = new KTextEdit(tqparent); + d->syncJFIFCommentCheck = new TQCheckBox(i18n("Sync JFIF Comment section"), tqparent); + d->syncHOSTCommentCheck = new TQCheckBox(i18n("Sync caption entered through %1") + .tqarg(KApplication::kApplication()->aboutData()->appName()), + tqparent); + d->syncEXIFCommentCheck = new TQCheckBox(i18n("Sync EXIF Comment"), tqparent); + KSeparator *line = new KSeparator(Qt::Horizontal, tqparent); /* d->captionEdit->setValidator(asciiValidator); d->captionEdit->setMaxLength(2000);*/ @@ -116,40 +116,40 @@ IPTCCaption::IPTCCaption(QWidget* parent) vlay->addWidget(d->syncHOSTCommentCheck); vlay->addWidget(d->syncEXIFCommentCheck); vlay->addWidget(line); - QWhatsThis::add(d->captionEdit, i18n("<p>Enter the content description. This field is limited " + TQWhatsThis::add(d->captionEdit, i18n("<p>Enter the content description. This field is limited " "to 2000 ASCII characters.")); // -------------------------------------------------------- - d->writerCheck = new QCheckBox(i18n("Caption Writer:"), parent); - d->writerEdit = new KLineEdit(parent); + d->writerCheck = new TQCheckBox(i18n("Caption Writer:"), tqparent); + d->writerEdit = new KLineEdit(tqparent); d->writerEdit->setValidator(asciiValidator); d->writerEdit->setMaxLength(32); vlay->addWidget(d->writerCheck); vlay->addWidget(d->writerEdit); - QWhatsThis::add(d->writerEdit, i18n("<p>Enter the name of the caption author. This field is limited " + TQWhatsThis::add(d->writerEdit, i18n("<p>Enter the name of the caption author. This field is limited " "to 32 ASCII characters.")); // -------------------------------------------------------- - d->headlineCheck = new QCheckBox(i18n("Headline:"), parent); - d->headlineEdit = new KLineEdit(parent); + d->headlineCheck = new TQCheckBox(i18n("Headline:"), tqparent); + d->headlineEdit = new KLineEdit(tqparent); d->headlineEdit->setValidator(asciiValidator); d->headlineEdit->setMaxLength(256); vlay->addWidget(d->headlineCheck); vlay->addWidget(d->headlineEdit); - QWhatsThis::add(d->headlineEdit, i18n("<p>Enter here the content synopsis. This field is limited " + TQWhatsThis::add(d->headlineEdit, i18n("<p>Enter here the content synopsis. This field is limited " "to 256 ASCII characters.")); // -------------------------------------------------------- - d->specialInstructionCheck = new QCheckBox(i18n("Special Instructions:"), parent); - d->specialInstructionEdit = new KTextEdit(parent); + d->specialInstructionCheck = new TQCheckBox(i18n("Special Instructions:"), tqparent); + d->specialInstructionEdit = new KTextEdit(tqparent); /* d->specialInstructionEdit->setValidator(asciiValidator); d->specialInstructionEdit->setMaxLength(256);*/ vlay->addWidget(d->specialInstructionCheck); vlay->addWidget(d->specialInstructionEdit); - QWhatsThis::add(d->specialInstructionEdit, i18n("<p>Enter the editorial usage instructions. " + TQWhatsThis::add(d->specialInstructionEdit, i18n("<p>Enter the editorial usage instructions. " "This field is limited to 256 ASCII characters.")); // -------------------------------------------------------- @@ -159,60 +159,60 @@ IPTCCaption::IPTCCaption(QWidget* parent) "text tags only support the printable " "<b><a href='http://en.wikipedia.org/wiki/Ascii'>ASCII</a></b> " "characters set and limit strings size. " - "Use contextual help for details.</b>"), parent); + "Use contextual help for details.</b>"), tqparent); vlay->addWidget(note); vlay->addStretch(); // -------------------------------------------------------- - connect(d->captionCheck, SIGNAL(toggled(bool)), - d->captionEdit, SLOT(setEnabled(bool))); + connect(d->captionCheck, TQT_SIGNAL(toggled(bool)), + d->captionEdit, TQT_SLOT(setEnabled(bool))); - connect(d->captionCheck, SIGNAL(toggled(bool)), - d->syncJFIFCommentCheck, SLOT(setEnabled(bool))); + connect(d->captionCheck, TQT_SIGNAL(toggled(bool)), + d->syncJFIFCommentCheck, TQT_SLOT(setEnabled(bool))); - connect(d->captionCheck, SIGNAL(toggled(bool)), - d->syncHOSTCommentCheck, SLOT(setEnabled(bool))); + connect(d->captionCheck, TQT_SIGNAL(toggled(bool)), + d->syncHOSTCommentCheck, TQT_SLOT(setEnabled(bool))); - connect(d->captionCheck, SIGNAL(toggled(bool)), - d->syncEXIFCommentCheck, SLOT(setEnabled(bool))); + connect(d->captionCheck, TQT_SIGNAL(toggled(bool)), + d->syncEXIFCommentCheck, TQT_SLOT(setEnabled(bool))); - connect(d->writerCheck, SIGNAL(toggled(bool)), - d->writerEdit, SLOT(setEnabled(bool))); + connect(d->writerCheck, TQT_SIGNAL(toggled(bool)), + d->writerEdit, TQT_SLOT(setEnabled(bool))); - connect(d->headlineCheck, SIGNAL(toggled(bool)), - d->headlineEdit, SLOT(setEnabled(bool))); + connect(d->headlineCheck, TQT_SIGNAL(toggled(bool)), + d->headlineEdit, TQT_SLOT(setEnabled(bool))); - connect(d->specialInstructionCheck, SIGNAL(toggled(bool)), - d->specialInstructionEdit, SLOT(setEnabled(bool))); + connect(d->specialInstructionCheck, TQT_SIGNAL(toggled(bool)), + d->specialInstructionEdit, TQT_SLOT(setEnabled(bool))); // -------------------------------------------------------- - connect(d->captionCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->captionCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->writerCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->writerCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->headlineCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->headlineCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->specialInstructionCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->specialInstructionCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); // -------------------------------------------------------- - connect(d->captionEdit, SIGNAL(textChanged()), - this, SIGNAL(signalModified())); + connect(d->captionEdit, TQT_SIGNAL(textChanged()), + this, TQT_SIGNAL(signalModified())); - connect(d->specialInstructionEdit, SIGNAL(textChanged()), - this, SIGNAL(signalModified())); + connect(d->specialInstructionEdit, TQT_SIGNAL(textChanged()), + this, TQT_SIGNAL(signalModified())); - connect(d->writerEdit, SIGNAL(textChanged(const QString &)), - this, SIGNAL(signalModified())); + connect(d->writerEdit, TQT_SIGNAL(textChanged(const TQString &)), + this, TQT_SIGNAL(signalModified())); - connect(d->headlineEdit, SIGNAL(textChanged(const QString &)), - this, SIGNAL(signalModified())); + connect(d->headlineEdit, TQT_SIGNAL(textChanged(const TQString &)), + this, TQT_SIGNAL(signalModified())); } IPTCCaption::~IPTCCaption() @@ -235,7 +235,7 @@ bool IPTCCaption::syncEXIFCommentIsChecked() return d->syncEXIFCommentCheck->isChecked(); } -QString IPTCCaption::getIPTCCaption() +TQString IPTCCaption::getIPTCCaption() { return d->captionEdit->text(); } @@ -255,12 +255,12 @@ void IPTCCaption::setCheckedSyncEXIFComment(bool c) d->syncEXIFCommentCheck->setChecked(c); } -void IPTCCaption::readMetadata(QByteArray& iptcData) +void IPTCCaption::readMetadata(TQByteArray& iptcData) { blockSignals(true); KExiv2Iface::KExiv2 exiv2Iface; exiv2Iface.setIptc(iptcData); - QString data; + TQString data; d->captionEdit->clear(); d->captionCheck->setChecked(false); @@ -308,7 +308,7 @@ void IPTCCaption::readMetadata(QByteArray& iptcData) blockSignals(false); } -void IPTCCaption::applyMetadata(QByteArray& exifData, QByteArray& iptcData) +void IPTCCaption::applyMetadata(TQByteArray& exifData, TQByteArray& iptcData) { KExiv2Iface::KExiv2 exiv2Iface; exiv2Iface.setExif(exifData); diff --git a/kipi-plugins/metadataedit/iptccaption.h b/kipi-plugins/metadataedit/iptccaption.h index cc93fad..c47c1bc 100644 --- a/kipi-plugins/metadataedit/iptccaption.h +++ b/kipi-plugins/metadataedit/iptccaption.h @@ -23,27 +23,28 @@ #ifndef IPTC_CAPTION_H #define IPTC_CAPTION_H -// Qt includes. +// TQt includes. -#include <qwidget.h> -#include <qcstring.h> +#include <tqwidget.h> +#include <tqcstring.h> namespace KIPIMetadataEditPlugin { class IPTCCaptionPriv; -class IPTCCaption : public QWidget +class IPTCCaption : public TQWidget { Q_OBJECT + TQ_OBJECT public: - IPTCCaption(QWidget* parent); + IPTCCaption(TQWidget* tqparent); ~IPTCCaption(); - void applyMetadata(QByteArray& exifData, QByteArray& iptcData); - void readMetadata(QByteArray& iptcData); + void applyMetadata(TQByteArray& exifData, TQByteArray& iptcData); + void readMetadata(TQByteArray& iptcData); bool syncJFIFCommentIsChecked(); bool syncHOSTCommentIsChecked(); @@ -53,7 +54,7 @@ public: void setCheckedSyncHOSTComment(bool c); void setCheckedSyncEXIFComment(bool c); - QString getIPTCCaption(); + TQString getIPTCCaption(); signals: diff --git a/kipi-plugins/metadataedit/iptccategories.cpp b/kipi-plugins/metadataedit/iptccategories.cpp index 1172663..48ef08d 100644 --- a/kipi-plugins/metadataedit/iptccategories.cpp +++ b/kipi-plugins/metadataedit/iptccategories.cpp @@ -22,12 +22,12 @@ // QT includes. -#include <qlayout.h> -#include <qlabel.h> -#include <qwhatsthis.h> -#include <qvalidator.h> -#include <qcheckbox.h> -#include <qpushbutton.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqwhatsthis.h> +#include <tqvalidator.h> +#include <tqcheckbox.h> +#include <tqpushbutton.h> // KDE includes. @@ -65,13 +65,13 @@ public: subCategoryEdit = 0; } - QStringList oldSubCategories; + TQStringList oldSubCategories; - QPushButton *addSubCategoryButton; - QPushButton *delSubCategoryButton; + TQPushButton *addSubCategoryButton; + TQPushButton *delSubCategoryButton; - QCheckBox *subCategoriesCheck; - QCheckBox *categoryCheck; + TQCheckBox *subCategoriesCheck; + TQCheckBox *categoryCheck; KLineEdit *categoryEdit; KLineEdit *subCategoryEdit; @@ -79,39 +79,39 @@ public: KListBox *subCategoriesBox; }; -IPTCCategories::IPTCCategories(QWidget* parent) - : QWidget(parent) +IPTCCategories::IPTCCategories(TQWidget* tqparent) + : TQWidget(tqparent) { d = new IPTCCategoriesPriv; - QGridLayout *grid = new QGridLayout(parent, 6, 1, 0, KDialog::spacingHint()); - grid->setAlignment( Qt::AlignTop ); + TQGridLayout *grid = new TQGridLayout(tqparent, 6, 1, 0, KDialog::spacingHint()); + grid->tqsetAlignment( TQt::AlignTop ); // IPTC only accept printable Ascii char. - QRegExp asciiRx("[\x20-\x7F]+$"); - QValidator *asciiValidator = new QRegExpValidator(asciiRx, this); + TQRegExp asciiRx("[\x20-\x7F]+$"); + TQValidator *asciiValidator = new TQRegExpValidator(asciiRx, TQT_TQOBJECT(this)); // -------------------------------------------------------- - d->categoryCheck = new QCheckBox(i18n("Identify subject of content (3 chars max):"), parent); - d->categoryEdit = new KLineEdit(parent); + d->categoryCheck = new TQCheckBox(i18n("Identify subject of content (3 chars max):"), tqparent); + d->categoryEdit = new KLineEdit(tqparent); d->categoryEdit->setValidator(asciiValidator); d->categoryEdit->setMaxLength(3); - QWhatsThis::add(d->categoryEdit, i18n("<p>Set here the category of content. This field is limited " + TQWhatsThis::add(d->categoryEdit, i18n("<p>Set here the category of content. This field is limited " "to 3 ASCII characters.")); - d->subCategoriesCheck = new QCheckBox(i18n("Supplemental categories:"), parent); + d->subCategoriesCheck = new TQCheckBox(i18n("Supplemental categories:"), tqparent); - d->subCategoryEdit = new KLineEdit(parent); + d->subCategoryEdit = new KLineEdit(tqparent); d->subCategoryEdit->setValidator(asciiValidator); d->subCategoryEdit->setMaxLength(32); - QWhatsThis::add(d->subCategoryEdit, i18n("<p>Enter here a new supplemental category of content. " + TQWhatsThis::add(d->subCategoryEdit, i18n("<p>Enter here a new supplemental category of content. " "This field is limited to 32 ASCII characters.")); - d->subCategoriesBox = new KListBox(parent); - d->subCategoriesBox->setVScrollBarMode(QScrollView::AlwaysOn); + d->subCategoriesBox = new KListBox(tqparent); + d->subCategoriesBox->setVScrollBarMode(TQScrollView::AlwaysOn); - d->addSubCategoryButton = new QPushButton( i18n("&Add"), parent); - d->delSubCategoryButton = new QPushButton( i18n("&Delete"), parent); + d->addSubCategoryButton = new TQPushButton( i18n("&Add"), tqparent); + d->delSubCategoryButton = new TQPushButton( i18n("&Delete"), tqparent); d->addSubCategoryButton->setIconSet(SmallIcon("add")); d->delSubCategoryButton->setIconSet(SmallIcon("remove")); d->delSubCategoryButton->setEnabled(false); @@ -131,7 +131,7 @@ IPTCCategories::IPTCCategories(QWidget* parent) "text tags only support the printable " "<b><a href='http://en.wikipedia.org/wiki/Ascii'>ASCII</a></b> " "characters set and limit strings size. " - "Use contextual help for details.</b>"), parent); + "Use contextual help for details.</b>"), tqparent); note->setMaximumWidth(150); grid->addMultiCellWidget(note, 5, 5, 1, 1); @@ -140,68 +140,68 @@ IPTCCategories::IPTCCategories(QWidget* parent) // -------------------------------------------------------- - connect(d->categoryCheck, SIGNAL(toggled(bool)), - d->categoryEdit, SLOT(setEnabled(bool))); + connect(d->categoryCheck, TQT_SIGNAL(toggled(bool)), + d->categoryEdit, TQT_SLOT(setEnabled(bool))); - connect(d->categoryCheck, SIGNAL(toggled(bool)), - d->subCategoriesBox, SLOT(setEnabled(bool))); + connect(d->categoryCheck, TQT_SIGNAL(toggled(bool)), + d->subCategoriesBox, TQT_SLOT(setEnabled(bool))); - connect(d->categoryCheck, SIGNAL(toggled(bool)), - d->subCategoriesCheck, SLOT(setEnabled(bool))); + connect(d->categoryCheck, TQT_SIGNAL(toggled(bool)), + d->subCategoriesCheck, TQT_SLOT(setEnabled(bool))); - connect(d->categoryCheck, SIGNAL(toggled(bool)), - d->subCategoryEdit, SLOT(setEnabled(bool))); + connect(d->categoryCheck, TQT_SIGNAL(toggled(bool)), + d->subCategoryEdit, TQT_SLOT(setEnabled(bool))); - connect(d->categoryCheck, SIGNAL(toggled(bool)), - d->subCategoriesBox, SLOT(setEnabled(bool))); + connect(d->categoryCheck, TQT_SIGNAL(toggled(bool)), + d->subCategoriesBox, TQT_SLOT(setEnabled(bool))); - connect(d->categoryCheck, SIGNAL(toggled(bool)), - d->addSubCategoryButton, SLOT(setEnabled(bool))); + connect(d->categoryCheck, TQT_SIGNAL(toggled(bool)), + d->addSubCategoryButton, TQT_SLOT(setEnabled(bool))); - connect(d->categoryCheck, SIGNAL(toggled(bool)), - d->delSubCategoryButton, SLOT(setEnabled(bool))); + connect(d->categoryCheck, TQT_SIGNAL(toggled(bool)), + d->delSubCategoryButton, TQT_SLOT(setEnabled(bool))); // -------------------------------------------------------- - connect(d->subCategoriesCheck, SIGNAL(toggled(bool)), - d->subCategoryEdit, SLOT(setEnabled(bool))); + connect(d->subCategoriesCheck, TQT_SIGNAL(toggled(bool)), + d->subCategoryEdit, TQT_SLOT(setEnabled(bool))); - connect(d->subCategoriesCheck, SIGNAL(toggled(bool)), - d->subCategoriesBox, SLOT(setEnabled(bool))); + connect(d->subCategoriesCheck, TQT_SIGNAL(toggled(bool)), + d->subCategoriesBox, TQT_SLOT(setEnabled(bool))); - connect(d->subCategoriesCheck, SIGNAL(toggled(bool)), - d->addSubCategoryButton, SLOT(setEnabled(bool))); + connect(d->subCategoriesCheck, TQT_SIGNAL(toggled(bool)), + d->addSubCategoryButton, TQT_SLOT(setEnabled(bool))); - connect(d->subCategoriesCheck, SIGNAL(toggled(bool)), - d->delSubCategoryButton, SLOT(setEnabled(bool))); + connect(d->subCategoriesCheck, TQT_SIGNAL(toggled(bool)), + d->delSubCategoryButton, TQT_SLOT(setEnabled(bool))); // -------------------------------------------------------- - connect(d->subCategoriesBox, SIGNAL(selectionChanged()), - this, SLOT(slotCategorySelectionChanged())); + connect(d->subCategoriesBox, TQT_SIGNAL(selectionChanged()), + this, TQT_SLOT(slotCategorySelectionChanged())); - connect(d->addSubCategoryButton, SIGNAL(clicked()), - this, SLOT(slotAddCategory())); + connect(d->addSubCategoryButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotAddCategory())); - connect(d->delSubCategoryButton, SIGNAL(clicked()), - this, SLOT(slotDelCategory())); + connect(d->delSubCategoryButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotDelCategory())); // -------------------------------------------------------- - connect(d->categoryCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->categoryCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->subCategoriesCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->subCategoriesCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->addSubCategoryButton, SIGNAL(clicked()), - this, SIGNAL(signalModified())); + connect(d->addSubCategoryButton, TQT_SIGNAL(clicked()), + this, TQT_SIGNAL(signalModified())); - connect(d->delSubCategoryButton, SIGNAL(clicked()), - this, SIGNAL(signalModified())); + connect(d->delSubCategoryButton, TQT_SIGNAL(clicked()), + this, TQT_SIGNAL(signalModified())); - connect(d->categoryEdit, SIGNAL(textChanged(const QString &)), - this, SIGNAL(signalModified())); + connect(d->categoryEdit, TQT_SIGNAL(textChanged(const TQString &)), + this, TQT_SIGNAL(signalModified())); } IPTCCategories::~IPTCCategories() @@ -215,7 +215,7 @@ void IPTCCategories::slotDelCategory() if (index == -1) return; - QListBoxItem* item = d->subCategoriesBox->item(index); + TQListBoxItem* item = d->subCategoriesBox->item(index); if (!item) return; delete item; } @@ -230,11 +230,11 @@ void IPTCCategories::slotCategorySelectionChanged() void IPTCCategories::slotAddCategory() { - QString newCategory = d->subCategoryEdit->text(); + TQString newCategory = d->subCategoryEdit->text(); if (newCategory.isEmpty()) return; bool found = false; - for (QListBoxItem *item = d->subCategoriesBox->firstItem(); + for (TQListBoxItem *item = d->subCategoriesBox->firstItem(); item; item = item->next()) { if (newCategory == item->text()) @@ -248,12 +248,12 @@ void IPTCCategories::slotAddCategory() d->subCategoriesBox->insertItem(newCategory); } -void IPTCCategories::readMetadata(QByteArray& iptcData) +void IPTCCategories::readMetadata(TQByteArray& iptcData) { blockSignals(true); KExiv2Iface::KExiv2 exiv2Iface; exiv2Iface.setIptc(iptcData); - QString data; + TQString data; d->categoryEdit->clear(); d->categoryCheck->setChecked(false); @@ -282,9 +282,9 @@ void IPTCCategories::readMetadata(QByteArray& iptcData) blockSignals(false); } -void IPTCCategories::applyMetadata(QByteArray& iptcData) +void IPTCCategories::applyMetadata(TQByteArray& iptcData) { - QStringList newCategories; + TQStringList newCategories; KExiv2Iface::KExiv2 exiv2Iface; exiv2Iface.setIptc(iptcData); @@ -293,14 +293,14 @@ void IPTCCategories::applyMetadata(QByteArray& iptcData) else exiv2Iface.removeIptcTag("Iptc.Application2.Category"); - for (QListBoxItem *item = d->subCategoriesBox->firstItem(); + for (TQListBoxItem *item = d->subCategoriesBox->firstItem(); item; item = item->next()) newCategories.append(item->text()); if (d->categoryCheck->isChecked() && d->subCategoriesCheck->isChecked()) exiv2Iface.setImageSubCategories(d->oldSubCategories, newCategories); else - exiv2Iface.setImageSubCategories(d->oldSubCategories, QStringList()); + exiv2Iface.setImageSubCategories(d->oldSubCategories, TQStringList()); iptcData = exiv2Iface.getIptc(); } diff --git a/kipi-plugins/metadataedit/iptccategories.h b/kipi-plugins/metadataedit/iptccategories.h index 1d63c86..abb2e0e 100644 --- a/kipi-plugins/metadataedit/iptccategories.h +++ b/kipi-plugins/metadataedit/iptccategories.h @@ -23,27 +23,28 @@ #ifndef IPTC_CATEGORIES_H #define IPTC_CATEGORIES_H -// Qt includes. +// TQt includes. -#include <qwidget.h> -#include <qcstring.h> +#include <tqwidget.h> +#include <tqcstring.h> namespace KIPIMetadataEditPlugin { class IPTCCategoriesPriv; -class IPTCCategories : public QWidget +class IPTCCategories : public TQWidget { Q_OBJECT + TQ_OBJECT public: - IPTCCategories(QWidget* parent); + IPTCCategories(TQWidget* tqparent); ~IPTCCategories(); - void applyMetadata(QByteArray& iptcData); - void readMetadata(QByteArray& iptcData); + void applyMetadata(TQByteArray& iptcData); + void readMetadata(TQByteArray& iptcData); signals: diff --git a/kipi-plugins/metadataedit/iptccredits.cpp b/kipi-plugins/metadataedit/iptccredits.cpp index 6f5701b..cfdf9de 100644 --- a/kipi-plugins/metadataedit/iptccredits.cpp +++ b/kipi-plugins/metadataedit/iptccredits.cpp @@ -22,13 +22,13 @@ // QT includes. -#include <qlayout.h> -#include <qhgroupbox.h> -#include <qgroupbox.h> -#include <qlabel.h> -#include <qwhatsthis.h> -#include <qvalidator.h> -#include <qcheckbox.h> +#include <tqlayout.h> +#include <tqhgroupbox.h> +#include <tqgroupbox.h> +#include <tqlabel.h> +#include <tqwhatsthis.h> +#include <tqvalidator.h> +#include <tqcheckbox.h> // KDE includes. @@ -69,12 +69,12 @@ public: contactCheck = 0; } - QCheckBox *copyrightCheck; - QCheckBox *bylineCheck; - QCheckBox *bylineTitleCheck; - QCheckBox *creditCheck; - QCheckBox *sourceCheck; - QCheckBox *contactCheck; + TQCheckBox *copyrightCheck; + TQCheckBox *bylineCheck; + TQCheckBox *bylineTitleCheck; + TQCheckBox *creditCheck; + TQCheckBox *sourceCheck; + TQCheckBox *contactCheck; KLineEdit *copyrightEdit; KLineEdit *bylineEdit; @@ -84,80 +84,80 @@ public: KLineEdit *contactEdit; }; -IPTCCredits::IPTCCredits(QWidget* parent) - : QWidget(parent) +IPTCCredits::IPTCCredits(TQWidget* tqparent) + : TQWidget(tqparent) { d = new IPTCCreditsPriv; - QVBoxLayout *vlay = new QVBoxLayout( parent, 0, KDialog::spacingHint() ); + TQVBoxLayout *vlay = new TQVBoxLayout( tqparent, 0, KDialog::spacingHint() ); // IPTC only accept printable Ascii char. - QRegExp asciiRx("[\x20-\x7F]+$"); - QValidator *asciiValidator = new QRegExpValidator(asciiRx, this); + TQRegExp asciiRx("[\x20-\x7F]+$"); + TQValidator *asciiValidator = new TQRegExpValidator(asciiRx, TQT_TQOBJECT(this)); // -------------------------------------------------------- - d->copyrightCheck = new QCheckBox(i18n("Copyright:"), parent); - d->copyrightEdit = new KLineEdit(parent); + d->copyrightCheck = new TQCheckBox(i18n("Copyright:"), tqparent); + d->copyrightEdit = new KLineEdit(tqparent); d->copyrightEdit->setValidator(asciiValidator); d->copyrightEdit->setMaxLength(128); vlay->addWidget(d->copyrightCheck); vlay->addWidget(d->copyrightEdit); - QWhatsThis::add(d->copyrightEdit, i18n("<p>Set here the necessary copyright notice. This field is limited " + TQWhatsThis::add(d->copyrightEdit, i18n("<p>Set here the necessary copyright notice. This field is limited " "to 128 ASCII characters.")); // -------------------------------------------------------- - d->bylineCheck = new QCheckBox(i18n("Byline:"), parent); - d->bylineEdit = new KLineEdit(parent); + d->bylineCheck = new TQCheckBox(i18n("Byline:"), tqparent); + d->bylineEdit = new KLineEdit(tqparent); d->bylineEdit->setValidator(asciiValidator); d->bylineEdit->setMaxLength(32); vlay->addWidget(d->bylineCheck); vlay->addWidget(d->bylineEdit); - QWhatsThis::add(d->bylineEdit, i18n("<p>Set here the name of content creator. This field is limited " + TQWhatsThis::add(d->bylineEdit, i18n("<p>Set here the name of content creator. This field is limited " "to 32 ASCII characters.")); // -------------------------------------------------------- - d->bylineTitleCheck = new QCheckBox(i18n("Byline Title:"), parent); - d->bylineTitleEdit = new KLineEdit(parent); + d->bylineTitleCheck = new TQCheckBox(i18n("Byline Title:"), tqparent); + d->bylineTitleEdit = new KLineEdit(tqparent); d->bylineTitleEdit->setValidator(asciiValidator); d->bylineTitleEdit->setMaxLength(32); vlay->addWidget(d->bylineTitleCheck); vlay->addWidget(d->bylineTitleEdit); - QWhatsThis::add(d->bylineTitleEdit, i18n("<p>Set here the title of content creator. This field is limited " + TQWhatsThis::add(d->bylineTitleEdit, i18n("<p>Set here the title of content creator. This field is limited " "to 32 ASCII characters.")); // -------------------------------------------------------- - d->creditCheck = new QCheckBox(i18n("Credit:"), parent); - d->creditEdit = new KLineEdit(parent); + d->creditCheck = new TQCheckBox(i18n("Credit:"), tqparent); + d->creditEdit = new KLineEdit(tqparent); d->creditEdit->setValidator(asciiValidator); d->creditEdit->setMaxLength(32); vlay->addWidget(d->creditCheck); vlay->addWidget(d->creditEdit); - QWhatsThis::add(d->creditEdit, i18n("<p>Set here the content provider. " + TQWhatsThis::add(d->creditEdit, i18n("<p>Set here the content provider. " "This field is limited to 32 ASCII characters.")); // -------------------------------------------------------- - d->sourceCheck = new QCheckBox(i18n("Source:"), parent); - d->sourceEdit = new KLineEdit(parent); + d->sourceCheck = new TQCheckBox(i18n("Source:"), tqparent); + d->sourceEdit = new KLineEdit(tqparent); d->sourceEdit->setValidator(asciiValidator); d->sourceEdit->setMaxLength(32); vlay->addWidget(d->sourceCheck); vlay->addWidget(d->sourceEdit); - QWhatsThis::add(d->sourceEdit, i18n("<p>Set here the original owner of content. " + TQWhatsThis::add(d->sourceEdit, i18n("<p>Set here the original owner of content. " "This field is limited to 32 ASCII characters.")); // -------------------------------------------------------- - d->contactCheck = new QCheckBox(i18n("Contact:"), parent); - d->contactEdit = new KLineEdit(parent); + d->contactCheck = new TQCheckBox(i18n("Contact:"), tqparent); + d->contactEdit = new KLineEdit(tqparent); d->contactEdit->setValidator(asciiValidator); d->contactEdit->setMaxLength(128); vlay->addWidget(d->contactCheck); vlay->addWidget(d->contactEdit); - QWhatsThis::add(d->contactEdit, i18n("<p>Set here the person or organisation to contact. " + TQWhatsThis::add(d->contactEdit, i18n("<p>Set here the person or organisation to contact. " "This field is limited to 128 ASCII characters.")); // -------------------------------------------------------- @@ -167,70 +167,70 @@ IPTCCredits::IPTCCredits(QWidget* parent) "text tags only support the printable " "<b><a href='http://en.wikipedia.org/wiki/Ascii'>ASCII</a></b> " "characters set and limit strings size. " - "Use contextual help for details.</b>"), parent); + "Use contextual help for details.</b>"), tqparent); vlay->addWidget(note); vlay->addStretch(); // -------------------------------------------------------- - connect(d->copyrightCheck, SIGNAL(toggled(bool)), - d->copyrightEdit, SLOT(setEnabled(bool))); + connect(d->copyrightCheck, TQT_SIGNAL(toggled(bool)), + d->copyrightEdit, TQT_SLOT(setEnabled(bool))); - connect(d->bylineCheck, SIGNAL(toggled(bool)), - d->bylineEdit, SLOT(setEnabled(bool))); + connect(d->bylineCheck, TQT_SIGNAL(toggled(bool)), + d->bylineEdit, TQT_SLOT(setEnabled(bool))); - connect(d->bylineTitleCheck, SIGNAL(toggled(bool)), - d->bylineTitleEdit, SLOT(setEnabled(bool))); + connect(d->bylineTitleCheck, TQT_SIGNAL(toggled(bool)), + d->bylineTitleEdit, TQT_SLOT(setEnabled(bool))); - connect(d->creditCheck, SIGNAL(toggled(bool)), - d->creditEdit, SLOT(setEnabled(bool))); + connect(d->creditCheck, TQT_SIGNAL(toggled(bool)), + d->creditEdit, TQT_SLOT(setEnabled(bool))); - connect(d->sourceCheck, SIGNAL(toggled(bool)), - d->sourceEdit, SLOT(setEnabled(bool))); + connect(d->sourceCheck, TQT_SIGNAL(toggled(bool)), + d->sourceEdit, TQT_SLOT(setEnabled(bool))); - connect(d->contactCheck, SIGNAL(toggled(bool)), - d->contactEdit, SLOT(setEnabled(bool))); + connect(d->contactCheck, TQT_SIGNAL(toggled(bool)), + d->contactEdit, TQT_SLOT(setEnabled(bool))); // -------------------------------------------------------- - connect(d->copyrightCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->copyrightCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->bylineCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->bylineCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->bylineTitleCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->bylineTitleCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->creditCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->creditCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->sourceCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->sourceCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->contactCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->contactCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); // -------------------------------------------------------- - connect(d->copyrightEdit, SIGNAL(textChanged(const QString &)), - this, SIGNAL(signalModified())); + connect(d->copyrightEdit, TQT_SIGNAL(textChanged(const TQString &)), + this, TQT_SIGNAL(signalModified())); - connect(d->bylineEdit, SIGNAL(textChanged(const QString &)), - this, SIGNAL(signalModified())); + connect(d->bylineEdit, TQT_SIGNAL(textChanged(const TQString &)), + this, TQT_SIGNAL(signalModified())); - connect(d->bylineTitleEdit, SIGNAL(textChanged(const QString &)), - this, SIGNAL(signalModified())); + connect(d->bylineTitleEdit, TQT_SIGNAL(textChanged(const TQString &)), + this, TQT_SIGNAL(signalModified())); - connect(d->creditEdit, SIGNAL(textChanged(const QString &)), - this, SIGNAL(signalModified())); + connect(d->creditEdit, TQT_SIGNAL(textChanged(const TQString &)), + this, TQT_SIGNAL(signalModified())); - connect(d->sourceEdit, SIGNAL(textChanged(const QString &)), - this, SIGNAL(signalModified())); + connect(d->sourceEdit, TQT_SIGNAL(textChanged(const TQString &)), + this, TQT_SIGNAL(signalModified())); - connect(d->contactEdit, SIGNAL(textChanged(const QString &)), - this, SIGNAL(signalModified())); + connect(d->contactEdit, TQT_SIGNAL(textChanged(const TQString &)), + this, TQT_SIGNAL(signalModified())); } IPTCCredits::~IPTCCredits() @@ -238,12 +238,12 @@ IPTCCredits::~IPTCCredits() delete d; } -void IPTCCredits::readMetadata(QByteArray& iptcData) +void IPTCCredits::readMetadata(TQByteArray& iptcData) { blockSignals(true); KExiv2Iface::KExiv2 exiv2Iface; exiv2Iface.setIptc(iptcData); - QString data; + TQString data; d->copyrightEdit->clear(); d->copyrightCheck->setChecked(false); @@ -308,7 +308,7 @@ void IPTCCredits::readMetadata(QByteArray& iptcData) blockSignals(false); } -void IPTCCredits::applyMetadata(QByteArray& iptcData) +void IPTCCredits::applyMetadata(TQByteArray& iptcData) { KExiv2Iface::KExiv2 exiv2Iface; exiv2Iface.setIptc(iptcData); diff --git a/kipi-plugins/metadataedit/iptccredits.h b/kipi-plugins/metadataedit/iptccredits.h index 710d000..cf56067 100644 --- a/kipi-plugins/metadataedit/iptccredits.h +++ b/kipi-plugins/metadataedit/iptccredits.h @@ -23,27 +23,28 @@ #ifndef IPTC_CREDITS_H #define IPTC_CREDITS_H -// Qt includes. +// TQt includes. -#include <qwidget.h> -#include <qcstring.h> +#include <tqwidget.h> +#include <tqcstring.h> namespace KIPIMetadataEditPlugin { class IPTCCreditsPriv; -class IPTCCredits : public QWidget +class IPTCCredits : public TQWidget { Q_OBJECT + TQ_OBJECT public: - IPTCCredits(QWidget* parent); + IPTCCredits(TQWidget* tqparent); ~IPTCCredits(); - void applyMetadata(QByteArray& iptcData); - void readMetadata(QByteArray& iptcData); + void applyMetadata(TQByteArray& iptcData); + void readMetadata(TQByteArray& iptcData); signals: diff --git a/kipi-plugins/metadataedit/iptcdatetime.cpp b/kipi-plugins/metadataedit/iptcdatetime.cpp index 7889805..db68bb6 100644 --- a/kipi-plugins/metadataedit/iptcdatetime.cpp +++ b/kipi-plugins/metadataedit/iptcdatetime.cpp @@ -22,12 +22,12 @@ // QT includes. -#include <qlayout.h> -#include <qlabel.h> -#include <qdatetime.h> -#include <qwhatsthis.h> -#include <qvalidator.h> -#include <qcheckbox.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqdatetime.h> +#include <tqwhatsthis.h> +#include <tqvalidator.h> +#include <tqcheckbox.h> // KDE includes. @@ -78,16 +78,16 @@ public: syncEXIFDateCheck = 0; } - QCheckBox *dateCreatedCheck; - QCheckBox *dateReleasedCheck; - QCheckBox *dateExpiredCheck; - QCheckBox *dateDigitalizedCheck; - QCheckBox *timeCreatedCheck; - QCheckBox *timeReleasedCheck; - QCheckBox *timeExpiredCheck; - QCheckBox *timeDigitalizedCheck; - QCheckBox *syncHOSTDateCheck; - QCheckBox *syncEXIFDateCheck; + TQCheckBox *dateCreatedCheck; + TQCheckBox *dateReleasedCheck; + TQCheckBox *dateExpiredCheck; + TQCheckBox *dateDigitalizedCheck; + TQCheckBox *timeCreatedCheck; + TQCheckBox *timeReleasedCheck; + TQCheckBox *timeExpiredCheck; + TQCheckBox *timeDigitalizedCheck; + TQCheckBox *syncHOSTDateCheck; + TQCheckBox *syncEXIFDateCheck; KDateWidget *dateCreatedSel; KDateWidget *dateReleasedSel; @@ -100,26 +100,26 @@ public: KTimeWidget *timeDigitalizedSel; }; -IPTCDateTime::IPTCDateTime(QWidget* parent) - : QWidget(parent) +IPTCDateTime::IPTCDateTime(TQWidget* tqparent) + : TQWidget(tqparent) { d = new IPTCDateTimePriv; - QGridLayout* grid = new QGridLayout(parent, 11, 2, KDialog::spacingHint()); + TQGridLayout* grid = new TQGridLayout(tqparent, 11, 2, KDialog::spacingHint()); // -------------------------------------------------------- - d->dateCreatedCheck = new QCheckBox(i18n("Creation date"), parent); - d->timeCreatedCheck = new QCheckBox(i18n("Creation time"), parent); - d->dateCreatedSel = new KDateWidget(parent); - d->timeCreatedSel = new KTimeWidget(parent); - d->syncHOSTDateCheck = new QCheckBox(i18n("Sync creation date entered through %1") - .arg(KApplication::kApplication()->aboutData()->appName()), - parent); - d->syncEXIFDateCheck = new QCheckBox(i18n("Sync EXIF creation date"), parent); - KSeparator *line = new KSeparator(Horizontal, parent); - d->dateCreatedSel->setDate(QDate::currentDate()); - d->timeCreatedSel->setTime(QTime::currentTime()); + d->dateCreatedCheck = new TQCheckBox(i18n("Creation date"), tqparent); + d->timeCreatedCheck = new TQCheckBox(i18n("Creation time"), tqparent); + d->dateCreatedSel = new KDateWidget(tqparent); + d->timeCreatedSel = new KTimeWidget(tqparent); + d->syncHOSTDateCheck = new TQCheckBox(i18n("Sync creation date entered through %1") + .tqarg(KApplication::kApplication()->aboutData()->appName()), + tqparent); + d->syncEXIFDateCheck = new TQCheckBox(i18n("Sync EXIF creation date"), tqparent); + KSeparator *line = new KSeparator(Qt::Horizontal, tqparent); + d->dateCreatedSel->setDate(TQDate::tqcurrentDate()); + d->timeCreatedSel->setTime(TQTime::currentTime()); grid->addMultiCellWidget(d->dateCreatedCheck, 0, 0, 0, 0); grid->addMultiCellWidget(d->timeCreatedCheck, 0, 0, 1, 2); grid->addMultiCellWidget(d->dateCreatedSel, 1, 1, 0, 0); @@ -127,60 +127,60 @@ IPTCDateTime::IPTCDateTime(QWidget* parent) grid->addMultiCellWidget(d->syncHOSTDateCheck, 2, 2, 0, 2); grid->addMultiCellWidget(d->syncEXIFDateCheck, 3, 3, 0, 2); grid->addMultiCellWidget(line, 4, 4, 0, 2); - QWhatsThis::add(d->dateCreatedSel, i18n("<p>Set here the creation date of " + TQWhatsThis::add(d->dateCreatedSel, i18n("<p>Set here the creation date of " "intellectual content.")); - QWhatsThis::add(d->timeCreatedSel, i18n("<p>Set here the creation time of " + TQWhatsThis::add(d->timeCreatedSel, i18n("<p>Set here the creation time of " "intellectual content.")); // -------------------------------------------------------- - d->dateReleasedCheck = new QCheckBox(i18n("Release date"), parent); - d->timeReleasedCheck = new QCheckBox(i18n("Release time"), parent); - d->dateReleasedSel = new KDateWidget(parent); - d->timeReleasedSel = new KTimeWidget(parent); - d->dateReleasedSel->setDate(QDate::currentDate()); - d->timeReleasedSel->setTime(QTime::currentTime()); + d->dateReleasedCheck = new TQCheckBox(i18n("Release date"), tqparent); + d->timeReleasedCheck = new TQCheckBox(i18n("Release time"), tqparent); + d->dateReleasedSel = new KDateWidget(tqparent); + d->timeReleasedSel = new KTimeWidget(tqparent); + d->dateReleasedSel->setDate(TQDate::tqcurrentDate()); + d->timeReleasedSel->setTime(TQTime::currentTime()); grid->addMultiCellWidget(d->dateReleasedCheck, 5, 5, 0, 0); grid->addMultiCellWidget(d->timeReleasedCheck, 5, 5, 1, 2); grid->addMultiCellWidget(d->dateReleasedSel, 6, 6, 0, 0); grid->addMultiCellWidget(d->timeReleasedSel, 6, 6, 1, 1); - QWhatsThis::add(d->dateReleasedSel, i18n("<p>Set here the earliest intended usable date of " + TQWhatsThis::add(d->dateReleasedSel, i18n("<p>Set here the earliest intended usable date of " "intellectual content.")); - QWhatsThis::add(d->timeReleasedSel, i18n("<p>Set here the earliest intended usable time of " + TQWhatsThis::add(d->timeReleasedSel, i18n("<p>Set here the earliest intended usable time of " "intellectual content.")); // -------------------------------------------------------- - d->dateExpiredCheck = new QCheckBox(i18n("Expiration date"), parent); - d->timeExpiredCheck = new QCheckBox(i18n("Expiration time"), parent); - d->dateExpiredSel = new KDateWidget(parent); - d->timeExpiredSel = new KTimeWidget(parent); - d->dateExpiredSel->setDate(QDate::currentDate()); - d->timeExpiredSel->setTime(QTime::currentTime()); + d->dateExpiredCheck = new TQCheckBox(i18n("Expiration date"), tqparent); + d->timeExpiredCheck = new TQCheckBox(i18n("Expiration time"), tqparent); + d->dateExpiredSel = new KDateWidget(tqparent); + d->timeExpiredSel = new KTimeWidget(tqparent); + d->dateExpiredSel->setDate(TQDate::tqcurrentDate()); + d->timeExpiredSel->setTime(TQTime::currentTime()); grid->addMultiCellWidget(d->dateExpiredCheck, 7, 7, 0, 0); grid->addMultiCellWidget(d->timeExpiredCheck, 7, 7, 1, 2); grid->addMultiCellWidget(d->dateExpiredSel, 8, 8, 0, 0); grid->addMultiCellWidget(d->timeExpiredSel, 8, 8, 1, 1); - QWhatsThis::add(d->dateExpiredSel, i18n("<p>Set here the latest intended usable date of " + TQWhatsThis::add(d->dateExpiredSel, i18n("<p>Set here the latest intended usable date of " "intellectual content.")); - QWhatsThis::add(d->timeExpiredSel, i18n("<p>Set here the latest intended usable time of " + TQWhatsThis::add(d->timeExpiredSel, i18n("<p>Set here the latest intended usable time of " "intellectual content.")); // -------------------------------------------------------- - d->dateDigitalizedCheck = new QCheckBox(i18n("Digitization date"), parent); - d->timeDigitalizedCheck = new QCheckBox(i18n("Digitization time"), parent); - d->dateDigitalizedSel = new KDateWidget(parent); - d->timeDigitalizedSel = new KTimeWidget(parent); - d->dateDigitalizedSel->setDate(QDate::currentDate()); - d->timeDigitalizedSel->setTime(QTime::currentTime()); + d->dateDigitalizedCheck = new TQCheckBox(i18n("Digitization date"), tqparent); + d->timeDigitalizedCheck = new TQCheckBox(i18n("Digitization time"), tqparent); + d->dateDigitalizedSel = new KDateWidget(tqparent); + d->timeDigitalizedSel = new KTimeWidget(tqparent); + d->dateDigitalizedSel->setDate(TQDate::tqcurrentDate()); + d->timeDigitalizedSel->setTime(TQTime::currentTime()); grid->addMultiCellWidget(d->dateDigitalizedCheck, 9, 9, 0, 0); grid->addMultiCellWidget(d->timeDigitalizedCheck, 9, 9, 1, 2); grid->addMultiCellWidget(d->dateDigitalizedSel, 10, 10, 0, 0); grid->addMultiCellWidget(d->timeDigitalizedSel, 10, 10, 1, 1); - QWhatsThis::add(d->dateDigitalizedSel, i18n("<p>Set here the creation date of " + TQWhatsThis::add(d->dateDigitalizedSel, i18n("<p>Set here the creation date of " "digital representation.")); - QWhatsThis::add(d->timeDigitalizedSel, i18n("<p>Set here the creation time of " + TQWhatsThis::add(d->timeDigitalizedSel, i18n("<p>Set here the creation time of " "digital representation.")); grid->setColStretch(2, 10); @@ -188,87 +188,87 @@ IPTCDateTime::IPTCDateTime(QWidget* parent) // -------------------------------------------------------- - connect(d->dateCreatedCheck, SIGNAL(toggled(bool)), - d->dateCreatedSel, SLOT(setEnabled(bool))); + connect(d->dateCreatedCheck, TQT_SIGNAL(toggled(bool)), + d->dateCreatedSel, TQT_SLOT(setEnabled(bool))); - connect(d->dateReleasedCheck, SIGNAL(toggled(bool)), - d->dateReleasedSel, SLOT(setEnabled(bool))); + connect(d->dateReleasedCheck, TQT_SIGNAL(toggled(bool)), + d->dateReleasedSel, TQT_SLOT(setEnabled(bool))); - connect(d->dateExpiredCheck, SIGNAL(toggled(bool)), - d->dateExpiredSel, SLOT(setEnabled(bool))); + connect(d->dateExpiredCheck, TQT_SIGNAL(toggled(bool)), + d->dateExpiredSel, TQT_SLOT(setEnabled(bool))); - connect(d->dateDigitalizedCheck, SIGNAL(toggled(bool)), - d->dateDigitalizedSel, SLOT(setEnabled(bool))); + connect(d->dateDigitalizedCheck, TQT_SIGNAL(toggled(bool)), + d->dateDigitalizedSel, TQT_SLOT(setEnabled(bool))); - connect(d->timeCreatedCheck, SIGNAL(toggled(bool)), - d->timeCreatedSel, SLOT(setEnabled(bool))); + connect(d->timeCreatedCheck, TQT_SIGNAL(toggled(bool)), + d->timeCreatedSel, TQT_SLOT(setEnabled(bool))); - connect(d->timeReleasedCheck, SIGNAL(toggled(bool)), - d->timeReleasedSel, SLOT(setEnabled(bool))); + connect(d->timeReleasedCheck, TQT_SIGNAL(toggled(bool)), + d->timeReleasedSel, TQT_SLOT(setEnabled(bool))); - connect(d->timeExpiredCheck, SIGNAL(toggled(bool)), - d->timeExpiredSel, SLOT(setEnabled(bool))); + connect(d->timeExpiredCheck, TQT_SIGNAL(toggled(bool)), + d->timeExpiredSel, TQT_SLOT(setEnabled(bool))); - connect(d->timeDigitalizedCheck, SIGNAL(toggled(bool)), - d->timeDigitalizedSel, SLOT(setEnabled(bool))); + connect(d->timeDigitalizedCheck, TQT_SIGNAL(toggled(bool)), + d->timeDigitalizedSel, TQT_SLOT(setEnabled(bool))); - connect(d->dateCreatedCheck, SIGNAL(toggled(bool)), - d->syncHOSTDateCheck, SLOT(setEnabled(bool))); + connect(d->dateCreatedCheck, TQT_SIGNAL(toggled(bool)), + d->syncHOSTDateCheck, TQT_SLOT(setEnabled(bool))); - connect(d->dateCreatedCheck, SIGNAL(toggled(bool)), - d->syncEXIFDateCheck, SLOT(setEnabled(bool))); + connect(d->dateCreatedCheck, TQT_SIGNAL(toggled(bool)), + d->syncEXIFDateCheck, TQT_SLOT(setEnabled(bool))); // -------------------------------------------------------- - connect(d->dateCreatedCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->dateCreatedCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->dateReleasedCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->dateReleasedCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->dateExpiredCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->dateExpiredCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->dateDigitalizedCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->dateDigitalizedCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->timeCreatedCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->timeCreatedCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->timeReleasedCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->timeReleasedCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->timeExpiredCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->timeExpiredCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->timeDigitalizedCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->timeDigitalizedCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); // -------------------------------------------------------- - connect(d->dateCreatedSel, SIGNAL(changed(QDate)), - this, SIGNAL(signalModified())); + connect(d->dateCreatedSel, TQT_SIGNAL(changed(TQDate)), + this, TQT_SIGNAL(signalModified())); - connect(d->dateReleasedSel, SIGNAL(changed(QDate)), - this, SIGNAL(signalModified())); + connect(d->dateReleasedSel, TQT_SIGNAL(changed(TQDate)), + this, TQT_SIGNAL(signalModified())); - connect(d->dateExpiredSel, SIGNAL(changed(QDate)), - this, SIGNAL(signalModified())); + connect(d->dateExpiredSel, TQT_SIGNAL(changed(TQDate)), + this, TQT_SIGNAL(signalModified())); - connect(d->dateDigitalizedSel, SIGNAL(changed(QDate)), - this, SIGNAL(signalModified())); + connect(d->dateDigitalizedSel, TQT_SIGNAL(changed(TQDate)), + this, TQT_SIGNAL(signalModified())); - connect(d->timeCreatedSel, SIGNAL(valueChanged(const QTime &)), - this, SIGNAL(signalModified())); + connect(d->timeCreatedSel, TQT_SIGNAL(valueChanged(const TQTime &)), + this, TQT_SIGNAL(signalModified())); - connect(d->timeReleasedSel, SIGNAL(valueChanged(const QTime &)), - this, SIGNAL(signalModified())); + connect(d->timeReleasedSel, TQT_SIGNAL(valueChanged(const TQTime &)), + this, TQT_SIGNAL(signalModified())); - connect(d->timeExpiredSel, SIGNAL(valueChanged(const QTime &)), - this, SIGNAL(signalModified())); + connect(d->timeExpiredSel, TQT_SIGNAL(valueChanged(const TQTime &)), + this, TQT_SIGNAL(signalModified())); - connect(d->timeDigitalizedSel, SIGNAL(valueChanged(const QTime &)), - this, SIGNAL(signalModified())); + connect(d->timeDigitalizedSel, TQT_SIGNAL(valueChanged(const TQTime &)), + this, TQT_SIGNAL(signalModified())); } IPTCDateTime::~IPTCDateTime() @@ -296,29 +296,29 @@ void IPTCDateTime::setCheckedSyncEXIFDate(bool c) d->syncEXIFDateCheck->setChecked(c); } -QDateTime IPTCDateTime::getIPTCCreationDate() +TQDateTime IPTCDateTime::getIPTCCreationDate() { - return QDateTime(d->dateCreatedSel->date(), d->timeCreatedSel->time()); + return TQDateTime(d->dateCreatedSel->date(), d->timeCreatedSel->time()); } -void IPTCDateTime::readMetadata(QByteArray& iptcData) +void IPTCDateTime::readMetadata(TQByteArray& iptcData) { blockSignals(true); KExiv2Iface::KExiv2 exiv2Iface; exiv2Iface.setIptc(iptcData); - QDate date; - QTime time; - QString dateStr, timeStr; + TQDate date; + TQTime time; + TQString dateStr, timeStr; dateStr = exiv2Iface.getIptcTagString("Iptc.Application2.DateCreated", false); timeStr = exiv2Iface.getIptcTagString("Iptc.Application2.TimeCreated", false); - d->dateCreatedSel->setDate(QDate::currentDate()); + d->dateCreatedSel->setDate(TQDate::tqcurrentDate()); d->dateCreatedCheck->setChecked(false); if (!dateStr.isEmpty()) { - date = QDate::fromString(dateStr, Qt::ISODate); + date = TQDate::fromString(dateStr, Qt::ISODate); if (date.isValid()) { d->dateCreatedSel->setDate(date); @@ -329,11 +329,11 @@ void IPTCDateTime::readMetadata(QByteArray& iptcData) d->syncHOSTDateCheck->setEnabled(d->dateCreatedCheck->isChecked()); d->syncEXIFDateCheck->setEnabled(d->dateCreatedCheck->isChecked()); - d->timeCreatedSel->setTime(QTime::currentTime()); + d->timeCreatedSel->setTime(TQTime::currentTime()); d->timeCreatedCheck->setChecked(false); if (!timeStr.isEmpty()) { - time = QTime::fromString(timeStr, Qt::ISODate); + time = TQTime::fromString(timeStr, Qt::ISODate); if (time.isValid()) { d->timeCreatedSel->setTime(time); @@ -345,11 +345,11 @@ void IPTCDateTime::readMetadata(QByteArray& iptcData) dateStr = exiv2Iface.getIptcTagString("Iptc.Application2.ReleaseDate", false); timeStr = exiv2Iface.getIptcTagString("Iptc.Application2.ReleaseTime", false); - d->dateReleasedSel->setDate(QDate::currentDate()); + d->dateReleasedSel->setDate(TQDate::tqcurrentDate()); d->dateReleasedCheck->setChecked(false); if (!dateStr.isEmpty()) { - date = QDate::fromString(dateStr, Qt::ISODate); + date = TQDate::fromString(dateStr, Qt::ISODate); if (date.isValid()) { d->dateReleasedSel->setDate(date); @@ -358,11 +358,11 @@ void IPTCDateTime::readMetadata(QByteArray& iptcData) } d->dateReleasedSel->setEnabled(d->dateReleasedCheck->isChecked()); - d->timeReleasedSel->setTime(QTime::currentTime()); + d->timeReleasedSel->setTime(TQTime::currentTime()); d->timeReleasedCheck->setChecked(false); if (!timeStr.isEmpty()) { - time = QTime::fromString(timeStr, Qt::ISODate); + time = TQTime::fromString(timeStr, Qt::ISODate); if (time.isValid()) { d->timeReleasedSel->setTime(time); @@ -374,11 +374,11 @@ void IPTCDateTime::readMetadata(QByteArray& iptcData) dateStr = exiv2Iface.getIptcTagString("Iptc.Application2.ExpirationDate", false); timeStr = exiv2Iface.getIptcTagString("Iptc.Application2.ExpirationTime", false); - d->dateExpiredSel->setDate(QDate::currentDate()); + d->dateExpiredSel->setDate(TQDate::tqcurrentDate()); d->dateExpiredCheck->setChecked(false); if (!dateStr.isEmpty()) { - date = QDate::fromString(dateStr, Qt::ISODate); + date = TQDate::fromString(dateStr, Qt::ISODate); if (date.isValid()) { d->dateExpiredSel->setDate(date); @@ -387,11 +387,11 @@ void IPTCDateTime::readMetadata(QByteArray& iptcData) } d->dateExpiredSel->setEnabled(d->dateExpiredCheck->isChecked()); - d->timeExpiredSel->setTime(QTime::currentTime()); + d->timeExpiredSel->setTime(TQTime::currentTime()); d->timeExpiredCheck->setChecked(false); if (!timeStr.isEmpty()) { - time = QTime::fromString(timeStr, Qt::ISODate); + time = TQTime::fromString(timeStr, Qt::ISODate); if (time.isValid()) { d->timeExpiredSel->setTime(time); @@ -403,11 +403,11 @@ void IPTCDateTime::readMetadata(QByteArray& iptcData) dateStr = exiv2Iface.getIptcTagString("Iptc.Application2.DigitizationDate", false); timeStr = exiv2Iface.getIptcTagString("Iptc.Application2.DigitizationTime", false); - d->dateDigitalizedSel->setDate(QDate::currentDate()); + d->dateDigitalizedSel->setDate(TQDate::tqcurrentDate()); d->dateDigitalizedCheck->setChecked(false); if (!dateStr.isEmpty()) { - date = QDate::fromString(dateStr, Qt::ISODate); + date = TQDate::fromString(dateStr, Qt::ISODate); if (date.isValid()) { d->dateDigitalizedSel->setDate(date); @@ -416,11 +416,11 @@ void IPTCDateTime::readMetadata(QByteArray& iptcData) } d->dateDigitalizedSel->setEnabled(d->dateDigitalizedCheck->isChecked()); - d->timeDigitalizedSel->setTime(QTime::currentTime()); + d->timeDigitalizedSel->setTime(TQTime::currentTime()); d->timeDigitalizedCheck->setChecked(false); if (!timeStr.isEmpty()) { - time = QTime::fromString(timeStr, Qt::ISODate); + time = TQTime::fromString(timeStr, Qt::ISODate); if (time.isValid()) { d->timeDigitalizedSel->setTime(time); @@ -432,7 +432,7 @@ void IPTCDateTime::readMetadata(QByteArray& iptcData) blockSignals(false); } -void IPTCDateTime::applyMetadata(QByteArray& exifData, QByteArray& iptcData) +void IPTCDateTime::applyMetadata(TQByteArray& exifData, TQByteArray& iptcData) { KExiv2Iface::KExiv2 exiv2Iface; exiv2Iface.setExif(exifData); @@ -445,7 +445,7 @@ void IPTCDateTime::applyMetadata(QByteArray& exifData, QByteArray& iptcData) if (syncEXIFDateIsChecked()) { exiv2Iface.setExifTagString("Exif.Image.DateTime", - getIPTCCreationDate().toString(QString("yyyy:MM:dd hh:mm:ss")).ascii()); + getIPTCCreationDate().toString(TQString("yyyy:MM:dd hh:mm:ss")).ascii()); } } else diff --git a/kipi-plugins/metadataedit/iptcdatetime.h b/kipi-plugins/metadataedit/iptcdatetime.h index b30ffb5..92d5489 100644 --- a/kipi-plugins/metadataedit/iptcdatetime.h +++ b/kipi-plugins/metadataedit/iptcdatetime.h @@ -23,27 +23,28 @@ #ifndef IPTC_DATETIME_H #define IPTC_DATETIME_H -// Qt includes. +// TQt includes. -#include <qwidget.h> -#include <qcstring.h> +#include <tqwidget.h> +#include <tqcstring.h> namespace KIPIMetadataEditPlugin { class IPTCDateTimePriv; -class IPTCDateTime : public QWidget +class IPTCDateTime : public TQWidget { Q_OBJECT + TQ_OBJECT public: - IPTCDateTime(QWidget* parent); + IPTCDateTime(TQWidget* tqparent); ~IPTCDateTime(); - void applyMetadata(QByteArray& exifData, QByteArray& iptcData); - void readMetadata(QByteArray& iptcData); + void applyMetadata(TQByteArray& exifData, TQByteArray& iptcData); + void readMetadata(TQByteArray& iptcData); bool syncHOSTDateIsChecked(); bool syncEXIFDateIsChecked(); @@ -51,7 +52,7 @@ public: void setCheckedSyncHOSTDate(bool c); void setCheckedSyncEXIFDate(bool c); - QDateTime getIPTCCreationDate(); + TQDateTime getIPTCCreationDate(); signals: diff --git a/kipi-plugins/metadataedit/iptceditdialog.cpp b/kipi-plugins/metadataedit/iptceditdialog.cpp index 4713aea..a4beb35 100644 --- a/kipi-plugins/metadataedit/iptceditdialog.cpp +++ b/kipi-plugins/metadataedit/iptceditdialog.cpp @@ -20,12 +20,12 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qtimer.h> -#include <qframe.h> -#include <qlayout.h> -#include <qpushbutton.h> +#include <tqtimer.h> +#include <tqframe.h> +#include <tqlayout.h> +#include <tqpushbutton.h> // KDE includes. @@ -98,17 +98,17 @@ public: bool modified; bool isReadOnly; - QByteArray exifData; - QByteArray iptcData; + TQByteArray exifData; + TQByteArray iptcData; - QFrame *page_caption; - QFrame *page_datetime; - QFrame *page_subjects; - QFrame *page_keywords; - QFrame *page_categories; - QFrame *page_credits; - QFrame *page_status; - QFrame *page_origin; + TQFrame *page_caption; + TQFrame *page_datetime; + TQFrame *page_subjects; + TQFrame *page_keywords; + TQFrame *page_categories; + TQFrame *page_credits; + TQFrame *page_status; + TQFrame *page_origin; KURL::List urls; @@ -120,7 +120,7 @@ public: IPTCKeywords *keywordsPage; IPTCCategories *categoriesPage; IPTCCredits *creditsPage; - IPTCStatus *statusPage; + IPTCtqStatus *statusPage; IPTCOrigin *originPage; KIPI::Interface *interface; @@ -128,11 +128,11 @@ public: KIPIPlugins::KPAboutData *about; }; -IPTCEditDialog::IPTCEditDialog(QWidget* parent, KURL::List urls, KIPI::Interface *iface) - : KDialogBase(IconList, QString::null, +IPTCEditDialog::IPTCEditDialog(TQWidget* tqparent, KURL::List urls, KIPI::Interface *iface) + : KDialogBase(IconList, TQString(), urls.count() > 1 ? Help|User1|User2|Stretch|Ok|Apply|Close : Help|Stretch|Ok|Apply|Close, - Ok, parent, 0, true, true, + Ok, tqparent, 0, true, true, KStdGuiItem::guiItem(KStdGuiItem::Forward), KStdGuiItem::guiItem(KStdGuiItem::Back) ) { @@ -167,9 +167,9 @@ IPTCEditDialog::IPTCEditDialog(QWidget* parent, KURL::List urls, KIPI::Interface BarIcon("identity", KIcon::SizeMedium)); d->creditsPage = new IPTCCredits(d->page_credits); - d->page_status = addPage(i18n("Status"), i18n("Status Information"), + d->page_status = addPage(i18n("tqStatus"), i18n("tqStatus Information"), BarIcon("messagebox_info", KIcon::SizeMedium)); - d->statusPage = new IPTCStatus(d->page_status); + d->statusPage = new IPTCtqStatus(d->page_status); d->page_origin = addPage(i18n("Origin"), i18n("Origin Information"), BarIcon("www", KIcon::SizeMedium)); @@ -190,34 +190,34 @@ IPTCEditDialog::IPTCEditDialog(QWidget* parent, KURL::List urls, KIPI::Interface KHelpMenu* helpMenu = new KHelpMenu(this, d->about, false); helpMenu->menu()->removeItemAt(0); helpMenu->menu()->insertItem(i18n("Plugin Handbook"), - this, SLOT(slotHelp()), 0, -1, 0); + this, TQT_SLOT(slotHelp()), 0, -1, 0); actionButton(Help)->setPopup( helpMenu->menu() ); // ------------------------------------------------------------ - connect(d->captionPage, SIGNAL(signalModified()), - this, SLOT(slotModified())); + connect(d->captionPage, TQT_SIGNAL(signalModified()), + this, TQT_SLOT(slotModified())); - connect(d->datetimePage, SIGNAL(signalModified()), - this, SLOT(slotModified())); + connect(d->datetimePage, TQT_SIGNAL(signalModified()), + this, TQT_SLOT(slotModified())); - connect(d->subjectsPage, SIGNAL(signalModified()), - this, SLOT(slotModified())); + connect(d->subjectsPage, TQT_SIGNAL(signalModified()), + this, TQT_SLOT(slotModified())); - connect(d->keywordsPage, SIGNAL(signalModified()), - this, SLOT(slotModified())); + connect(d->keywordsPage, TQT_SIGNAL(signalModified()), + this, TQT_SLOT(slotModified())); - connect(d->categoriesPage, SIGNAL(signalModified()), - this, SLOT(slotModified())); + connect(d->categoriesPage, TQT_SIGNAL(signalModified()), + this, TQT_SLOT(slotModified())); - connect(d->creditsPage, SIGNAL(signalModified()), - this, SLOT(slotModified())); + connect(d->creditsPage, TQT_SIGNAL(signalModified()), + this, TQT_SLOT(slotModified())); - connect(d->statusPage, SIGNAL(signalModified()), - this, SLOT(slotModified())); + connect(d->statusPage, TQT_SIGNAL(signalModified()), + this, TQT_SLOT(slotModified())); - connect(d->originPage, SIGNAL(signalModified()), - this, SLOT(slotModified())); + connect(d->originPage, TQT_SIGNAL(signalModified()), + this, TQT_SLOT(slotModified())); // ------------------------------------------------------------ @@ -236,7 +236,7 @@ void IPTCEditDialog::slotHelp() KApplication::kApplication()->invokeHelp("metadataedit", "kipi-plugins"); } -void IPTCEditDialog::closeEvent(QCloseEvent *e) +void IPTCEditDialog::closeEvent(TQCloseEvent *e) { if (!e) return; saveSettings(); @@ -259,7 +259,7 @@ void IPTCEditDialog::readSettings() d->captionPage->setCheckedSyncEXIFComment(config.readBoolEntry("Sync EXIF Comment", true)); d->datetimePage->setCheckedSyncHOSTDate(config.readBoolEntry("Sync Host Date", true)); d->datetimePage->setCheckedSyncEXIFDate(config.readBoolEntry("Sync EXIF Date", true)); - resize(configDialogSize(config, QString("IPTC Edit Dialog"))); + resize(configDialogSize(config, TQString("IPTC Edit Dialog"))); } void IPTCEditDialog::saveSettings() @@ -272,7 +272,7 @@ void IPTCEditDialog::saveSettings() config.writeEntry("Sync EXIF Comment", d->captionPage->syncEXIFCommentIsChecked()); config.writeEntry("Sync Host Date", d->datetimePage->syncHOSTDateIsChecked()); config.writeEntry("Sync EXIF Date", d->datetimePage->syncEXIFDateIsChecked()); - saveDialogSize(config, QString("IPTC Edit Dialog")); + saveDialogSize(config, TQString("IPTC Edit Dialog")); config.sync(); } @@ -302,12 +302,12 @@ void IPTCEditDialog::slotItemChanged() d->page_origin->setEnabled(!d->isReadOnly); enableButton(Apply, !d->isReadOnly); - setCaption(QString("%1 (%2/%3) - %4") - .arg((*d->currItem).filename()) - .arg(d->urls.findIndex(*(d->currItem))+1) - .arg(d->urls.count()) - .arg(i18n("Edit IPTC Metadata")) + - (d->isReadOnly ? QString(" - ") + i18n("(read only)") : QString::null)); + setCaption(TQString("%1 (%2/%3) - %4") + .tqarg((*d->currItem).filename()) + .tqarg(d->urls.tqfindIndex(*(d->currItem))+1) + .tqarg(d->urls.count()) + .tqarg(i18n("Edit IPTC Metadata")) + + (d->isReadOnly ? TQString(" - ") + i18n("(read only)") : TQString())); enableButton(User1, *(d->currItem) != d->urls.last()); enableButton(User2, *(d->currItem) != d->urls.first()); enableButton(Apply, false); @@ -376,14 +376,14 @@ void IPTCEditDialog::slotOk() accept(); } -bool IPTCEditDialog::eventFilter(QObject *, QEvent *e) +bool IPTCEditDialog::eventFilter(TQObject *, TQEvent *e) { - if ( e->type() == QEvent::KeyPress ) + if ( e->type() == TQEvent::KeyPress ) { - QKeyEvent *k = (QKeyEvent *)e; + TQKeyEvent *k = (TQKeyEvent *)e; - if (k->state() == Qt::ControlButton && - (k->key() == Qt::Key_Enter || k->key() == Qt::Key_Return)) + if (k->state() == TQt::ControlButton && + (k->key() == TQt::Key_Enter || k->key() == TQt::Key_Return)) { slotApply(); @@ -392,8 +392,8 @@ bool IPTCEditDialog::eventFilter(QObject *, QEvent *e) return true; } - else if (k->state() == Qt::ShiftButton && - (k->key() == Qt::Key_Enter || k->key() == Qt::Key_Return)) + else if (k->state() == TQt::ShiftButton && + (k->key() == TQt::Key_Enter || k->key() == TQt::Key_Return)) { slotApply(); diff --git a/kipi-plugins/metadataedit/iptceditdialog.h b/kipi-plugins/metadataedit/iptceditdialog.h index 7db7df6..5c17ff7 100644 --- a/kipi-plugins/metadataedit/iptceditdialog.h +++ b/kipi-plugins/metadataedit/iptceditdialog.h @@ -23,9 +23,9 @@ #ifndef IPTCEDITDIALOG_H #define IPTCEDITDIALOG_H -// Qt includes. +// TQt includes. -#include <qcstring.h> +#include <tqcstring.h> // KDE includes. @@ -40,10 +40,11 @@ class IPTCEditDialogDialogPrivate; class IPTCEditDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - IPTCEditDialog(QWidget* parent, KURL::List urls, KIPI::Interface *iface); + IPTCEditDialog(TQWidget* tqparent, KURL::List urls, KIPI::Interface *iface); ~IPTCEditDialog(); public slots: @@ -58,8 +59,8 @@ protected slots: protected: - void closeEvent(QCloseEvent *); - bool eventFilter(QObject *, QEvent *); + void closeEvent(TQCloseEvent *); + bool eventFilter(TQObject *, TQEvent *); private slots: diff --git a/kipi-plugins/metadataedit/iptckeywords.cpp b/kipi-plugins/metadataedit/iptckeywords.cpp index 1307cbb..7787f2c 100644 --- a/kipi-plugins/metadataedit/iptckeywords.cpp +++ b/kipi-plugins/metadataedit/iptckeywords.cpp @@ -22,12 +22,12 @@ // QT includes. -#include <qlayout.h> -#include <qlabel.h> -#include <qwhatsthis.h> -#include <qvalidator.h> -#include <qcheckbox.h> -#include <qpushbutton.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqwhatsthis.h> +#include <tqvalidator.h> +#include <tqcheckbox.h> +#include <tqpushbutton.h> // KDE includes. @@ -63,44 +63,44 @@ public: keywordEdit = 0; } - QStringList oldKeywords; + TQStringList oldKeywords; - QPushButton *addKeywordButton; - QPushButton *delKeywordButton; + TQPushButton *addKeywordButton; + TQPushButton *delKeywordButton; - QCheckBox *keywordsCheck; + TQCheckBox *keywordsCheck; KLineEdit *keywordEdit; KListBox *keywordsBox; }; -IPTCKeywords::IPTCKeywords(QWidget* parent) - : QWidget(parent) +IPTCKeywords::IPTCKeywords(TQWidget* tqparent) + : TQWidget(tqparent) { d = new IPTCKeywordsPriv; - QGridLayout *grid = new QGridLayout(parent, 5, 2, 0, KDialog::spacingHint()); - grid->setAlignment( Qt::AlignTop ); + TQGridLayout *grid = new TQGridLayout(tqparent, 5, 2, 0, KDialog::spacingHint()); + grid->tqsetAlignment( TQt::AlignTop ); // IPTC only accept printable Ascii char. - QRegExp asciiRx("[\x20-\x7F]+$"); - QValidator *asciiValidator = new QRegExpValidator(asciiRx, this); + TQRegExp asciiRx("[\x20-\x7F]+$"); + TQValidator *asciiValidator = new TQRegExpValidator(asciiRx, TQT_TQOBJECT(this)); // -------------------------------------------------------- - d->keywordsCheck = new QCheckBox(i18n("Use information retrieval words:"), parent); + d->keywordsCheck = new TQCheckBox(i18n("Use information retrieval words:"), tqparent); - d->keywordEdit = new KLineEdit(parent); + d->keywordEdit = new KLineEdit(tqparent); d->keywordEdit->setValidator(asciiValidator); d->keywordEdit->setMaxLength(64); - QWhatsThis::add(d->keywordEdit, i18n("<p>Enter here a new keyword. " + TQWhatsThis::add(d->keywordEdit, i18n("<p>Enter here a new keyword. " "This field is limited to 64 ASCII characters.")); - d->keywordsBox = new KListBox(parent); - d->keywordsBox->setVScrollBarMode(QScrollView::AlwaysOn); + d->keywordsBox = new KListBox(tqparent); + d->keywordsBox->setVScrollBarMode(TQScrollView::AlwaysOn); - d->addKeywordButton = new QPushButton( i18n("&Add"), parent); - d->delKeywordButton = new QPushButton( i18n("&Delete"), parent); + d->addKeywordButton = new TQPushButton( i18n("&Add"), tqparent); + d->delKeywordButton = new TQPushButton( i18n("&Delete"), tqparent); d->addKeywordButton->setIconSet(SmallIcon("add")); d->delKeywordButton->setIconSet(SmallIcon("remove")); d->delKeywordButton->setEnabled(false); @@ -118,7 +118,7 @@ IPTCKeywords::IPTCKeywords(QWidget* parent) "text tags only support the printable " "<b><a href='http://en.wikipedia.org/wiki/Ascii'>ASCII</a></b> " "characters set and limit strings size. " - "Use contextual help for details.</b>"), parent); + "Use contextual help for details.</b>"), tqparent); note->setMaximumWidth(150); grid->addMultiCellWidget(note, 4, 4, 1, 1); @@ -127,39 +127,39 @@ IPTCKeywords::IPTCKeywords(QWidget* parent) // -------------------------------------------------------- - connect(d->keywordsBox, SIGNAL(selectionChanged()), - this, SLOT(slotKeywordSelectionChanged())); + connect(d->keywordsBox, TQT_SIGNAL(selectionChanged()), + this, TQT_SLOT(slotKeywordSelectionChanged())); - connect(d->addKeywordButton, SIGNAL(clicked()), - this, SLOT(slotAddKeyword())); + connect(d->addKeywordButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotAddKeyword())); - connect(d->delKeywordButton, SIGNAL(clicked()), - this, SLOT(slotDelKeyword())); + connect(d->delKeywordButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotDelKeyword())); // -------------------------------------------------------- - connect(d->keywordsCheck, SIGNAL(toggled(bool)), - d->keywordEdit, SLOT(setEnabled(bool))); + connect(d->keywordsCheck, TQT_SIGNAL(toggled(bool)), + d->keywordEdit, TQT_SLOT(setEnabled(bool))); - connect(d->keywordsCheck, SIGNAL(toggled(bool)), - d->keywordsBox, SLOT(setEnabled(bool))); + connect(d->keywordsCheck, TQT_SIGNAL(toggled(bool)), + d->keywordsBox, TQT_SLOT(setEnabled(bool))); - connect(d->keywordsCheck, SIGNAL(toggled(bool)), - d->addKeywordButton, SLOT(setEnabled(bool))); + connect(d->keywordsCheck, TQT_SIGNAL(toggled(bool)), + d->addKeywordButton, TQT_SLOT(setEnabled(bool))); - connect(d->keywordsCheck, SIGNAL(toggled(bool)), - d->delKeywordButton, SLOT(setEnabled(bool))); + connect(d->keywordsCheck, TQT_SIGNAL(toggled(bool)), + d->delKeywordButton, TQT_SLOT(setEnabled(bool))); // -------------------------------------------------------- - connect(d->keywordsCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->keywordsCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->addKeywordButton, SIGNAL(clicked()), - this, SIGNAL(signalModified())); + connect(d->addKeywordButton, TQT_SIGNAL(clicked()), + this, TQT_SIGNAL(signalModified())); - connect(d->delKeywordButton, SIGNAL(clicked()), - this, SIGNAL(signalModified())); + connect(d->delKeywordButton, TQT_SIGNAL(clicked()), + this, TQT_SIGNAL(signalModified())); } IPTCKeywords::~IPTCKeywords() @@ -173,7 +173,7 @@ void IPTCKeywords::slotDelKeyword() if (index == -1) return; - QListBoxItem* item = d->keywordsBox->item(index); + TQListBoxItem* item = d->keywordsBox->item(index); if (!item) return; delete item; } @@ -188,11 +188,11 @@ void IPTCKeywords::slotKeywordSelectionChanged() void IPTCKeywords::slotAddKeyword() { - QString newKeyword = d->keywordEdit->text(); + TQString newKeyword = d->keywordEdit->text(); if (newKeyword.isEmpty()) return; bool found = false; - for (QListBoxItem *item = d->keywordsBox->firstItem(); + for (TQListBoxItem *item = d->keywordsBox->firstItem(); item; item = item->next()) { if (newKeyword == item->text()) @@ -206,7 +206,7 @@ void IPTCKeywords::slotAddKeyword() d->keywordsBox->insertItem(newKeyword); } -void IPTCKeywords::readMetadata(QByteArray& iptcData) +void IPTCKeywords::readMetadata(TQByteArray& iptcData) { blockSignals(true); KExiv2Iface::KExiv2 exiv2Iface; @@ -228,20 +228,20 @@ void IPTCKeywords::readMetadata(QByteArray& iptcData) blockSignals(false); } -void IPTCKeywords::applyMetadata(QByteArray& iptcData) +void IPTCKeywords::applyMetadata(TQByteArray& iptcData) { KExiv2Iface::KExiv2 exiv2Iface; exiv2Iface.setIptc(iptcData); - QStringList newKeywords; + TQStringList newKeywords; - for (QListBoxItem *item = d->keywordsBox->firstItem(); + for (TQListBoxItem *item = d->keywordsBox->firstItem(); item; item = item->next()) newKeywords.append(item->text()); if (d->keywordsCheck->isChecked()) exiv2Iface.setImageKeywords(d->oldKeywords, newKeywords); else - exiv2Iface.setImageKeywords(d->oldKeywords, QStringList()); + exiv2Iface.setImageKeywords(d->oldKeywords, TQStringList()); iptcData = exiv2Iface.getIptc(); } diff --git a/kipi-plugins/metadataedit/iptckeywords.h b/kipi-plugins/metadataedit/iptckeywords.h index 3518adb..7e9f638 100644 --- a/kipi-plugins/metadataedit/iptckeywords.h +++ b/kipi-plugins/metadataedit/iptckeywords.h @@ -23,27 +23,28 @@ #ifndef IPTC_KEYWORDS_H #define IPTC_KEYWORDS_H -// Qt includes. +// TQt includes. -#include <qwidget.h> -#include <qcstring.h> +#include <tqwidget.h> +#include <tqcstring.h> namespace KIPIMetadataEditPlugin { class IPTCKeywordsPriv; -class IPTCKeywords : public QWidget +class IPTCKeywords : public TQWidget { Q_OBJECT + TQ_OBJECT public: - IPTCKeywords(QWidget* parent); + IPTCKeywords(TQWidget* tqparent); ~IPTCKeywords(); - void applyMetadata(QByteArray& iptcData); - void readMetadata(QByteArray& iptcData); + void applyMetadata(TQByteArray& iptcData); + void readMetadata(TQByteArray& iptcData); signals: diff --git a/kipi-plugins/metadataedit/iptcorigin.cpp b/kipi-plugins/metadataedit/iptcorigin.cpp index df8d569..6e79338 100644 --- a/kipi-plugins/metadataedit/iptcorigin.cpp +++ b/kipi-plugins/metadataedit/iptcorigin.cpp @@ -22,13 +22,13 @@ // QT includes. -#include <qlayout.h> -#include <qlabel.h> -#include <qwhatsthis.h> -#include <qvalidator.h> -#include <qlistbox.h> -#include <qcombobox.h> -#include <qmap.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqwhatsthis.h> +#include <tqvalidator.h> +#include <tqlistbox.h> +#include <tqcombobox.h> +#include <tqmap.h> // KDE includes. @@ -248,7 +248,7 @@ public: countryCodeMap.insert( "POL", i18n("Poland") ); countryCodeMap.insert( "PRT", i18n("Portugal") ); countryCodeMap.insert( "PRI", i18n("Puerto Rico") ); - countryCodeMap.insert( "QAT", i18n("Qatar") ); + countryCodeMap.insert( "TQAT", i18n("Qatar") ); countryCodeMap.insert( "REU", i18n("Reunion") ); countryCodeMap.insert( "ROU", i18n("Romania") ); countryCodeMap.insert( "RUS", i18n("Russian Federation") ); @@ -330,18 +330,18 @@ public: countryCodeMap.insert( "JRO", i18n("Jericho") ); } - typedef QMap<QString, QString> CountryCodeMap; + typedef TQMap<TQString, TQString> CountryCodeMap; CountryCodeMap countryCodeMap; - QComboBox *countryCB; + TQComboBox *countryCB; - QCheckBox *objectNameCheck; - QCheckBox *cityCheck; - QCheckBox *sublocationCheck; - QCheckBox *provinceCheck; - QCheckBox *locationCheck; - QCheckBox *originalTransCheck; + TQCheckBox *objectNameCheck; + TQCheckBox *cityCheck; + TQCheckBox *sublocationCheck; + TQCheckBox *provinceCheck; + TQCheckBox *locationCheck; + TQCheckBox *originalTransCheck; KLineEdit *objectNameEdit; KLineEdit *cityEdit; @@ -353,83 +353,83 @@ public: MetadataCheckBox *countryCheck; }; -IPTCOrigin::IPTCOrigin(QWidget* parent) - : QWidget(parent) +IPTCOrigin::IPTCOrigin(TQWidget* tqparent) + : TQWidget(tqparent) { d = new IPTCOriginPriv; - QGridLayout* grid = new QGridLayout(parent, 12, 2, KDialog::spacingHint()); + TQGridLayout* grid = new TQGridLayout(tqparent, 12, 2, KDialog::spacingHint()); // IPTC only accept printable Ascii char. - QRegExp asciiRx("[\x20-\x7F]+$"); - QValidator *asciiValidator = new QRegExpValidator(asciiRx, this); + TQRegExp asciiRx("[\x20-\x7F]+$"); + TQValidator *asciiValidator = new TQRegExpValidator(asciiRx, TQT_TQOBJECT(this)); // -------------------------------------------------------- - d->objectNameCheck = new QCheckBox(i18n("Object name:"), parent); - d->objectNameEdit = new KLineEdit(parent); + d->objectNameCheck = new TQCheckBox(i18n("Object name:"), tqparent); + d->objectNameEdit = new KLineEdit(tqparent); d->objectNameEdit->setValidator(asciiValidator); d->objectNameEdit->setMaxLength(64); - QWhatsThis::add(d->objectNameEdit, i18n("<p>Set here the shorthand reference of content. " + TQWhatsThis::add(d->objectNameEdit, i18n("<p>Set here the shorthand reference of content. " "This field is limited to 64 ASCII characters.")); // -------------------------------------------------------- - d->locationCheck = new QCheckBox(i18n("Location:"), parent); - d->locationEdit = new KLineEdit(parent); + d->locationCheck = new TQCheckBox(i18n("Location:"), tqparent); + d->locationEdit = new KLineEdit(tqparent); d->locationEdit->setValidator(asciiValidator); d->locationEdit->setMaxLength(64); - QWhatsThis::add(d->locationEdit, i18n("<p>Set here the full country name referenced by the content. " + TQWhatsThis::add(d->locationEdit, i18n("<p>Set here the full country name referenced by the content. " "This field is limited to 64 ASCII characters.")); // -------------------------------------------------------- - d->cityCheck = new QCheckBox(i18n("City:"), parent); - d->cityEdit = new KLineEdit(parent); + d->cityCheck = new TQCheckBox(i18n("City:"), tqparent); + d->cityEdit = new KLineEdit(tqparent); d->cityEdit->setValidator(asciiValidator); d->cityEdit->setMaxLength(32); - QWhatsThis::add(d->cityEdit, i18n("<p>Set here the city of content origin. " + TQWhatsThis::add(d->cityEdit, i18n("<p>Set here the city of content origin. " "This field is limited to 32 ASCII characters.")); // -------------------------------------------------------- - d->sublocationCheck = new QCheckBox(i18n("Sublocation:"), parent); - d->sublocationEdit = new KLineEdit(parent); + d->sublocationCheck = new TQCheckBox(i18n("Sublocation:"), tqparent); + d->sublocationEdit = new KLineEdit(tqparent); d->sublocationEdit->setValidator(asciiValidator); d->sublocationEdit->setMaxLength(32); - QWhatsThis::add(d->sublocationEdit, i18n("<p>Set here the content location within city. " + TQWhatsThis::add(d->sublocationEdit, i18n("<p>Set here the content location within city. " "This field is limited to 32 ASCII characters.")); // -------------------------------------------------------- - d->provinceCheck = new QCheckBox(i18n("State/Province:"), parent); - d->provinceEdit = new KLineEdit(parent); + d->provinceCheck = new TQCheckBox(i18n("State/Province:"), tqparent); + d->provinceEdit = new KLineEdit(tqparent); d->provinceEdit->setValidator(asciiValidator); d->provinceEdit->setMaxLength(32); - QWhatsThis::add(d->provinceEdit, i18n("<p>Set here the Province or State of content origin. " + TQWhatsThis::add(d->provinceEdit, i18n("<p>Set here the Province or State of content origin. " "This field is limited to 32 ASCII characters.")); // -------------------------------------------------------- - d->countryCheck = new MetadataCheckBox(i18n("Country:"), parent); - d->countryCB = new QComboBox(false, parent); + d->countryCheck = new MetadataCheckBox(i18n("Country:"), tqparent); + d->countryCB = new TQComboBox(false, tqparent); for (IPTCOriginPriv::CountryCodeMap::Iterator it = d->countryCodeMap.begin(); it != d->countryCodeMap.end(); ++it ) - d->countryCB->insertItem(QString("%1 - %2").arg(it.key()).arg(it.data())); + d->countryCB->insertItem(TQString("%1 - %2").tqarg(it.key()).tqarg(it.data())); d->countryCB->listBox()->sort(); - QWhatsThis::add(d->countryCB, i18n("<p>Select here country name of content origin.")); + TQWhatsThis::add(d->countryCB, i18n("<p>Select here country name of content origin.")); // -------------------------------------------------------- - d->originalTransCheck = new QCheckBox(i18n("Original transmission reference:"), parent); - d->originalTransEdit = new KLineEdit(parent); + d->originalTransCheck = new TQCheckBox(i18n("Original transmission reference:"), tqparent); + d->originalTransEdit = new KLineEdit(tqparent); d->originalTransEdit->setValidator(asciiValidator); d->originalTransEdit->setMaxLength(32); - QWhatsThis::add(d->originalTransEdit, i18n("<p>Set here the location of original content transmission. " + TQWhatsThis::add(d->originalTransEdit, i18n("<p>Set here the location of original content transmission. " "This field is limited to 32 ASCII characters.")); // -------------------------------------------------------- @@ -439,7 +439,7 @@ IPTCOrigin::IPTCOrigin(QWidget* parent) "text tags only support the printable " "<b><a href='http://en.wikipedia.org/wiki/Ascii'>ASCII</a></b> " "characters set and limit strings size. " - "Use contextual help for details.</b>"), parent); + "Use contextual help for details.</b>"), tqparent); // -------------------------------------------------------- @@ -447,7 +447,7 @@ IPTCOrigin::IPTCOrigin(QWidget* parent) grid->addMultiCellWidget(d->objectNameEdit, 1, 1, 0, 2); grid->addMultiCellWidget(d->locationCheck, 2, 2, 0, 0); grid->addMultiCellWidget(d->locationEdit, 2, 2, 1, 2); - grid->addMultiCellWidget(new KSeparator(Qt::Horizontal, parent), 3, 3, 0, 2); + grid->addMultiCellWidget(new KSeparator(Qt::Horizontal, tqparent), 3, 3, 0, 2); grid->addMultiCellWidget(d->cityCheck, 4, 4, 0, 0); grid->addMultiCellWidget(d->cityEdit, 4, 4, 1, 2); grid->addMultiCellWidget(d->sublocationCheck, 5, 5, 0, 0); @@ -456,7 +456,7 @@ IPTCOrigin::IPTCOrigin(QWidget* parent) grid->addMultiCellWidget(d->provinceEdit, 6, 6, 1, 2); grid->addMultiCellWidget(d->countryCheck, 7, 7, 0, 0); grid->addMultiCellWidget(d->countryCB, 7, 7, 1, 2); - grid->addMultiCellWidget(new KSeparator(Qt::Horizontal, parent), 8, 8, 0, 2); + grid->addMultiCellWidget(new KSeparator(Qt::Horizontal, tqparent), 8, 8, 0, 2); grid->addMultiCellWidget(d->originalTransCheck, 9, 9, 0, 2); grid->addMultiCellWidget(d->originalTransEdit, 10, 10, 0, 2); grid->addMultiCellWidget(note, 11, 11, 0, 2); @@ -465,72 +465,72 @@ IPTCOrigin::IPTCOrigin(QWidget* parent) // -------------------------------------------------------- - connect(d->objectNameCheck, SIGNAL(toggled(bool)), - d->objectNameEdit, SLOT(setEnabled(bool))); + connect(d->objectNameCheck, TQT_SIGNAL(toggled(bool)), + d->objectNameEdit, TQT_SLOT(setEnabled(bool))); - connect(d->cityCheck, SIGNAL(toggled(bool)), - d->cityEdit, SLOT(setEnabled(bool))); + connect(d->cityCheck, TQT_SIGNAL(toggled(bool)), + d->cityEdit, TQT_SLOT(setEnabled(bool))); - connect(d->sublocationCheck, SIGNAL(toggled(bool)), - d->sublocationEdit, SLOT(setEnabled(bool))); + connect(d->sublocationCheck, TQT_SIGNAL(toggled(bool)), + d->sublocationEdit, TQT_SLOT(setEnabled(bool))); - connect(d->provinceCheck, SIGNAL(toggled(bool)), - d->provinceEdit, SLOT(setEnabled(bool))); + connect(d->provinceCheck, TQT_SIGNAL(toggled(bool)), + d->provinceEdit, TQT_SLOT(setEnabled(bool))); - connect(d->countryCheck, SIGNAL(toggled(bool)), - d->countryCB, SLOT(setEnabled(bool))); + connect(d->countryCheck, TQT_SIGNAL(toggled(bool)), + d->countryCB, TQT_SLOT(setEnabled(bool))); - connect(d->locationCheck, SIGNAL(toggled(bool)), - d->locationEdit, SLOT(setEnabled(bool))); + connect(d->locationCheck, TQT_SIGNAL(toggled(bool)), + d->locationEdit, TQT_SLOT(setEnabled(bool))); - connect(d->originalTransCheck, SIGNAL(toggled(bool)), - d->originalTransEdit, SLOT(setEnabled(bool))); + connect(d->originalTransCheck, TQT_SIGNAL(toggled(bool)), + d->originalTransEdit, TQT_SLOT(setEnabled(bool))); // -------------------------------------------------------- - connect(d->objectNameCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->objectNameCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->cityCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->cityCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->sublocationCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->sublocationCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->provinceCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->provinceCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->countryCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->countryCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->locationCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->locationCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->originalTransCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->originalTransCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); // -------------------------------------------------------- - connect(d->countryCB, SIGNAL(activated(int)), - this, SIGNAL(signalModified())); + connect(d->countryCB, TQT_SIGNAL(activated(int)), + this, TQT_SIGNAL(signalModified())); - connect(d->objectNameEdit, SIGNAL(textChanged(const QString &)), - this, SIGNAL(signalModified())); + connect(d->objectNameEdit, TQT_SIGNAL(textChanged(const TQString &)), + this, TQT_SIGNAL(signalModified())); - connect(d->cityEdit, SIGNAL(textChanged(const QString &)), - this, SIGNAL(signalModified())); + connect(d->cityEdit, TQT_SIGNAL(textChanged(const TQString &)), + this, TQT_SIGNAL(signalModified())); - connect(d->sublocationEdit, SIGNAL(textChanged(const QString &)), - this, SIGNAL(signalModified())); + connect(d->sublocationEdit, TQT_SIGNAL(textChanged(const TQString &)), + this, TQT_SIGNAL(signalModified())); - connect(d->provinceEdit, SIGNAL(textChanged(const QString &)), - this, SIGNAL(signalModified())); + connect(d->provinceEdit, TQT_SIGNAL(textChanged(const TQString &)), + this, TQT_SIGNAL(signalModified())); - connect(d->locationEdit, SIGNAL(textChanged(const QString &)), - this, SIGNAL(signalModified())); + connect(d->locationEdit, TQT_SIGNAL(textChanged(const TQString &)), + this, TQT_SIGNAL(signalModified())); - connect(d->originalTransEdit, SIGNAL(textChanged(const QString &)), - this, SIGNAL(signalModified())); + connect(d->originalTransEdit, TQT_SIGNAL(textChanged(const TQString &)), + this, TQT_SIGNAL(signalModified())); } IPTCOrigin::~IPTCOrigin() @@ -538,12 +538,12 @@ IPTCOrigin::~IPTCOrigin() delete d; } -void IPTCOrigin::readMetadata(QByteArray& iptcData) +void IPTCOrigin::readMetadata(TQByteArray& iptcData) { blockSignals(true); KExiv2Iface::KExiv2 exiv2Iface; exiv2Iface.setIptc(iptcData); - QString data; + TQString data; d->objectNameEdit->clear(); d->objectNameCheck->setChecked(false); @@ -628,7 +628,7 @@ void IPTCOrigin::readMetadata(QByteArray& iptcData) blockSignals(false); } -void IPTCOrigin::applyMetadata(QByteArray& iptcData) +void IPTCOrigin::applyMetadata(TQByteArray& iptcData) { KExiv2Iface::KExiv2 exiv2Iface; exiv2Iface.setIptc(iptcData); @@ -660,8 +660,8 @@ void IPTCOrigin::applyMetadata(QByteArray& iptcData) if (d->countryCheck->isChecked()) { - QString countryName = d->countryCB->currentText().mid(6); - QString countryCode = d->countryCB->currentText().left(3); + TQString countryName = d->countryCB->currentText().mid(6); + TQString countryCode = d->countryCB->currentText().left(3); exiv2Iface.setIptcTagString("Iptc.Application2.CountryCode", countryCode); exiv2Iface.setIptcTagString("Iptc.Application2.CountryName", countryName); } diff --git a/kipi-plugins/metadataedit/iptcorigin.h b/kipi-plugins/metadataedit/iptcorigin.h index 77cc193..443e5b4 100644 --- a/kipi-plugins/metadataedit/iptcorigin.h +++ b/kipi-plugins/metadataedit/iptcorigin.h @@ -23,27 +23,28 @@ #ifndef IPTC_ORIGIN_H #define IPTC_ORIGIN_H -// Qt includes. +// TQt includes. -#include <qwidget.h> -#include <qcstring.h> +#include <tqwidget.h> +#include <tqcstring.h> namespace KIPIMetadataEditPlugin { class IPTCOriginPriv; -class IPTCOrigin : public QWidget +class IPTCOrigin : public TQWidget { Q_OBJECT + TQ_OBJECT public: - IPTCOrigin(QWidget* parent); + IPTCOrigin(TQWidget* tqparent); ~IPTCOrigin(); - void applyMetadata(QByteArray& iptcData); - void readMetadata(QByteArray& iptcData); + void applyMetadata(TQByteArray& iptcData); + void readMetadata(TQByteArray& iptcData); signals: diff --git a/kipi-plugins/metadataedit/iptcstatus.cpp b/kipi-plugins/metadataedit/iptcstatus.cpp index 4b86c83..d55c405 100644 --- a/kipi-plugins/metadataedit/iptcstatus.cpp +++ b/kipi-plugins/metadataedit/iptcstatus.cpp @@ -22,11 +22,11 @@ // QT includes. -#include <qlayout.h> -#include <qcombobox.h> -#include <qlabel.h> -#include <qwhatsthis.h> -#include <qvalidator.h> +#include <tqlayout.h> +#include <tqcombobox.h> +#include <tqlabel.h> +#include <tqwhatsthis.h> +#include <tqvalidator.h> // KDE includes. @@ -69,13 +69,13 @@ public: JobIDCheck = 0; } - QCheckBox *statusCheck; - QCheckBox *JobIDCheck; + TQCheckBox *statusCheck; + TQCheckBox *JobIDCheck; - QComboBox *priorityCB; - QComboBox *objectCycleCB; - QComboBox *objectTypeCB; - QComboBox *objectAttributeCB; + TQComboBox *priorityCB; + TQComboBox *objectCycleCB; + TQComboBox *objectTypeCB; + TQComboBox *objectAttributeCB; KLineEdit *statusEdit; KLineEdit *objectTypeDescEdit; @@ -88,32 +88,32 @@ public: MetadataCheckBox *objectAttributeCheck; }; -IPTCStatus::IPTCStatus(QWidget* parent) - : QWidget(parent) +IPTCtqStatus::IPTCtqStatus(TQWidget* tqparent) + : TQWidget(tqparent) { d = new IPTCStatusPriv; - QGridLayout* grid = new QGridLayout(parent, 11, 2, KDialog::spacingHint()); + TQGridLayout* grid = new TQGridLayout(tqparent, 11, 2, KDialog::spacingHint()); // IPTC only accept printable Ascii char. - QRegExp asciiRx("[\x20-\x7F]+$"); - QValidator *asciiValidator = new QRegExpValidator(asciiRx, this); + TQRegExp asciiRx("[\x20-\x7F]+$"); + TQValidator *asciiValidator = new TQRegExpValidator(asciiRx, TQT_TQOBJECT(this)); // -------------------------------------------------------- - d->statusCheck = new QCheckBox(i18n("Edit Status:"), parent); - d->statusEdit = new KLineEdit(parent); + d->statusCheck = new TQCheckBox(i18n("Edit tqStatus:"), tqparent); + d->statusEdit = new KLineEdit(tqparent); d->statusEdit->setValidator(asciiValidator); d->statusEdit->setMaxLength(64); grid->addMultiCellWidget(d->statusCheck, 0, 0, 0, 2); grid->addMultiCellWidget(d->statusEdit, 1, 1, 0, 2); - QWhatsThis::add(d->statusEdit, i18n("<p>Set here the content status. This field is limited " + TQWhatsThis::add(d->statusEdit, i18n("<p>Set here the content status. This field is limited " "to 64 ASCII characters.")); // -------------------------------------------------------- - d->priorityCheck = new MetadataCheckBox(i18n("Priority:"), parent); - d->priorityCB = new QComboBox(false, parent); + d->priorityCheck = new MetadataCheckBox(i18n("Priority:"), tqparent); + d->priorityCB = new TQComboBox(false, tqparent); d->priorityCB->insertItem(i18n("0: None"), 0); d->priorityCB->insertItem(i18n("1: High"), 1); d->priorityCB->insertItem("2", 2); @@ -125,24 +125,24 @@ IPTCStatus::IPTCStatus(QWidget* parent) d->priorityCB->insertItem(i18n("8: Low"), 8); grid->addMultiCellWidget(d->priorityCheck, 2, 2, 0, 0); grid->addMultiCellWidget(d->priorityCB, 2, 2, 1, 1); - QWhatsThis::add(d->priorityCB, i18n("<p>Select here the editorial urgency of content.")); + TQWhatsThis::add(d->priorityCB, i18n("<p>Select here the editorial urgency of content.")); // -------------------------------------------------------- - d->objectCycleCheck = new MetadataCheckBox(i18n("Object Cycle:"), parent); - d->objectCycleCB = new QComboBox(false, parent); + d->objectCycleCheck = new MetadataCheckBox(i18n("Object Cycle:"), tqparent); + d->objectCycleCB = new TQComboBox(false, tqparent); d->objectCycleCB->insertItem(i18n("Morning"), 0); d->objectCycleCB->insertItem(i18n("Afternoon"), 1); d->objectCycleCB->insertItem(i18n("Evening"), 2); grid->addMultiCellWidget(d->objectCycleCheck, 3, 3, 0, 0); grid->addMultiCellWidget(d->objectCycleCB, 3, 3, 1, 1); - QWhatsThis::add(d->objectCycleCB, i18n("<p>Select here the editorial cycle of content.")); + TQWhatsThis::add(d->objectCycleCB, i18n("<p>Select here the editorial cycle of content.")); // -------------------------------------------------------- - d->objectTypeCheck = new MetadataCheckBox(i18n("Object Type:"), parent); - d->objectTypeCB = new QComboBox(false, parent); - d->objectTypeDescEdit = new KLineEdit(parent); + d->objectTypeCheck = new MetadataCheckBox(i18n("Object Type:"), tqparent); + d->objectTypeCB = new TQComboBox(false, tqparent); + d->objectTypeDescEdit = new KLineEdit(tqparent); d->objectTypeDescEdit->setValidator(asciiValidator); d->objectTypeDescEdit->setMaxLength(64); d->objectTypeCB->insertItem(i18n("News"), 0); @@ -151,15 +151,15 @@ IPTCStatus::IPTCStatus(QWidget* parent) grid->addMultiCellWidget(d->objectTypeCheck, 4, 4, 0, 0); grid->addMultiCellWidget(d->objectTypeCB, 4, 4, 1, 1); grid->addMultiCellWidget(d->objectTypeDescEdit, 5, 5, 0, 2); - QWhatsThis::add(d->objectTypeCB, i18n("<p>Select here the editorial type of content.")); - QWhatsThis::add(d->objectTypeDescEdit, i18n("<p>Set here the editorial type description of content. " + TQWhatsThis::add(d->objectTypeCB, i18n("<p>Select here the editorial type of content.")); + TQWhatsThis::add(d->objectTypeDescEdit, i18n("<p>Set here the editorial type description of content. " "This field is limited to 64 ASCII characters.")); // -------------------------------------------------------- - d->objectAttributeCheck = new MetadataCheckBox(i18n("Object Attribute:"), parent); - d->objectAttributeCB = new QComboBox(false, parent); - d->objectAttributeDescEdit = new KLineEdit(parent); + d->objectAttributeCheck = new MetadataCheckBox(i18n("Object Attribute:"), tqparent); + d->objectAttributeCB = new TQComboBox(false, tqparent); + d->objectAttributeDescEdit = new KLineEdit(tqparent); d->objectAttributeDescEdit->setValidator(asciiValidator); d->objectAttributeDescEdit->setMaxLength(64); d->objectAttributeCB->insertItem(i18n("Current"), 0); @@ -187,19 +187,19 @@ IPTCStatus::IPTCStatus(QWidget* parent) grid->addMultiCellWidget(d->objectAttributeCheck, 6, 6, 0, 0); grid->addMultiCellWidget(d->objectAttributeCB, 6, 6, 1, 2); grid->addMultiCellWidget(d->objectAttributeDescEdit, 7, 7, 0, 2); - QWhatsThis::add(d->objectAttributeCB, i18n("<p>Select here the editorial attribute of content.")); - QWhatsThis::add(d->objectAttributeDescEdit, i18n("<p>Set here the editorial attribute description of " + TQWhatsThis::add(d->objectAttributeCB, i18n("<p>Select here the editorial attribute of content.")); + TQWhatsThis::add(d->objectAttributeDescEdit, i18n("<p>Set here the editorial attribute description of " "content. This field is limited to 64 ASCII characters.")); // -------------------------------------------------------- - d->JobIDCheck = new QCheckBox(i18n("Job Identification:"), parent); - d->JobIDEdit = new KLineEdit(parent); + d->JobIDCheck = new TQCheckBox(i18n("Job Identification:"), tqparent); + d->JobIDEdit = new KLineEdit(tqparent); d->JobIDEdit->setValidator(asciiValidator); d->JobIDEdit->setMaxLength(32); grid->addMultiCellWidget(d->JobIDCheck, 8, 8, 0, 2); grid->addMultiCellWidget(d->JobIDEdit, 9, 9, 0, 2); - QWhatsThis::add(d->JobIDEdit, i18n("<p>Set here the string that identifies content that recurs. " + TQWhatsThis::add(d->JobIDEdit, i18n("<p>Set here the string that identifies content that recurs. " "This field is limited to 32 ASCII characters.")); // -------------------------------------------------------- @@ -209,7 +209,7 @@ IPTCStatus::IPTCStatus(QWidget* parent) "text tags only support the printable " "<b><a href='http://en.wikipedia.org/wiki/Ascii'>ASCII</a></b> " "characters set and limit strings size. " - "Use contextual help for details.</b>"), parent); + "Use contextual help for details.</b>"), tqparent); grid->addMultiCellWidget(note, 10, 10, 0, 2); grid->setColStretch(2, 10); @@ -217,99 +217,99 @@ IPTCStatus::IPTCStatus(QWidget* parent) // -------------------------------------------------------- - connect(d->priorityCheck, SIGNAL(toggled(bool)), - d->priorityCB, SLOT(setEnabled(bool))); + connect(d->priorityCheck, TQT_SIGNAL(toggled(bool)), + d->priorityCB, TQT_SLOT(setEnabled(bool))); - connect(d->objectCycleCheck, SIGNAL(toggled(bool)), - d->objectCycleCB, SLOT(setEnabled(bool))); + connect(d->objectCycleCheck, TQT_SIGNAL(toggled(bool)), + d->objectCycleCB, TQT_SLOT(setEnabled(bool))); - connect(d->objectTypeCheck, SIGNAL(toggled(bool)), - d->objectTypeCB, SLOT(setEnabled(bool))); + connect(d->objectTypeCheck, TQT_SIGNAL(toggled(bool)), + d->objectTypeCB, TQT_SLOT(setEnabled(bool))); - connect(d->objectTypeCheck, SIGNAL(toggled(bool)), - d->objectTypeDescEdit, SLOT(setEnabled(bool))); + connect(d->objectTypeCheck, TQT_SIGNAL(toggled(bool)), + d->objectTypeDescEdit, TQT_SLOT(setEnabled(bool))); - connect(d->objectAttributeCheck, SIGNAL(toggled(bool)), - d->objectAttributeCB, SLOT(setEnabled(bool))); + connect(d->objectAttributeCheck, TQT_SIGNAL(toggled(bool)), + d->objectAttributeCB, TQT_SLOT(setEnabled(bool))); - connect(d->objectAttributeCheck, SIGNAL(toggled(bool)), - d->objectAttributeDescEdit, SLOT(setEnabled(bool))); + connect(d->objectAttributeCheck, TQT_SIGNAL(toggled(bool)), + d->objectAttributeDescEdit, TQT_SLOT(setEnabled(bool))); - connect(d->statusCheck, SIGNAL(toggled(bool)), - d->statusEdit, SLOT(setEnabled(bool))); + connect(d->statusCheck, TQT_SIGNAL(toggled(bool)), + d->statusEdit, TQT_SLOT(setEnabled(bool))); - connect(d->JobIDCheck, SIGNAL(toggled(bool)), - d->JobIDEdit, SLOT(setEnabled(bool))); + connect(d->JobIDCheck, TQT_SIGNAL(toggled(bool)), + d->JobIDEdit, TQT_SLOT(setEnabled(bool))); // -------------------------------------------------------- - connect(d->priorityCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->priorityCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->objectCycleCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->objectCycleCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->objectTypeCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->objectTypeCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->objectTypeCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->objectTypeCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->objectAttributeCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->objectAttributeCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->objectAttributeCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->objectAttributeCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->statusCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->statusCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->JobIDCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->JobIDCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); // -------------------------------------------------------- - connect(d->priorityCB, SIGNAL(activated(int)), - this, SIGNAL(signalModified())); + connect(d->priorityCB, TQT_SIGNAL(activated(int)), + this, TQT_SIGNAL(signalModified())); - connect(d->objectCycleCB, SIGNAL(activated(int)), - this, SIGNAL(signalModified())); + connect(d->objectCycleCB, TQT_SIGNAL(activated(int)), + this, TQT_SIGNAL(signalModified())); - connect(d->objectTypeCB, SIGNAL(activated(int)), - this, SIGNAL(signalModified())); + connect(d->objectTypeCB, TQT_SIGNAL(activated(int)), + this, TQT_SIGNAL(signalModified())); - connect(d->objectAttributeCB, SIGNAL(activated(int)), - this, SIGNAL(signalModified())); + connect(d->objectAttributeCB, TQT_SIGNAL(activated(int)), + this, TQT_SIGNAL(signalModified())); - connect(d->statusEdit, SIGNAL(textChanged(const QString &)), - this, SIGNAL(signalModified())); + connect(d->statusEdit, TQT_SIGNAL(textChanged(const TQString &)), + this, TQT_SIGNAL(signalModified())); - connect(d->objectTypeDescEdit, SIGNAL(textChanged(const QString &)), - this, SIGNAL(signalModified())); + connect(d->objectTypeDescEdit, TQT_SIGNAL(textChanged(const TQString &)), + this, TQT_SIGNAL(signalModified())); - connect(d->objectAttributeDescEdit, SIGNAL(textChanged(const QString &)), - this, SIGNAL(signalModified())); + connect(d->objectAttributeDescEdit, TQT_SIGNAL(textChanged(const TQString &)), + this, TQT_SIGNAL(signalModified())); - connect(d->JobIDEdit, SIGNAL(textChanged(const QString &)), - this, SIGNAL(signalModified())); + connect(d->JobIDEdit, TQT_SIGNAL(textChanged(const TQString &)), + this, TQT_SIGNAL(signalModified())); } -IPTCStatus::~IPTCStatus() +IPTCtqStatus::~IPTCtqStatus() { delete d; } -void IPTCStatus::readMetadata(QByteArray& iptcData) +void IPTCtqStatus::readMetadata(TQByteArray& iptcData) { blockSignals(true); KExiv2Iface::KExiv2 exiv2Iface; exiv2Iface.setIptc(iptcData); - QString data; + TQString data; int val; d->statusEdit->clear(); d->statusCheck->setChecked(false); - data = exiv2Iface.getIptcTagString("Iptc.Application2.EditStatus", false); + data = exiv2Iface.getIptcTagString("Iptc.Application2.EdittqStatus", false); if (!data.isNull()) { d->statusEdit->setText(data); @@ -338,17 +338,17 @@ void IPTCStatus::readMetadata(QByteArray& iptcData) data = exiv2Iface.getIptcTagString("Iptc.Application2.ObjectCycle", false); if (!data.isNull()) { - if (data == QString("a")) + if (data == TQString("a")) { d->objectCycleCB->setCurrentItem(0); d->objectCycleCheck->setChecked(true); } - else if (data == QString("b")) + else if (data == TQString("b")) { d->objectCycleCB->setCurrentItem(1); d->objectCycleCheck->setChecked(true); } - else if (data == QString("c")) + else if (data == TQString("c")) { d->objectCycleCB->setCurrentItem(2); d->objectCycleCheck->setChecked(true); @@ -364,7 +364,7 @@ void IPTCStatus::readMetadata(QByteArray& iptcData) data = exiv2Iface.getIptcTagString("Iptc.Application2.ObjectType", false); if (!data.isNull()) { - QString typeSec = data.section(":", 0, 0); + TQString typeSec = data.section(":", 0, 0); if (!typeSec.isEmpty()) { int type = typeSec.toInt()-1; @@ -387,7 +387,7 @@ void IPTCStatus::readMetadata(QByteArray& iptcData) data = exiv2Iface.getIptcTagString("Iptc.Application2.ObjectAttribute", false); if (!data.isNull()) { - QString attSec = data.section(":", 0, 0); + TQString attSec = data.section(":", 0, 0); if (!attSec.isEmpty()) { int att = attSec.toInt()-1; @@ -417,18 +417,18 @@ void IPTCStatus::readMetadata(QByteArray& iptcData) blockSignals(false); } -void IPTCStatus::applyMetadata(QByteArray& iptcData) +void IPTCtqStatus::applyMetadata(TQByteArray& iptcData) { KExiv2Iface::KExiv2 exiv2Iface; exiv2Iface.setIptc(iptcData); if (d->statusCheck->isChecked()) - exiv2Iface.setIptcTagString("Iptc.Application2.EditStatus", d->statusEdit->text()); + exiv2Iface.setIptcTagString("Iptc.Application2.EdittqStatus", d->statusEdit->text()); else - exiv2Iface.removeIptcTag("Iptc.Application2.EditStatus"); + exiv2Iface.removeIptcTag("Iptc.Application2.EdittqStatus"); if (d->priorityCheck->isChecked()) - exiv2Iface.setIptcTagString("Iptc.Application2.Urgency", QString::number(d->priorityCB->currentItem())); + exiv2Iface.setIptcTagString("Iptc.Application2.Urgency", TQString::number(d->priorityCB->currentItem())); else if (d->priorityCheck->isValid()) exiv2Iface.removeIptcTag("Iptc.Application2.Urgency"); @@ -437,15 +437,15 @@ void IPTCStatus::applyMetadata(QByteArray& iptcData) switch (d->objectCycleCB->currentItem()) { case(0): - exiv2Iface.setIptcTagString("Iptc.Application2.ObjectCycle", QString("a")); + exiv2Iface.setIptcTagString("Iptc.Application2.ObjectCycle", TQString("a")); break; case(1): - exiv2Iface.setIptcTagString("Iptc.Application2.ObjectCycle", QString("b")); + exiv2Iface.setIptcTagString("Iptc.Application2.ObjectCycle", TQString("b")); break; case(2): - exiv2Iface.setIptcTagString("Iptc.Application2.ObjectCycle", QString("c")); + exiv2Iface.setIptcTagString("Iptc.Application2.ObjectCycle", TQString("c")); break; } } @@ -454,9 +454,9 @@ void IPTCStatus::applyMetadata(QByteArray& iptcData) if (d->objectTypeCheck->isChecked()) { - QString objectType; + TQString objectType; objectType.sprintf("%2d", d->objectTypeCB->currentItem()+1); - objectType.append(QString(":%1").arg(d->objectTypeDescEdit->text())); + objectType.append(TQString(":%1").tqarg(d->objectTypeDescEdit->text())); exiv2Iface.setIptcTagString("Iptc.Application2.ObjectType", objectType); } else if (d->objectTypeCheck->isValid()) @@ -464,9 +464,9 @@ void IPTCStatus::applyMetadata(QByteArray& iptcData) if (d->objectAttributeCheck->isChecked()) { - QString objectAttribute; + TQString objectAttribute; objectAttribute.sprintf("%3d", d->objectAttributeCB->currentItem()+1); - objectAttribute.append(QString(":%1").arg(d->objectAttributeDescEdit->text())); + objectAttribute.append(TQString(":%1").tqarg(d->objectAttributeDescEdit->text())); exiv2Iface.setIptcTagString("Iptc.Application2.ObjectAttribute", objectAttribute); } else if (d->objectAttributeCheck->isValid()) @@ -477,7 +477,7 @@ void IPTCStatus::applyMetadata(QByteArray& iptcData) else exiv2Iface.removeIptcTag("Iptc.Application2.FixtureId"); - exiv2Iface.setImageProgramId(QString("Kipi-plugins"), QString(kipiplugins_version)); + exiv2Iface.setImageProgramId(TQString("Kipi-plugins"), TQString(kipiplugins_version)); iptcData = exiv2Iface.getIptc(); } diff --git a/kipi-plugins/metadataedit/iptcstatus.h b/kipi-plugins/metadataedit/iptcstatus.h index ea0f537..3108a49 100644 --- a/kipi-plugins/metadataedit/iptcstatus.h +++ b/kipi-plugins/metadataedit/iptcstatus.h @@ -23,27 +23,28 @@ #ifndef IPTC_STATUS_H #define IPTC_STATUS_H -// Qt includes. +// TQt includes. -#include <qwidget.h> -#include <qcstring.h> +#include <tqwidget.h> +#include <tqcstring.h> namespace KIPIMetadataEditPlugin { class IPTCStatusPriv; -class IPTCStatus : public QWidget +class IPTCtqStatus : public TQWidget { Q_OBJECT + TQ_OBJECT public: - IPTCStatus(QWidget* parent); - ~IPTCStatus(); + IPTCtqStatus(TQWidget* tqparent); + ~IPTCtqStatus(); - void applyMetadata(QByteArray& iptcData); - void readMetadata(QByteArray& iptcData); + void applyMetadata(TQByteArray& iptcData); + void readMetadata(TQByteArray& iptcData); signals: diff --git a/kipi-plugins/metadataedit/iptcsubjects.cpp b/kipi-plugins/metadataedit/iptcsubjects.cpp index f1bb14c..11ad303 100644 --- a/kipi-plugins/metadataedit/iptcsubjects.cpp +++ b/kipi-plugins/metadataedit/iptcsubjects.cpp @@ -22,12 +22,12 @@ // QT includes. -#include <qlayout.h> -#include <qlabel.h> -#include <qwhatsthis.h> -#include <qvalidator.h> -#include <qcheckbox.h> -#include <qpushbutton.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqwhatsthis.h> +#include <tqvalidator.h> +#include <tqcheckbox.h> +#include <tqpushbutton.h> // KDE includes. @@ -63,44 +63,44 @@ public: subjectEdit = 0; } - QStringList oldSubjects; + TQStringList oldSubjects; - QPushButton *addSubjectButton; - QPushButton *delSubjectButton; + TQPushButton *addSubjectButton; + TQPushButton *delSubjectButton; - QCheckBox *subjectsCheck; + TQCheckBox *subjectsCheck; KLineEdit *subjectEdit; KListBox *subjectsBox; }; -IPTCSubjects::IPTCSubjects(QWidget* parent) - : QWidget(parent) +IPTCSubjects::IPTCSubjects(TQWidget* tqparent) + : TQWidget(tqparent) { d = new IPTCSubjectsPriv; - QGridLayout *grid = new QGridLayout(parent, 5, 2, 0, KDialog::spacingHint()); - grid->setAlignment( Qt::AlignTop ); + TQGridLayout *grid = new TQGridLayout(tqparent, 5, 2, 0, KDialog::spacingHint()); + grid->tqsetAlignment( TQt::AlignTop ); // IPTC only accept printable Ascii char. - QRegExp asciiRx("[\x20-\x7F]+$"); - QValidator *asciiValidator = new QRegExpValidator(asciiRx, this); + TQRegExp asciiRx("[\x20-\x7F]+$"); + TQValidator *asciiValidator = new TQRegExpValidator(asciiRx, TQT_TQOBJECT(this)); // -------------------------------------------------------- - d->subjectsCheck = new QCheckBox(i18n("Use structured definition of the subject matter:"), parent); + d->subjectsCheck = new TQCheckBox(i18n("Use structured definition of the subject matter:"), tqparent); - d->subjectEdit = new KLineEdit(parent); + d->subjectEdit = new KLineEdit(tqparent); d->subjectEdit->setValidator(asciiValidator); d->subjectEdit->setMaxLength(236); - QWhatsThis::add(d->subjectEdit, i18n("<p>Enter here a new subject. " + TQWhatsThis::add(d->subjectEdit, i18n("<p>Enter here a new subject. " "This field is limited to 236 ASCII characters.")); - d->subjectsBox = new KListBox(parent); - d->subjectsBox->setVScrollBarMode(QScrollView::AlwaysOn); + d->subjectsBox = new KListBox(tqparent); + d->subjectsBox->setVScrollBarMode(TQScrollView::AlwaysOn); - d->addSubjectButton = new QPushButton( i18n("&Add"), parent); - d->delSubjectButton = new QPushButton( i18n("&Delete"), parent); + d->addSubjectButton = new TQPushButton( i18n("&Add"), tqparent); + d->delSubjectButton = new TQPushButton( i18n("&Delete"), tqparent); d->addSubjectButton->setIconSet(SmallIcon("add")); d->delSubjectButton->setIconSet(SmallIcon("remove")); d->delSubjectButton->setEnabled(false); @@ -118,7 +118,7 @@ IPTCSubjects::IPTCSubjects(QWidget* parent) "text tags only support the printable " "<b><a href='http://en.wikipedia.org/wiki/Ascii'>ASCII</a></b> " "characters set and limit strings size. " - "Use contextual help for details.</b>"), parent); + "Use contextual help for details.</b>"), tqparent); note->setMaximumWidth(150); grid->addMultiCellWidget(note, 4, 4, 1, 1); @@ -127,39 +127,39 @@ IPTCSubjects::IPTCSubjects(QWidget* parent) // -------------------------------------------------------- - connect(d->subjectsBox, SIGNAL(selectionChanged()), - this, SLOT(slotSubjectSelectionChanged())); + connect(d->subjectsBox, TQT_SIGNAL(selectionChanged()), + this, TQT_SLOT(slotSubjectSelectionChanged())); - connect(d->addSubjectButton, SIGNAL(clicked()), - this, SLOT(slotAddSubject())); + connect(d->addSubjectButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotAddSubject())); - connect(d->delSubjectButton, SIGNAL(clicked()), - this, SLOT(slotDelSubject())); + connect(d->delSubjectButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotDelSubject())); // -------------------------------------------------------- - connect(d->subjectsCheck, SIGNAL(toggled(bool)), - d->subjectEdit, SLOT(setEnabled(bool))); + connect(d->subjectsCheck, TQT_SIGNAL(toggled(bool)), + d->subjectEdit, TQT_SLOT(setEnabled(bool))); - connect(d->subjectsCheck, SIGNAL(toggled(bool)), - d->subjectsBox, SLOT(setEnabled(bool))); + connect(d->subjectsCheck, TQT_SIGNAL(toggled(bool)), + d->subjectsBox, TQT_SLOT(setEnabled(bool))); - connect(d->subjectsCheck, SIGNAL(toggled(bool)), - d->addSubjectButton, SLOT(setEnabled(bool))); + connect(d->subjectsCheck, TQT_SIGNAL(toggled(bool)), + d->addSubjectButton, TQT_SLOT(setEnabled(bool))); - connect(d->subjectsCheck, SIGNAL(toggled(bool)), - d->delSubjectButton, SLOT(setEnabled(bool))); + connect(d->subjectsCheck, TQT_SIGNAL(toggled(bool)), + d->delSubjectButton, TQT_SLOT(setEnabled(bool))); // -------------------------------------------------------- - connect(d->subjectsCheck, SIGNAL(toggled(bool)), - this, SIGNAL(signalModified())); + connect(d->subjectsCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(signalModified())); - connect(d->addSubjectButton, SIGNAL(clicked()), - this, SIGNAL(signalModified())); + connect(d->addSubjectButton, TQT_SIGNAL(clicked()), + this, TQT_SIGNAL(signalModified())); - connect(d->delSubjectButton, SIGNAL(clicked()), - this, SIGNAL(signalModified())); + connect(d->delSubjectButton, TQT_SIGNAL(clicked()), + this, TQT_SIGNAL(signalModified())); } IPTCSubjects::~IPTCSubjects() @@ -173,7 +173,7 @@ void IPTCSubjects::slotDelSubject() if (index == -1) return; - QListBoxItem* item = d->subjectsBox->item(index); + TQListBoxItem* item = d->subjectsBox->item(index); if (!item) return; delete item; } @@ -188,11 +188,11 @@ void IPTCSubjects::slotSubjectSelectionChanged() void IPTCSubjects::slotAddSubject() { - QString newSubject = d->subjectEdit->text(); + TQString newSubject = d->subjectEdit->text(); if (newSubject.isEmpty()) return; bool found = false; - for (QListBoxItem *item = d->subjectsBox->firstItem(); + for (TQListBoxItem *item = d->subjectsBox->firstItem(); item; item = item->next()) { if (newSubject == item->text()) @@ -206,7 +206,7 @@ void IPTCSubjects::slotAddSubject() d->subjectsBox->insertItem(newSubject); } -void IPTCSubjects::readMetadata(QByteArray& iptcData) +void IPTCSubjects::readMetadata(TQByteArray& iptcData) { blockSignals(true); KExiv2Iface::KExiv2 exiv2Iface; @@ -228,20 +228,20 @@ void IPTCSubjects::readMetadata(QByteArray& iptcData) blockSignals(false); } -void IPTCSubjects::applyMetadata(QByteArray& iptcData) +void IPTCSubjects::applyMetadata(TQByteArray& iptcData) { KExiv2Iface::KExiv2 exiv2Iface; exiv2Iface.setIptc(iptcData); - QStringList newSubjects; + TQStringList newSubjects; - for (QListBoxItem *item = d->subjectsBox->firstItem(); + for (TQListBoxItem *item = d->subjectsBox->firstItem(); item; item = item->next()) newSubjects.append(item->text()); if (d->subjectsCheck->isChecked()) exiv2Iface.setImageSubjects(d->oldSubjects, newSubjects); else - exiv2Iface.setImageSubjects(d->oldSubjects, QStringList()); + exiv2Iface.setImageSubjects(d->oldSubjects, TQStringList()); iptcData = exiv2Iface.getIptc(); } diff --git a/kipi-plugins/metadataedit/iptcsubjects.h b/kipi-plugins/metadataedit/iptcsubjects.h index 2c0d566..46e03f3 100644 --- a/kipi-plugins/metadataedit/iptcsubjects.h +++ b/kipi-plugins/metadataedit/iptcsubjects.h @@ -23,27 +23,28 @@ #ifndef IPTC_SUBJECTS_H #define IPTC_SUBJECTS_H -// Qt includes. +// TQt includes. -#include <qwidget.h> -#include <qcstring.h> +#include <tqwidget.h> +#include <tqcstring.h> namespace KIPIMetadataEditPlugin { class IPTCSubjectsPriv; -class IPTCSubjects : public QWidget +class IPTCSubjects : public TQWidget { Q_OBJECT + TQ_OBJECT public: - IPTCSubjects(QWidget* parent); + IPTCSubjects(TQWidget* tqparent); ~IPTCSubjects(); - void applyMetadata(QByteArray& iptcData); - void readMetadata(QByteArray& iptcData); + void applyMetadata(TQByteArray& iptcData); + void readMetadata(TQByteArray& iptcData); signals: diff --git a/kipi-plugins/metadataedit/metadatacheckbox.cpp b/kipi-plugins/metadataedit/metadatacheckbox.cpp index 5dd33c9..01a8f5d 100644 --- a/kipi-plugins/metadataedit/metadatacheckbox.cpp +++ b/kipi-plugins/metadataedit/metadatacheckbox.cpp @@ -31,13 +31,13 @@ namespace KIPIMetadataEditPlugin { -MetadataCheckBox::MetadataCheckBox(const QString& text, QWidget* parent) - : QCheckBox(text, parent) +MetadataCheckBox::MetadataCheckBox(const TQString& text, TQWidget* tqparent) + : TQCheckBox(text, tqparent) { m_valid = true; - connect(this, SIGNAL(toggled(bool)), - this, SLOT(slotValid())); + connect(this, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotValid())); } MetadataCheckBox::~MetadataCheckBox() diff --git a/kipi-plugins/metadataedit/metadatacheckbox.h b/kipi-plugins/metadataedit/metadatacheckbox.h index 82a5dc6..a349b58 100644 --- a/kipi-plugins/metadataedit/metadatacheckbox.h +++ b/kipi-plugins/metadataedit/metadatacheckbox.h @@ -28,18 +28,19 @@ // QT includes. -#include <qcheckbox.h> +#include <tqcheckbox.h> namespace KIPIMetadataEditPlugin { -class MetadataCheckBox : public QCheckBox +class MetadataCheckBox : public TQCheckBox { Q_OBJECT + TQ_OBJECT public: - MetadataCheckBox(const QString& text, QWidget* parent); + MetadataCheckBox(const TQString& text, TQWidget* tqparent); ~MetadataCheckBox(); void setValid(bool v); diff --git a/kipi-plugins/metadataedit/plugin_metadataedit.cpp b/kipi-plugins/metadataedit/plugin_metadataedit.cpp index 64f8a39..20fed59 100644 --- a/kipi-plugins/metadataedit/plugin_metadataedit.cpp +++ b/kipi-plugins/metadataedit/plugin_metadataedit.cpp @@ -55,13 +55,13 @@ typedef KGenericFactory<Plugin_MetadataEdit> Factory; K_EXPORT_COMPONENT_FACTORY( kipiplugin_metadataedit, Factory("kipiplugin_metadataedit")) -Plugin_MetadataEdit::Plugin_MetadataEdit(QObject *parent, const char*, const QStringList&) - : KIPI::Plugin( Factory::instance(), parent, "MetadataEdit") +Plugin_MetadataEdit::Plugin_MetadataEdit(TQObject *tqparent, const char*, const TQStringList&) + : KIPI::Plugin( Factory::instance(), tqparent, "MetadataEdit") { kdDebug( 51001 ) << "Plugin_MetadataEdit plugin loaded" << endl; } -void Plugin_MetadataEdit::setup( QWidget* widget ) +void Plugin_MetadataEdit::setup( TQWidget* widget ) { KIPI::Plugin::setup( widget ); @@ -74,7 +74,7 @@ void Plugin_MetadataEdit::setup( QWidget* widget ) 0, 0, this, - SLOT(slotEditExif()), + TQT_SLOT(slotEditExif()), actionCollection(), "editexif")); @@ -82,7 +82,7 @@ void Plugin_MetadataEdit::setup( QWidget* widget ) 0, 0, this, - SLOT(slotRemoveExif()), + TQT_SLOT(slotRemoveExif()), actionCollection(), "removeexif")); @@ -90,7 +90,7 @@ void Plugin_MetadataEdit::setup( QWidget* widget ) 0, 0, this, - SLOT(slotImportExif()), + TQT_SLOT(slotImportExif()), actionCollection(), "importexif")); @@ -100,7 +100,7 @@ void Plugin_MetadataEdit::setup( QWidget* widget ) 0, 0, this, - SLOT(slotEditIptc()), + TQT_SLOT(slotEditIptc()), actionCollection(), "editiptc")); @@ -108,7 +108,7 @@ void Plugin_MetadataEdit::setup( QWidget* widget ) 0, 0, this, - SLOT(slotRemoveIptc()), + TQT_SLOT(slotRemoveIptc()), actionCollection(), "removeiptc")); @@ -116,7 +116,7 @@ void Plugin_MetadataEdit::setup( QWidget* widget ) 0, 0, this, - SLOT(slotImportIptc()), + TQT_SLOT(slotImportIptc()), actionCollection(), "importiptc")); @@ -126,7 +126,7 @@ void Plugin_MetadataEdit::setup( QWidget* widget ) 0, 0, this, - SLOT(slotEditComments()), + TQT_SLOT(slotEditComments()), actionCollection(), "editcomments")); @@ -134,13 +134,13 @@ void Plugin_MetadataEdit::setup( QWidget* widget ) 0, 0, this, - SLOT(slotRemoveComments()), + TQT_SLOT(slotRemoveComments()), actionCollection(), "removecomments")); addAction( m_actionMetadataEdit ); - m_interface = dynamic_cast< KIPI::Interface* >( parent() ); + m_interface = dynamic_cast< KIPI::Interface* >( tqparent() ); if ( !m_interface ) { @@ -151,8 +151,8 @@ void Plugin_MetadataEdit::setup( QWidget* widget ) KIPI::ImageCollection selection = m_interface->currentSelection(); m_actionMetadataEdit->setEnabled( selection.isValid() && !selection.images().isEmpty() ); - connect( m_interface, SIGNAL(selectionChanged(bool)), - m_actionMetadataEdit, SLOT(setEnabled(bool))); + connect( m_interface, TQT_SIGNAL(selectionChanged(bool)), + m_actionMetadataEdit, TQT_SLOT(setEnabled(bool))); } void Plugin_MetadataEdit::slotEditExif() @@ -162,7 +162,7 @@ void Plugin_MetadataEdit::slotEditExif() if ( !images.isValid() || images.images().isEmpty() ) return; - KIPIMetadataEditPlugin::EXIFEditDialog dialog(kapp->activeWindow(), images.images(), m_interface); + KIPIMetadataEditPlugin::EXIFEditDialog dialog(TQT_TQWIDGET(kapp->activeWindow()), images.images(), m_interface); dialog.exec(); m_interface->refreshImages(images.images()); } @@ -175,7 +175,7 @@ void Plugin_MetadataEdit::slotRemoveExif() return; if (KMessageBox::warningYesNo( - kapp->activeWindow(), + TQT_TQWIDGET(kapp->activeWindow()), i18n("EXIF metadata will be permanently removed from all current selected pictures.\n" "Do you want to continue ?"), i18n("Remove EXIF Metadata")) != KMessageBox::Yes) @@ -183,7 +183,7 @@ void Plugin_MetadataEdit::slotRemoveExif() KURL::List imageURLs = images.images(); KURL::List updatedURLs; - QStringList errorFiles; + TQStringList errorFiles; for( KURL::List::iterator it = imageURLs.begin() ; it != imageURLs.end(); ++it) @@ -214,7 +214,7 @@ void Plugin_MetadataEdit::slotRemoveExif() if (!errorFiles.isEmpty()) { KMessageBox::errorList( - kapp->activeWindow(), + TQT_TQWIDGET(kapp->activeWindow()), i18n("Unable to remove EXIF metadata from:"), errorFiles, i18n("Remove EXIF Metadata")); @@ -229,7 +229,7 @@ void Plugin_MetadataEdit::slotImportExif() return; KURL importEXIFFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), - QString::null, kapp->activeWindow(), + TQString(), TQT_TQWIDGET(kapp->activeWindow()), i18n("Select File to Import EXIF metadata") ); if( importEXIFFile.isEmpty() ) return; @@ -237,33 +237,33 @@ void Plugin_MetadataEdit::slotImportExif() KExiv2Iface::KExiv2 exiv2Iface; if (!exiv2Iface.load(importEXIFFile.path())) { - KMessageBox::error(kapp->activeWindow(), - i18n("Cannot load metadata from \"%1\"").arg(importEXIFFile.fileName()), + KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), + i18n("Cannot load metadata from \"%1\"").tqarg(importEXIFFile.fileName()), i18n("Import EXIF Metadata")); return; } - QByteArray exifData = exiv2Iface.getExif(); + TQByteArray exifData = exiv2Iface.getExif(); if (exifData.isEmpty()) { - KMessageBox::error(kapp->activeWindow(), - i18n("\"%1\" do not have EXIF metadata").arg(importEXIFFile.fileName()), + KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), + i18n("\"%1\" do not have EXIF metadata").tqarg(importEXIFFile.fileName()), i18n("Import EXIF Metadata")); return; } if (KMessageBox::warningYesNo( - kapp->activeWindow(), + TQT_TQWIDGET(kapp->activeWindow()), i18n("EXIF metadata from current selected pictures will be permanently " "replaced by the EXIF content of \"%1\".\n" - "Do you want to continue ?").arg(importEXIFFile.fileName()), + "Do you want to continue ?").tqarg(importEXIFFile.fileName()), i18n("Import EXIF Metadata")) != KMessageBox::Yes) return; KURL::List imageURLs = images.images(); KURL::List updatedURLs; - QStringList errorFiles; + TQStringList errorFiles; for( KURL::List::iterator it = imageURLs.begin() ; it != imageURLs.end(); ++it) @@ -294,7 +294,7 @@ void Plugin_MetadataEdit::slotImportExif() if (!errorFiles.isEmpty()) { KMessageBox::errorList( - kapp->activeWindow(), + TQT_TQWIDGET(kapp->activeWindow()), i18n("Unable to set EXIF metadata from:"), errorFiles, i18n("Import EXIF Metadata")); @@ -308,7 +308,7 @@ void Plugin_MetadataEdit::slotEditIptc() if ( !images.isValid() || images.images().isEmpty() ) return; - KIPIMetadataEditPlugin::IPTCEditDialog dialog(kapp->activeWindow(), images.images(), m_interface); + KIPIMetadataEditPlugin::IPTCEditDialog dialog(TQT_TQWIDGET(kapp->activeWindow()), images.images(), m_interface); dialog.exec(); m_interface->refreshImages(images.images()); } @@ -321,7 +321,7 @@ void Plugin_MetadataEdit::slotRemoveIptc() return; if (KMessageBox::warningYesNo( - kapp->activeWindow(), + TQT_TQWIDGET(kapp->activeWindow()), i18n("IPTC metadata will be permanently removed from all current selected pictures.\n" "Do you want to continue ?"), i18n("Remove IPTC Metadata")) != KMessageBox::Yes) @@ -329,7 +329,7 @@ void Plugin_MetadataEdit::slotRemoveIptc() KURL::List imageURLs = images.images(); KURL::List updatedURLs; - QStringList errorFiles; + TQStringList errorFiles; for( KURL::List::iterator it = imageURLs.begin() ; it != imageURLs.end(); ++it) @@ -360,7 +360,7 @@ void Plugin_MetadataEdit::slotRemoveIptc() if (!errorFiles.isEmpty()) { KMessageBox::errorList( - kapp->activeWindow(), + TQT_TQWIDGET(kapp->activeWindow()), i18n("Unable to remove IPTC metadata from:"), errorFiles, i18n("Remove IPTC Metadata")); @@ -375,7 +375,7 @@ void Plugin_MetadataEdit::slotImportIptc() return; KURL importIPTCFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), - QString::null, kapp->activeWindow(), + TQString(), TQT_TQWIDGET(kapp->activeWindow()), i18n("Select File to Import IPTC metadata") ); if( importIPTCFile.isEmpty() ) return; @@ -383,33 +383,33 @@ void Plugin_MetadataEdit::slotImportIptc() KExiv2Iface::KExiv2 exiv2Iface; if (!exiv2Iface.load(importIPTCFile.path())) { - KMessageBox::error(kapp->activeWindow(), - i18n("Cannot load metadata from \"%1\"").arg(importIPTCFile.fileName()), + KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), + i18n("Cannot load metadata from \"%1\"").tqarg(importIPTCFile.fileName()), i18n("Import IPTC Metadata")); return; } - QByteArray iptcData = exiv2Iface.getIptc(); + TQByteArray iptcData = exiv2Iface.getIptc(); if (iptcData.isEmpty()) { - KMessageBox::error(kapp->activeWindow(), - i18n("\"%1\" do not have IPTC metadata").arg(importIPTCFile.fileName()), + KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), + i18n("\"%1\" do not have IPTC metadata").tqarg(importIPTCFile.fileName()), i18n("Import IPTC Metadata")); return; } if (KMessageBox::warningYesNo( - kapp->activeWindow(), + TQT_TQWIDGET(kapp->activeWindow()), i18n("IPTC metadata from current selected pictures will be permanently " "replaced by the IPTC content of \"%1\".\n" - "Do you want to continue ?").arg(importIPTCFile.fileName()), + "Do you want to continue ?").tqarg(importIPTCFile.fileName()), i18n("Import IPTC Metadata")) != KMessageBox::Yes) return; KURL::List imageURLs = images.images(); KURL::List updatedURLs; - QStringList errorFiles; + TQStringList errorFiles; for( KURL::List::iterator it = imageURLs.begin() ; it != imageURLs.end(); ++it) @@ -440,7 +440,7 @@ void Plugin_MetadataEdit::slotImportIptc() if (!errorFiles.isEmpty()) { KMessageBox::errorList( - kapp->activeWindow(), + TQT_TQWIDGET(kapp->activeWindow()), i18n("Unable to set IPTC metadata from:"), errorFiles, i18n("Import IPTC Metadata")); @@ -454,14 +454,14 @@ void Plugin_MetadataEdit::slotEditComments() if ( !images.isValid() || images.images().isEmpty() ) return; - KIPIMetadataEditPlugin::CommentEditDialog dlg(kapp->activeWindow()); + KIPIMetadataEditPlugin::CommentEditDialog dlg(TQT_TQWIDGET(kapp->activeWindow())); if (dlg.exec() != KMessageBox::Ok) return; KURL::List imageURLs = images.images(); KURL::List updatedURLs; - QStringList errorFiles; + TQStringList errorFiles; for( KURL::List::iterator it = imageURLs.begin() ; it != imageURLs.end(); ++it) @@ -504,7 +504,7 @@ void Plugin_MetadataEdit::slotEditComments() if (!errorFiles.isEmpty()) { KMessageBox::informationList( - kapp->activeWindow(), + TQT_TQWIDGET(kapp->activeWindow()), i18n("Unable to set captions as image metadata from:"), errorFiles, i18n("Edit Image Caption")); @@ -518,14 +518,14 @@ void Plugin_MetadataEdit::slotRemoveComments() if ( !images.isValid() || images.images().isEmpty() ) return; - KIPIMetadataEditPlugin::CommentRemoveDialog dlg(kapp->activeWindow()); + KIPIMetadataEditPlugin::CommentRemoveDialog dlg(TQT_TQWIDGET(kapp->activeWindow())); if (dlg.exec() != KMessageBox::Ok) return; KURL::List imageURLs = images.images(); KURL::List updatedURLs; - QStringList errorFiles; + TQStringList errorFiles; for( KURL::List::iterator it = imageURLs.begin() ; it != imageURLs.end(); ++it) @@ -536,7 +536,7 @@ void Plugin_MetadataEdit::slotRemoveComments() if (dlg.removeHOSTCommentIsChecked()) { KIPI::ImageInfo info = m_interface->info(url); - info.setDescription(QString::null); + info.setDescription(TQString()); } if (!KExiv2Iface::KExiv2::isReadOnly(url.path())) @@ -549,7 +549,7 @@ void Plugin_MetadataEdit::slotRemoveComments() ret &= exiv2Iface.removeExifTag("Exif.Photo.UserComment"); if (dlg.removeJFIFCommentIsChecked()) - ret &= exiv2Iface.setComments(QByteArray()); + ret &= exiv2Iface.setComments(TQByteArray()); if (dlg.removeIPTCCaptionIsChecked()) ret &= exiv2Iface.removeIptcTag("Iptc.Application2.Caption"); @@ -571,7 +571,7 @@ void Plugin_MetadataEdit::slotRemoveComments() if (!errorFiles.isEmpty()) { KMessageBox::informationList( - kapp->activeWindow(), + TQT_TQWIDGET(kapp->activeWindow()), i18n("Unable to remove caption as image metadata from:"), errorFiles, i18n("Remove Image Caption")); diff --git a/kipi-plugins/metadataedit/plugin_metadataedit.h b/kipi-plugins/metadataedit/plugin_metadataedit.h index 28c8d79..d4fd809 100644 --- a/kipi-plugins/metadataedit/plugin_metadataedit.h +++ b/kipi-plugins/metadataedit/plugin_metadataedit.h @@ -32,13 +32,14 @@ class KActionMenu; class Plugin_MetadataEdit : public KIPI::Plugin { Q_OBJECT + TQ_OBJECT public: - Plugin_MetadataEdit(QObject *parent, const char* name, const QStringList &args); + Plugin_MetadataEdit(TQObject *tqparent, const char* name, const TQStringList &args); virtual KIPI::Category category( KAction* action ) const; - virtual void setup( QWidget* ); + virtual void setup( TQWidget* ); protected slots: |