summaryrefslogtreecommitdiffstats
path: root/digikam/utilities/imageeditor/editor
diff options
context:
space:
mode:
Diffstat (limited to 'digikam/utilities/imageeditor/editor')
-rw-r--r--digikam/utilities/imageeditor/editor/editorstackview.cpp18
-rw-r--r--digikam/utilities/imageeditor/editor/editorstackview.h11
-rw-r--r--digikam/utilities/imageeditor/editor/editortool.cpp88
-rw-r--r--digikam/utilities/imageeditor/editor/editortool.h38
-rw-r--r--digikam/utilities/imageeditor/editor/editortooliface.cpp10
-rw-r--r--digikam/utilities/imageeditor/editor/editortooliface.h9
-rw-r--r--digikam/utilities/imageeditor/editor/editortoolsettings.cpp126
-rw-r--r--digikam/utilities/imageeditor/editor/editortoolsettings.h17
-rw-r--r--digikam/utilities/imageeditor/editor/editorwindow.cpp540
-rw-r--r--digikam/utilities/imageeditor/editor/editorwindow.h43
-rw-r--r--digikam/utilities/imageeditor/editor/editorwindowprivate.h12
-rw-r--r--digikam/utilities/imageeditor/editor/imageiface.cpp72
-rw-r--r--digikam/utilities/imageeditor/editor/imageiface.h34
-rw-r--r--digikam/utilities/imageeditor/editor/imagewindow.cpp200
-rw-r--r--digikam/utilities/imageeditor/editor/imagewindow.h23
-rw-r--r--digikam/utilities/imageeditor/editor/savingcontextcontainer.h8
16 files changed, 626 insertions, 623 deletions
diff --git a/digikam/utilities/imageeditor/editor/editorstackview.cpp b/digikam/utilities/imageeditor/editor/editorstackview.cpp
index 7258afd..f96b8a4 100644
--- a/digikam/utilities/imageeditor/editor/editorstackview.cpp
+++ b/digikam/utilities/imageeditor/editor/editorstackview.cpp
@@ -44,12 +44,12 @@ public:
toolView = 0;
}
- QWidget *toolView;
+ TQWidget *toolView;
Canvas *canvas;
};
-EditorStackView::EditorStackView(QWidget *parent)
- : QWidgetStack(parent, 0, Qt::WDestructiveClose)
+EditorStackView::EditorStackView(TQWidget *tqparent)
+ : TQWidgetStack(tqparent, 0, TQt::WDestructiveClose)
{
d = new EditorStackViewPriv;
}
@@ -66,8 +66,8 @@ void EditorStackView::setCanvas(Canvas* canvas)
d->canvas = canvas;
addWidget(d->canvas, CanvasMode);
- connect(d->canvas, SIGNAL(signalZoomChanged(double)),
- this, SLOT(slotZoomChanged(double)));
+ connect(d->canvas, TQT_SIGNAL(signalZoomChanged(double)),
+ this, TQT_SLOT(slotZoomChanged(double)));
}
Canvas* EditorStackView::canvas() const
@@ -75,7 +75,7 @@ Canvas* EditorStackView::canvas() const
return d->canvas;
}
-void EditorStackView::setToolView(QWidget* view)
+void EditorStackView::setToolView(TQWidget* view)
{
if (d->toolView)
removeWidget(d->toolView);
@@ -88,12 +88,12 @@ void EditorStackView::setToolView(QWidget* view)
PreviewWidget *preview = previewWidget();
if (preview)
{
- connect(preview, SIGNAL(signalZoomFactorChanged(double)),
- this, SLOT(slotZoomChanged(double)));
+ connect(preview, TQT_SIGNAL(signalZoomFactorChanged(double)),
+ this, TQT_SLOT(slotZoomChanged(double)));
}
}
-QWidget* EditorStackView::toolView() const
+TQWidget* EditorStackView::toolView() const
{
return d->toolView;
}
diff --git a/digikam/utilities/imageeditor/editor/editorstackview.h b/digikam/utilities/imageeditor/editor/editorstackview.h
index 6f34a89..e2a7618 100644
--- a/digikam/utilities/imageeditor/editor/editorstackview.h
+++ b/digikam/utilities/imageeditor/editor/editorstackview.h
@@ -26,7 +26,7 @@
// KDE includes.
-#include <qwidgetstack.h>
+#include <tqwidgetstack.h>
// Local includes.
@@ -39,9 +39,10 @@ class PreviewWidget;
class Canvas;
class EditorStackViewPriv;
-class DIGIKAM_EXPORT EditorStackView : public QWidgetStack
+class DIGIKAM_EXPORT EditorStackView : public TQWidgetStack
{
Q_OBJECT
+ TQ_OBJECT
public:
@@ -53,14 +54,14 @@ public:
public:
- EditorStackView(QWidget *parent=0);
+ EditorStackView(TQWidget *tqparent=0);
~EditorStackView();
void setCanvas(Canvas* canvas);
Canvas *canvas() const;
- void setToolView(QWidget* view);
- QWidget *toolView() const;
+ void setToolView(TQWidget* view);
+ TQWidget *toolView() const;
int viewMode();
void setViewMode(int mode);
diff --git a/digikam/utilities/imageeditor/editor/editortool.cpp b/digikam/utilities/imageeditor/editor/editortool.cpp
index 2b4761d..fa70b28 100644
--- a/digikam/utilities/imageeditor/editor/editortool.cpp
+++ b/digikam/utilities/imageeditor/editor/editortool.cpp
@@ -21,10 +21,10 @@
*
* ============================================================ */
-// Qt includes.
+// TQt includes.
-#include <qwidget.h>
-#include <qtimer.h>
+#include <tqwidget.h>
+#include <tqtimer.h>
// KDE includes.
@@ -57,26 +57,26 @@ public:
settings = 0;
}
- QString helpAnchor;
- QString name;
+ TQString helpAnchor;
+ TQString name;
- QWidget *view;
+ TQWidget *view;
- QPixmap icon;
+ TQPixmap icon;
- QTimer *timer;
+ TQTimer *timer;
EditorToolSettings *settings;
};
-EditorTool::EditorTool(QObject *parent)
- : QObject(parent)
+EditorTool::EditorTool(TQObject *tqparent)
+ : TQObject(tqparent)
{
d = new EditorToolPriv;
- d->timer = new QTimer(this);
+ d->timer = new TQTimer(this);
- connect(d->timer, SIGNAL(timeout()),
- this, SLOT(slotEffect()));
+ connect(d->timer, TQT_SIGNAL(timeout()),
+ this, TQT_SLOT(slotEffect()));
}
EditorTool::~EditorTool()
@@ -86,35 +86,35 @@ EditorTool::~EditorTool()
void EditorTool::init()
{
- QTimer::singleShot(0, this, SLOT(slotInit()));
+ TQTimer::singleShot(0, this, TQT_SLOT(slotInit()));
}
-QPixmap EditorTool::toolIcon() const
+TQPixmap EditorTool::toolIcon() const
{
return d->icon;
}
-void EditorTool::setToolIcon(const QPixmap& icon)
+void EditorTool::setToolIcon(const TQPixmap& icon)
{
d->icon = icon;
}
-QString EditorTool::toolName() const
+TQString EditorTool::toolName() const
{
return d->name;
}
-void EditorTool::setToolName(const QString& name)
+void EditorTool::setToolName(const TQString& name)
{
d->name = name;
}
-QWidget* EditorTool::toolView() const
+TQWidget* EditorTool::toolView() const
{
return d->view;
}
-void EditorTool::setToolView(QWidget *view)
+void EditorTool::setToolView(TQWidget *view)
{
d->view = view;
// Will be unblocked in slotInit()
@@ -131,23 +131,23 @@ void EditorTool::setToolSettings(EditorToolSettings *settings)
{
d->settings = settings;
- connect(d->settings, SIGNAL(signalOkClicked()),
- this, SLOT(slotOk()));
+ connect(d->settings, TQT_SIGNAL(signalOkClicked()),
+ this, TQT_SLOT(slotOk()));
- connect(d->settings, SIGNAL(signalCancelClicked()),
- this, SLOT(slotCancel()));
+ connect(d->settings, TQT_SIGNAL(signalCancelClicked()),
+ this, TQT_SLOT(slotCancel()));
- connect(d->settings, SIGNAL(signalDefaultClicked()),
- this, SLOT(slotResetSettings()));
+ connect(d->settings, TQT_SIGNAL(signalDefaultClicked()),
+ this, TQT_SLOT(slotResetSettings()));
- connect(d->settings, SIGNAL(signalSaveAsClicked()),
- this, SLOT(slotSaveAsSettings()));
+ connect(d->settings, TQT_SIGNAL(signalSaveAsClicked()),
+ this, TQT_SLOT(slotSaveAsSettings()));
- connect(d->settings, SIGNAL(signalLoadClicked()),
- this, SLOT(slotLoadSettings()));
+ connect(d->settings, TQT_SIGNAL(signalLoadClicked()),
+ this, TQT_SLOT(slotLoadSettings()));
- connect(d->settings, SIGNAL(signalTryClicked()),
- this, SLOT(slotEffect()));
+ connect(d->settings, TQT_SIGNAL(signalTryClicked()),
+ this, TQT_SLOT(slotEffect()));
// Will be unblocked in slotInit()
// This will prevent signals emit during tool init.
@@ -162,16 +162,16 @@ void EditorTool::slotInit()
d->settings->blockSignals(false);
}
-void EditorTool::setToolHelp(const QString& anchor)
+void EditorTool::setToolHelp(const TQString& anchor)
{
d->helpAnchor = anchor;
// TODO: use this anchor with editor Help menu
}
-QString EditorTool::toolHelp() const
+TQString EditorTool::toolHelp() const
{
if (d->helpAnchor.isEmpty())
- return (name() + QString(".anchor"));
+ return (name() + TQString(".anchor"));
return d->helpAnchor;
}
@@ -229,13 +229,13 @@ public:
EditorToolThreaded::RenderingMode currentRenderingMode;
- QString progressMess;
+ TQString progressMess;
DImgThreadedFilter *threadedFilter;
};
-EditorToolThreaded::EditorToolThreaded(QObject *parent)
- : EditorTool(parent)
+EditorToolThreaded::EditorToolThreaded(TQObject *tqparent)
+ : EditorTool(tqparent)
{
d = new EditorToolThreadedPriv;
}
@@ -251,7 +251,7 @@ EditorToolThreaded::RenderingMode EditorToolThreaded::renderingMode() const
return d->currentRenderingMode;
}
-void EditorToolThreaded::setProgressMessage(const QString& mess)
+void EditorToolThreaded::setProgressMessage(const TQString& mess)
{
d->progressMess = mess;
}
@@ -279,7 +279,7 @@ void EditorToolThreaded::slotResized()
filter()->stopComputation();
}
- QTimer::singleShot(0, this, SLOT(slotEffect()));
+ TQTimer::singleShot(0, this, TQT_SLOT(slotEffect()));
}
void EditorToolThreaded::slotAbort()
@@ -300,7 +300,7 @@ void EditorToolThreaded::slotAbort()
renderingFinished();
}
-void EditorToolThreaded::customEvent(QCustomEvent *e)
+void EditorToolThreaded::customEvent(TQCustomEvent *e)
{
if (!e) return;
@@ -361,15 +361,15 @@ void EditorToolThreaded::customEvent(QCustomEvent *e)
delete ed;
}
-void EditorToolThreaded::setToolView(QWidget *view)
+void EditorToolThreaded::setToolView(TQWidget *view)
{
EditorTool::setToolView(view);
if (dynamic_cast<ImageWidget*>(view) || dynamic_cast<ImageGuideWidget*>(view) ||
dynamic_cast<ImagePanelWidget*>(view))
{
- connect(view, SIGNAL(signalResized()),
- this, SLOT(slotResized()));
+ connect(view, TQT_SIGNAL(signalResized()),
+ this, TQT_SLOT(slotResized()));
}
}
diff --git a/digikam/utilities/imageeditor/editor/editortool.h b/digikam/utilities/imageeditor/editor/editortool.h
index e54681c..041d899 100644
--- a/digikam/utilities/imageeditor/editor/editortool.h
+++ b/digikam/utilities/imageeditor/editor/editortool.h
@@ -24,11 +24,11 @@
#ifndef EDITORTOOL_H
#define EDITORTOOL_H
-// Qt includes.
+// TQt includes.
-#include <qobject.h>
-#include <qstring.h>
-#include <qpixmap.h>
+#include <tqobject.h>
+#include <tqstring.h>
+#include <tqpixmap.h>
// Local includes.
@@ -41,21 +41,22 @@ class DImgThreadedFilter;
class EditorToolSettings;
class EditorToolPriv;
-class DIGIKAM_EXPORT EditorTool : public QObject
+class DIGIKAM_EXPORT EditorTool : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
- EditorTool(QObject *parent);
+ EditorTool(TQObject *tqparent);
virtual ~EditorTool();
void init();
- QString toolHelp() const;
- QString toolName() const;
- QPixmap toolIcon() const;
- QWidget* toolView() const;
+ TQString toolHelp() const;
+ TQString toolName() const;
+ TQPixmap toolIcon() const;
+ TQWidget* toolView() const;
EditorToolSettings* toolSettings() const;
signals:
@@ -65,11 +66,11 @@ signals:
protected:
- void setToolHelp(const QString& anchor);
- void setToolName(const QString& name);
- void setToolIcon(const QPixmap& icon);
+ void setToolHelp(const TQString& anchor);
+ void setToolName(const TQString& name);
+ void setToolIcon(const TQPixmap& icon);
- virtual void setToolView(QWidget *view);
+ virtual void setToolView(TQWidget *view);
virtual void setToolSettings(EditorToolSettings *settings);
virtual void setBusy(bool);
virtual void readSettings();
@@ -100,6 +101,7 @@ class EditorToolThreadedPriv;
class DIGIKAM_EXPORT EditorToolThreaded : public EditorTool
{
Q_OBJECT
+ TQ_OBJECT
public:
@@ -112,13 +114,13 @@ public:
public:
- EditorToolThreaded(QObject *parent);
+ EditorToolThreaded(TQObject *tqparent);
virtual ~EditorToolThreaded();
/** Set the small text to show in editor status progress bar during
tool computation. If it's not set, tool name is used instead.
*/
- void setProgressMessage(const QString& mess);
+ void setProgressMessage(const TQString& mess);
/** return the current tool rendering mode.
*/
@@ -133,9 +135,9 @@ protected:
DImgThreadedFilter* filter() const;
void setFilter(DImgThreadedFilter *filter);
- void customEvent(QCustomEvent *event);
+ void customEvent(TQCustomEvent *event);
- virtual void setToolView(QWidget *view);
+ virtual void setToolView(TQWidget *view);
virtual void prepareEffect(){};
virtual void prepareFinal(){};
virtual void putPreviewData(){};
diff --git a/digikam/utilities/imageeditor/editor/editortooliface.cpp b/digikam/utilities/imageeditor/editor/editortooliface.cpp
index 20453df..f666bbf 100644
--- a/digikam/utilities/imageeditor/editor/editortooliface.cpp
+++ b/digikam/utilities/imageeditor/editor/editortooliface.cpp
@@ -21,9 +21,9 @@
*
* ============================================================ */
-// Qt includes.
+// TQt includes.
-#include <qwidget.h>
+#include <tqwidget.h>
// Local includes.
@@ -52,7 +52,7 @@ public:
tool = 0;
}
- QWidget *prevTab;
+ TQWidget *prevTab;
EditorTool *tool;
@@ -67,7 +67,7 @@ EditorToolIface* EditorToolIface::editorToolIface()
}
EditorToolIface::EditorToolIface(EditorWindow *editor)
- : QObject()
+ : TQObject()
{
d = new EditorToolIfacePriv;
d->editor = editor;
@@ -119,7 +119,7 @@ void EditorToolIface::unLoadTool()
d->tool = 0;
}
-void EditorToolIface::setToolStartProgress(const QString& toolName)
+void EditorToolIface::setToolStartProgress(const TQString& toolName)
{
d->editor->setToolStartProgress(toolName);
if (d->editor->editorStackView()->previewWidget())
diff --git a/digikam/utilities/imageeditor/editor/editortooliface.h b/digikam/utilities/imageeditor/editor/editortooliface.h
index b00012d..f6407c7 100644
--- a/digikam/utilities/imageeditor/editor/editortooliface.h
+++ b/digikam/utilities/imageeditor/editor/editortooliface.h
@@ -24,9 +24,9 @@
#ifndef EDITORTOOLIFACE_H
#define EDITORTOOLIFACE_H
-// Qt includes.
+// TQt includes.
-#include <qobject.h>
+#include <tqobject.h>
// Local includes.
@@ -39,9 +39,10 @@ class EditorTool;
class EditorWindow;
class EditorToolIfacePriv;
-class DIGIKAM_EXPORT EditorToolIface : public QObject
+class DIGIKAM_EXPORT EditorToolIface : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
@@ -55,7 +56,7 @@ public:
void loadTool(EditorTool* tool);
void unLoadTool();
- void setToolStartProgress(const QString& toolName);
+ void setToolStartProgress(const TQString& toolName);
void setToolProgress(int progress);
void setToolStopProgress();
diff --git a/digikam/utilities/imageeditor/editor/editortoolsettings.cpp b/digikam/utilities/imageeditor/editor/editortoolsettings.cpp
index 43d4f5d..1d09d96 100644
--- a/digikam/utilities/imageeditor/editor/editortoolsettings.cpp
+++ b/digikam/utilities/imageeditor/editor/editortoolsettings.cpp
@@ -20,15 +20,15 @@
*
* ============================================================ */
-// Qt includes.
+// TQt includes.
-#include <qhbox.h>
-#include <qvbox.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qstring.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
+#include <tqhbox.h>
+#include <tqvbox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqstring.h>
+#include <tqtooltip.h>
+#include <tqwhatsthis.h>
// KDE includes.
@@ -82,13 +82,13 @@ public:
panIconView = 0;
}
- QHBox *btnBox1;
- QHBox *btnBox2;
- QHBox *btnBox3;
- QHBox *guideBox;
+ TQHBox *btnBox1;
+ TQHBox *btnBox2;
+ TQHBox *btnBox3;
+ TQHBox *guideBox;
- QVBox *mainVBox;
- QWidget *plainPage;
+ TQVBox *mainVBox;
+ TQWidget *plainPage;
KPushButton *okBtn;
KPushButton *cancelBtn;
@@ -104,50 +104,50 @@ public:
RIntNumInput *guideSize;
};
-EditorToolSettings::EditorToolSettings(int buttonMask, int toolMask, QWidget *parent)
- : QScrollView(parent)
+EditorToolSettings::EditorToolSettings(int buttonMask, int toolMask, TQWidget *tqparent)
+ : TQScrollView(tqparent)
{
d = new EditorToolSettingsPriv;
- viewport()->setBackgroundMode(Qt::PaletteBackground);
- setResizePolicy(QScrollView::AutoOneFit);
- setFrameStyle(QFrame::NoFrame);
+ viewport()->setBackgroundMode(TQt::PaletteBackground);
+ setResizePolicy(TQScrollView::AutoOneFit);
+ setFrameStyle(TQFrame::NoFrame);
- d->mainVBox = new QVBox(viewport());
+ d->mainVBox = new TQVBox(viewport());
addChild(d->mainVBox);
// ---------------------------------------------------------------
- QFrame *frame = new QFrame(d->mainVBox);
- frame->setFrameStyle(QFrame::Panel|QFrame::Sunken);
- QVBoxLayout* vlay = new QVBoxLayout(frame, 5, 0);
+ TQFrame *frame = new TQFrame(d->mainVBox);
+ frame->setFrameStyle(TQFrame::Panel|TQFrame::Sunken);
+ TQVBoxLayout* vlay = new TQVBoxLayout(frame, 5, 0);
d->panIconView = new ImagePanIconWidget(360, 240, frame);
- QWhatsThis::add(d->panIconView, i18n("<p>Here you can see the original image panel "
+ TQWhatsThis::add(d->panIconView, i18n("<p>Here you can see the original image panel "
"which can help you to select the clip preview."
"<p>Click and drag the mouse cursor in the "
"red rectangle to change the clip focus."));
- vlay->addWidget(d->panIconView, 0, Qt::AlignCenter);
+ vlay->addWidget(d->panIconView, 0, TQt::AlignCenter);
if (!(toolMask & PanIcon))
frame->hide();
// ---------------------------------------------------------------
- d->plainPage = new QWidget(d->mainVBox);
- d->guideBox = new QHBox(d->mainVBox);
- d->btnBox1 = new QHBox(d->mainVBox);
- d->btnBox2 = new QHBox(d->mainVBox);
+ d->plainPage = new TQWidget(d->mainVBox);
+ d->guideBox = new TQHBox(d->mainVBox);
+ d->btnBox1 = new TQHBox(d->mainVBox);
+ d->btnBox2 = new TQHBox(d->mainVBox);
// ---------------------------------------------------------------
- new QLabel(i18n("Guide:"), d->guideBox);
- QLabel *space4 = new QLabel(d->guideBox);
- d->guideColorBt = new KColorButton(QColor(Qt::red), d->guideBox);
- QWhatsThis::add(d->guideColorBt, i18n("<p>Set here the color used to draw guides dashed-lines."));
+ new TQLabel(i18n("Guide:"), d->guideBox);
+ TQLabel *space4 = new TQLabel(d->guideBox);
+ d->guideColorBt = new KColorButton(TQColor(TQt::red), d->guideBox);
+ TQWhatsThis::add(d->guideColorBt, i18n("<p>Set here the color used to draw guides dashed-lines."));
d->guideSize = new RIntNumInput(d->guideBox);
d->guideSize->setRange(1, 5, 1);
d->guideSize->setDefaultValue(1);
- QWhatsThis::add(d->guideSize, i18n("<p>Set here the width in pixels used to draw guides dashed-lines."));
+ TQWhatsThis::add(d->guideSize, i18n("<p>Set here the width in pixels used to draw guides dashed-lines."));
d->guideBox->setStretchFactor(space4, 10);
d->guideBox->setSpacing(spacingHint());
@@ -161,11 +161,11 @@ EditorToolSettings::EditorToolSettings(int buttonMask, int toolMask, QWidget *pa
d->defaultBtn = new KPushButton(d->btnBox1);
d->defaultBtn->setGuiItem(KStdGuiItem::defaults());
d->defaultBtn->setIconSet(SmallIconSet("reload_page"));
- QToolTip::add(d->defaultBtn, i18n("<p>Reset all settings to their default values."));
+ TQToolTip::add(d->defaultBtn, i18n("<p>Reset all settings to their default values."));
if (!(buttonMask & Default))
d->defaultBtn->hide();
- QLabel *space = new QLabel(d->btnBox1);
+ TQLabel *space = new TQLabel(d->btnBox1);
d->okBtn = new KPushButton(d->btnBox1);
d->okBtn->setGuiItem(KStdGuiItem::ok());
@@ -189,22 +189,22 @@ EditorToolSettings::EditorToolSettings(int buttonMask, int toolMask, QWidget *pa
d->loadBtn = new KPushButton(d->btnBox2);
d->loadBtn->setGuiItem(KStdGuiItem::open());
d->loadBtn->setText(i18n("Load..."));
- QToolTip::add(d->loadBtn, i18n("<p>Load all parameters from settings text file."));
+ TQToolTip::add(d->loadBtn, i18n("<p>Load all parameters from settings text file."));
if (!(buttonMask & Load))
d->loadBtn->hide();
d->saveAsBtn = new KPushButton(d->btnBox2);
d->saveAsBtn->setGuiItem(KStdGuiItem::saveAs());
- QToolTip::add(d->saveAsBtn, i18n("<p>Save all parameters to settings text file."));
+ TQToolTip::add(d->saveAsBtn, i18n("<p>Save all parameters to settings text file."));
if (!(buttonMask & SaveAs))
d->saveAsBtn->hide();
- QLabel *space2 = new QLabel(d->btnBox2);
+ TQLabel *space2 = new TQLabel(d->btnBox2);
d->tryBtn = new KPushButton(d->btnBox2);
d->tryBtn->setGuiItem(KStdGuiItem::apply());
d->tryBtn->setText(i18n("Try"));
- QToolTip::add(d->tryBtn, i18n("<p>Try all settings."));
+ TQToolTip::add(d->tryBtn, i18n("<p>Try all settings."));
if (!(buttonMask & Try))
d->tryBtn->hide();
@@ -217,29 +217,29 @@ EditorToolSettings::EditorToolSettings(int buttonMask, int toolMask, QWidget *pa
// ---------------------------------------------------------------
- connect(d->okBtn, SIGNAL(clicked()),
- this, SIGNAL(signalOkClicked()));
+ connect(d->okBtn, TQT_SIGNAL(clicked()),
+ this, TQT_SIGNAL(signalOkClicked()));
- connect(d->cancelBtn, SIGNAL(clicked()),
- this, SIGNAL(signalCancelClicked()));
+ connect(d->cancelBtn, TQT_SIGNAL(clicked()),
+ this, TQT_SIGNAL(signalCancelClicked()));
- connect(d->tryBtn, SIGNAL(clicked()),
- this, SIGNAL(signalTryClicked()));
+ connect(d->tryBtn, TQT_SIGNAL(clicked()),
+ this, TQT_SIGNAL(signalTryClicked()));
- connect(d->defaultBtn, SIGNAL(clicked()),
- this, SIGNAL(signalDefaultClicked()));
+ connect(d->defaultBtn, TQT_SIGNAL(clicked()),
+ this, TQT_SIGNAL(signalDefaultClicked()));
- connect(d->saveAsBtn, SIGNAL(clicked()),
- this, SIGNAL(signalSaveAsClicked()));
+ connect(d->saveAsBtn, TQT_SIGNAL(clicked()),
+ this, TQT_SIGNAL(signalSaveAsClicked()));
- connect(d->loadBtn, SIGNAL(clicked()),
- this, SIGNAL(signalLoadClicked()));
+ connect(d->loadBtn, TQT_SIGNAL(clicked()),
+ this, TQT_SIGNAL(signalLoadClicked()));
- connect(d->guideColorBt, SIGNAL(changed(const QColor&)),
- this, SIGNAL(signalColorGuideChanged()));
+ connect(d->guideColorBt, TQT_SIGNAL(changed(const TQColor&)),
+ this, TQT_SIGNAL(signalColorGuideChanged()));
- connect(d->guideSize, SIGNAL(valueChanged(int)),
- this, SIGNAL(signalColorGuideChanged()));
+ connect(d->guideSize, TQT_SIGNAL(valueChanged(int)),
+ this, TQT_SIGNAL(signalColorGuideChanged()));
}
EditorToolSettings::~EditorToolSettings()
@@ -247,15 +247,15 @@ EditorToolSettings::~EditorToolSettings()
delete d;
}
-QSize EditorToolSettings::minimumSizeHint() const
+TQSize EditorToolSettings::tqminimumSizeHint() const
{
// Editor Tools usually require a larger horizontal space than other widgets in right side bar
// Set scroll area to a horizontal minimum size sufficient for the settings.
// Do not touch vertical size hint.
// Limit to 40% of the desktop width.
- QSize hint = QScrollView::minimumSizeHint();
- QRect desktopRect = KGlobalSettings::desktopGeometry(d->mainVBox);
- hint.setWidth(QMIN(d->mainVBox->minimumSizeHint().width(), desktopRect.width() * 2 / 5));
+ TQSize hint = TQScrollView::tqminimumSizeHint();
+ TQRect desktopRect = KGlobalSettings::desktopGeometry(d->mainVBox);
+ hint.setWidth(TQMIN(d->mainVBox->tqminimumSizeHint().width(), desktopRect.width() * 2 / 5));
return hint;
}
@@ -269,7 +269,7 @@ int EditorToolSettings::spacingHint()
return KDialog::spacingHint();
}
-QWidget *EditorToolSettings::plainPage() const
+TQWidget *EditorToolSettings::plainPage() const
{
return d->plainPage;
}
@@ -308,12 +308,12 @@ void EditorToolSettings::enableButton(int buttonCode, bool state)
if (btn) btn->setEnabled(state);
}
-QColor EditorToolSettings::guideColor() const
+TQColor EditorToolSettings::guideColor() const
{
return d->guideColorBt->color();
}
-void EditorToolSettings::setGuideColor(const QColor& color)
+void EditorToolSettings::setGuideColor(const TQColor& color)
{
d->guideColorBt->setColor(color);
}
diff --git a/digikam/utilities/imageeditor/editor/editortoolsettings.h b/digikam/utilities/imageeditor/editor/editortoolsettings.h
index a6a515d..b2e8481 100644
--- a/digikam/utilities/imageeditor/editor/editortoolsettings.h
+++ b/digikam/utilities/imageeditor/editor/editortoolsettings.h
@@ -23,9 +23,9 @@
#ifndef EDITORTOOLSETTINGS_H
#define EDITORTOOLSETTINGS_H
-// Qt includes.
+// TQt includes.
-#include <qscrollview.h>
+#include <tqscrollview.h>
// Local includes.
@@ -39,9 +39,10 @@ namespace Digikam
class ImagePanIconWidget;
class EditorToolSettingsPriv;
-class DIGIKAM_EXPORT EditorToolSettings : public QScrollView
+class DIGIKAM_EXPORT EditorToolSettings : public TQScrollView
{
Q_OBJECT
+ TQ_OBJECT
public:
@@ -64,7 +65,7 @@ public:
public:
- EditorToolSettings(int buttonMask, int toolMask=NoTool, QWidget *parent=0);
+ EditorToolSettings(int buttonMask, int toolMask=NoTool, TQWidget *tqparent=0);
~EditorToolSettings();
virtual void setBusy(bool){};
@@ -75,10 +76,10 @@ public:
int marginHint();
int spacingHint();
- QWidget *plainPage() const;
+ TQWidget *plainPage() const;
- QColor guideColor() const;
- void setGuideColor(const QColor& color);
+ TQColor guideColor() const;
+ void setGuideColor(const TQColor& color);
int guideSize() const;
void setGuideSize(int size);
@@ -87,7 +88,7 @@ public:
KPushButton* button(int buttonCode) const;
void enableButton(int buttonCode, bool state);
- virtual QSize minimumSizeHint() const;
+ virtual TQSize tqminimumSizeHint() const;
signals:
diff --git a/digikam/utilities/imageeditor/editor/editorwindow.cpp b/digikam/utilities/imageeditor/editor/editorwindow.cpp
index 2c61ea1..e3bdcdb 100644
--- a/digikam/utilities/imageeditor/editor/editorwindow.cpp
+++ b/digikam/utilities/imageeditor/editor/editorwindow.cpp
@@ -33,20 +33,20 @@ extern "C"
#include <cmath>
-// Qt includes.
-
-#include <qlabel.h>
-#include <qdockarea.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qtoolbutton.h>
-#include <qsplitter.h>
-#include <qdir.h>
-#include <qfileinfo.h>
-#include <qfile.h>
-#include <qcursor.h>
-#include <qtimer.h>
-#include <qfileinfo.h>
+// TQt includes.
+
+#include <tqlabel.h>
+#include <tqdockarea.h>
+#include <tqlayout.h>
+#include <tqtooltip.h>
+#include <tqtoolbutton.h>
+#include <tqsplitter.h>
+#include <tqdir.h>
+#include <tqfileinfo.h>
+#include <tqfile.h>
+#include <tqcursor.h>
+#include <tqtimer.h>
+#include <tqfileinfo.h>
// KDE includes.
@@ -106,8 +106,8 @@ extern "C"
#include "editorwindow.h"
#include "editorwindow.moc"
-void qt_enter_modal( QWidget *widget );
-void qt_leave_modal( QWidget *widget );
+void qt_enter_modal( TQWidget *widget );
+void qt_leave_modal( TQWidget *widget );
namespace Digikam
{
@@ -183,104 +183,104 @@ void EditorWindow::setupStandardConnections()
{
// -- Canvas connections ------------------------------------------------
- connect(m_canvas, SIGNAL(signalToggleOffFitToWindow()),
- this, SLOT(slotToggleOffFitToWindow()));
+ connect(m_canvas, TQT_SIGNAL(signalToggleOffFitToWindow()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotToggleOffFitToWindow()));
- connect(m_canvas, SIGNAL(signalShowNextImage()),
- this, SLOT(slotForward()));
+ connect(m_canvas, TQT_SIGNAL(signalShowNextImage()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotForward()));
- connect(m_canvas, SIGNAL(signalShowPrevImage()),
- this, SLOT(slotBackward()));
+ connect(m_canvas, TQT_SIGNAL(signalShowPrevImage()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotBackward()));
- connect(m_canvas, SIGNAL(signalRightButtonClicked()),
- this, SLOT(slotContextMenu()));
+ connect(m_canvas, TQT_SIGNAL(signalRightButtonClicked()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotContextMenu()));
- connect(m_stackView, SIGNAL(signalZoomChanged(bool, bool, double)),
- this, SLOT(slotZoomChanged(bool, bool, double)));
+ connect(m_stackView, TQT_SIGNAL(signalZoomChanged(bool, bool, double)),
+ TQT_TQOBJECT(this), TQT_SLOT(slotZoomChanged(bool, bool, double)));
- connect(m_canvas, SIGNAL(signalChanged()),
- this, SLOT(slotChanged()));
+ connect(m_canvas, TQT_SIGNAL(signalChanged()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotChanged()));
- connect(m_canvas, SIGNAL(signalUndoStateChanged(bool, bool, bool)),
- this, SLOT(slotUndoStateChanged(bool, bool, bool)));
+ connect(m_canvas, TQT_SIGNAL(signalUndoStateChanged(bool, bool, bool)),
+ TQT_TQOBJECT(this), TQT_SLOT(slotUndoStateChanged(bool, bool, bool)));
- connect(m_canvas, SIGNAL(signalSelected(bool)),
- this, SLOT(slotSelected(bool)));
+ connect(m_canvas, TQT_SIGNAL(signalSelected(bool)),
+ TQT_TQOBJECT(this), TQT_SLOT(slotSelected(bool)));
- connect(m_canvas, SIGNAL(signalPrepareToLoad()),
- this, SLOT(slotPrepareToLoad()));
+ connect(m_canvas, TQT_SIGNAL(signalPrepareToLoad()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotPrepareToLoad()));
- connect(m_canvas, SIGNAL(signalLoadingStarted(const QString &)),
- this, SLOT(slotLoadingStarted(const QString &)));
+ connect(m_canvas, TQT_SIGNAL(signalLoadingStarted(const TQString &)),
+ TQT_TQOBJECT(this), TQT_SLOT(slotLoadingStarted(const TQString &)));
- connect(m_canvas, SIGNAL(signalLoadingFinished(const QString &, bool)),
- this, SLOT(slotLoadingFinished(const QString &, bool)));
+ connect(m_canvas, TQT_SIGNAL(signalLoadingFinished(const TQString &, bool)),
+ TQT_TQOBJECT(this), TQT_SLOT(slotLoadingFinished(const TQString &, bool)));
- connect(m_canvas, SIGNAL(signalLoadingProgress(const QString &, float)),
- this, SLOT(slotLoadingProgress(const QString &, float)));
+ connect(m_canvas, TQT_SIGNAL(signalLoadingProgress(const TQString &, float)),
+ TQT_TQOBJECT(this), TQT_SLOT(slotLoadingProgress(const TQString &, float)));
- connect(m_canvas, SIGNAL(signalSavingStarted(const QString&)),
- this, SLOT(slotSavingStarted(const QString&)));
+ connect(m_canvas, TQT_SIGNAL(signalSavingStarted(const TQString&)),
+ TQT_TQOBJECT(this), TQT_SLOT(slotSavingStarted(const TQString&)));
- connect(m_canvas, SIGNAL(signalSavingFinished(const QString&, bool)),
- this, SLOT(slotSavingFinished(const QString&, bool)));
+ connect(m_canvas, TQT_SIGNAL(signalSavingFinished(const TQString&, bool)),
+ TQT_TQOBJECT(this), TQT_SLOT(slotSavingFinished(const TQString&, bool)));
- connect(m_canvas, SIGNAL(signalSavingProgress(const QString&, float)),
- this, SLOT(slotSavingProgress(const QString&, float)));
+ connect(m_canvas, TQT_SIGNAL(signalSavingProgress(const TQString&, float)),
+ TQT_TQOBJECT(this), TQT_SLOT(slotSavingProgress(const TQString&, float)));
- connect(m_canvas, SIGNAL(signalSelectionChanged(const QRect&)),
- this, SLOT(slotSelectionChanged(const QRect&)));
+ connect(m_canvas, TQT_SIGNAL(signalSelectionChanged(const TQRect&)),
+ TQT_TQOBJECT(this), TQT_SLOT(slotSelectionChanged(const TQRect&)));
// -- if rotating/flipping set the rotatedflipped flag to true -----------
- connect(d->rotateLeftAction, SIGNAL(activated()),
- this, SLOT(slotRotatedOrFlipped()));
+ connect(d->rotateLeftAction, TQT_SIGNAL(activated()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotRotatedOrFlipped()));
- connect(d->rotateRightAction, SIGNAL(activated()),
- this, SLOT(slotRotatedOrFlipped()));
+ connect(d->rotateRightAction, TQT_SIGNAL(activated()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotRotatedOrFlipped()));
- connect(d->flipHorizAction, SIGNAL(activated()),
- this, SLOT(slotRotatedOrFlipped()));
+ connect(d->flipHorizAction, TQT_SIGNAL(activated()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotRotatedOrFlipped()));
- connect(d->flipVertAction, SIGNAL(activated()),
- this, SLOT(slotRotatedOrFlipped()));
+ connect(d->flipVertAction, TQT_SIGNAL(activated()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotRotatedOrFlipped()));
// -- status bar connections --------------------------------------
- connect(m_nameLabel, SIGNAL(signalCancelButtonPressed()),
- this, SLOT(slotNameLabelCancelButtonPressed()));
+ connect(m_nameLabel, TQT_SIGNAL(signalCancelButtonPressed()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotNameLabelCancelButtonPressed()));
- connect(m_nameLabel, SIGNAL(signalCancelButtonPressed()),
- d->toolIface, SLOT(slotToolAborted()));
+ connect(m_nameLabel, TQT_SIGNAL(signalCancelButtonPressed()),
+ d->toolIface, TQT_SLOT(slotToolAborted()));
}
void EditorWindow::setupStandardActions()
{
// -- Standard 'File' menu actions ---------------------------------------------
- m_backwardAction = KStdAction::back(this, SLOT(slotBackward()),
+ m_backwardAction = KStdAction::back(TQT_TQOBJECT(this), TQT_SLOT(slotBackward()),
actionCollection(), "editorwindow_backward");
- m_forwardAction = KStdAction::forward(this, SLOT(slotForward()),
+ m_forwardAction = KStdAction::forward(TQT_TQOBJECT(this), TQT_SLOT(slotForward()),
actionCollection(), "editorwindow_forward");
m_firstAction = new KAction(i18n("&First"), "start",
KStdAccel::shortcut( KStdAccel::Home),
- this, SLOT(slotFirst()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotFirst()),
actionCollection(), "editorwindow_first");
m_lastAction = new KAction(i18n("&Last"), "finish",
KStdAccel::shortcut( KStdAccel::End),
- this, SLOT(slotLast()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotLast()),
actionCollection(), "editorwindow_last");
- m_saveAction = KStdAction::save(this, SLOT(slotSave()),
+ m_saveAction = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotSave()),
actionCollection(), "editorwindow_save");
- m_saveAsAction = KStdAction::saveAs(this, SLOT(slotSaveAs()),
+ m_saveAsAction = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs()),
actionCollection(), "editorwindow_saveas");
- m_revertAction = KStdAction::revert(this, SLOT(slotRevert()),
+ m_revertAction = KStdAction::revert(TQT_TQOBJECT(this), TQT_SLOT(slotRevert()),
actionCollection(), "editorwindow_revert");
m_saveAction->setEnabled(false);
@@ -289,86 +289,86 @@ void EditorWindow::setupStandardActions()
d->filePrintAction = new KAction(i18n("Print Image..."), "fileprint",
CTRL+Key_P,
- this, SLOT(slotFilePrint()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotFilePrint()),
actionCollection(), "editorwindow_print");
m_fileDeleteAction = new KAction(i18n("Move to Trash"), "edittrash",
Key_Delete,
- this, SLOT(slotDeleteCurrentItem()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotDeleteCurrentItem()),
actionCollection(), "editorwindow_delete");
- KStdAction::close(this, SLOT(close()), actionCollection(), "editorwindow_close");
+ KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection(), "editorwindow_close");
// -- Standard 'Edit' menu actions ---------------------------------------------
- d->copyAction = KStdAction::copy(m_canvas, SLOT(slotCopy()),
+ d->copyAction = KStdAction::copy(TQT_TQOBJECT(m_canvas), TQT_SLOT(slotCopy()),
actionCollection(), "editorwindow_copy");
d->copyAction->setEnabled(false);
m_undoAction = new KToolBarPopupAction(i18n("Undo"), "undo",
KStdAccel::shortcut(KStdAccel::Undo),
- m_canvas, SLOT(slotUndo()),
+ TQT_TQOBJECT(m_canvas), TQT_SLOT(slotUndo()),
actionCollection(), "editorwindow_undo");
- connect(m_undoAction->popupMenu(), SIGNAL(aboutToShow()),
- this, SLOT(slotAboutToShowUndoMenu()));
+ connect(m_undoAction->popupMenu(), TQT_SIGNAL(aboutToShow()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotAboutToShowUndoMenu()));
- connect(m_undoAction->popupMenu(), SIGNAL(activated(int)),
- m_canvas, SLOT(slotUndo(int)));
+ connect(m_undoAction->popupMenu(), TQT_SIGNAL(activated(int)),
+ TQT_TQOBJECT(m_canvas), TQT_SLOT(slotUndo(int)));
m_undoAction->setEnabled(false);
m_redoAction = new KToolBarPopupAction(i18n("Redo"), "redo",
KStdAccel::shortcut(KStdAccel::Redo),
- m_canvas, SLOT(slotRedo()),
+ TQT_TQOBJECT(m_canvas), TQT_SLOT(slotRedo()),
actionCollection(), "editorwindow_redo");
- connect(m_redoAction->popupMenu(), SIGNAL(aboutToShow()),
- this, SLOT(slotAboutToShowRedoMenu()));
+ connect(m_redoAction->popupMenu(), TQT_SIGNAL(aboutToShow()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotAboutToShowRedoMenu()));
- connect(m_redoAction->popupMenu(), SIGNAL(activated(int)),
- m_canvas, SLOT(slotRedo(int)));
+ connect(m_redoAction->popupMenu(), TQT_SIGNAL(activated(int)),
+ TQT_TQOBJECT(m_canvas), TQT_SLOT(slotRedo(int)));
m_redoAction->setEnabled(false);
d->selectAllAction = new KAction(i18n("Select All"),
0,
CTRL+Key_A,
- m_canvas,
- SLOT(slotSelectAll()),
+ TQT_TQOBJECT(m_canvas),
+ TQT_SLOT(slotSelectAll()),
actionCollection(),
"editorwindow_selectAll");
d->selectNoneAction = new KAction(i18n("Select None"),
0,
CTRL+SHIFT+Key_A,
- m_canvas,
- SLOT(slotSelectNone()),
+ TQT_TQOBJECT(m_canvas),
+ TQT_SLOT(slotSelectNone()),
actionCollection(),
"editorwindow_selectNone");
// -- Standard 'View' menu actions ---------------------------------------------
- d->zoomPlusAction = KStdAction::zoomIn(this, SLOT(slotIncreaseZoom()),
+ d->zoomPlusAction = KStdAction::zoomIn(TQT_TQOBJECT(this), TQT_SLOT(slotIncreaseZoom()),
actionCollection(), "editorwindow_zoomplus");
- d->zoomMinusAction = KStdAction::zoomOut(this, SLOT(slotDecreaseZoom()),
+ d->zoomMinusAction = KStdAction::zoomOut(TQT_TQOBJECT(this), TQT_SLOT(slotDecreaseZoom()),
actionCollection(), "editorwindow_zoomminus");
d->zoomTo100percents = new KAction(i18n("Zoom to 100%"), "viewmag1",
ALT+CTRL+Key_0, // NOTE: Photoshop 7 use ALT+CTRL+0.
- this, SLOT(slotZoomTo100Percents()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotZoomTo100Percents()),
actionCollection(), "editorwindow_zoomto100percents");
d->zoomFitToWindowAction = new KToggleAction(i18n("Fit to &Window"), "view_fit_window",
CTRL+SHIFT+Key_E, // NOTE: Gimp 2 use CTRL+SHIFT+E.
- this, SLOT(slotToggleFitToWindow()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotToggleFitToWindow()),
actionCollection(), "editorwindow_zoomfit2window");
d->zoomFitToSelectAction = new KAction(i18n("Fit to &Selection"), "viewmagfit",
- ALT+CTRL+Key_S, this, SLOT(slotFitToSelect()),
+ ALT+CTRL+Key_S, TQT_TQOBJECT(this), TQT_SLOT(slotFitToSelect()),
actionCollection(), "editorwindow_zoomfit2select");
d->zoomFitToSelectAction->setEnabled(false);
d->zoomFitToSelectAction->setWhatsThis(i18n("This option can be used to zoom the image to the "
@@ -376,65 +376,65 @@ void EditorWindow::setupStandardActions()
d->zoomCombo = new KComboBox(true);
d->zoomCombo->setDuplicatesEnabled(false);
- d->zoomCombo->setFocusPolicy(ClickFocus);
- d->zoomCombo->setInsertionPolicy(QComboBox::NoInsertion);
+ d->zoomCombo->setFocusPolicy(TQ_ClickFocus);
+ d->zoomCombo->setInsertionPolicy(TQComboBox::NoInsertion);
d->zoomComboAction = new KWidgetAction(d->zoomCombo, i18n("Zoom"), 0, 0, 0,
actionCollection(), "editorwindow_zoomto");
- d->zoomCombo->insertItem(QString("10%"));
- d->zoomCombo->insertItem(QString("25%"));
- d->zoomCombo->insertItem(QString("50%"));
- d->zoomCombo->insertItem(QString("75%"));
- d->zoomCombo->insertItem(QString("100%"));
- d->zoomCombo->insertItem(QString("150%"));
- d->zoomCombo->insertItem(QString("200%"));
- d->zoomCombo->insertItem(QString("300%"));
- d->zoomCombo->insertItem(QString("450%"));
- d->zoomCombo->insertItem(QString("600%"));
- d->zoomCombo->insertItem(QString("800%"));
- d->zoomCombo->insertItem(QString("1200%"));
-
- connect(d->zoomCombo, SIGNAL(activated(int)),
- this, SLOT(slotZoomSelected()) );
-
- connect(d->zoomCombo, SIGNAL(returnPressed(const QString&)),
- this, SLOT(slotZoomTextChanged(const QString &)) );
+ d->zoomCombo->insertItem(TQString("10%"));
+ d->zoomCombo->insertItem(TQString("25%"));
+ d->zoomCombo->insertItem(TQString("50%"));
+ d->zoomCombo->insertItem(TQString("75%"));
+ d->zoomCombo->insertItem(TQString("100%"));
+ d->zoomCombo->insertItem(TQString("150%"));
+ d->zoomCombo->insertItem(TQString("200%"));
+ d->zoomCombo->insertItem(TQString("300%"));
+ d->zoomCombo->insertItem(TQString("450%"));
+ d->zoomCombo->insertItem(TQString("600%"));
+ d->zoomCombo->insertItem(TQString("800%"));
+ d->zoomCombo->insertItem(TQString("1200%"));
+
+ connect(d->zoomCombo, TQT_SIGNAL(activated(int)),
+ TQT_TQOBJECT(this), TQT_SLOT(slotZoomSelected()) );
+
+ connect(d->zoomCombo, TQT_SIGNAL(returnPressed(const TQString&)),
+ TQT_TQOBJECT(this), TQT_SLOT(slotZoomTextChanged(const TQString &)) );
// Do not use std KDE action for full screen because action text is too large for app. toolbar.
m_fullScreenAction = new KToggleAction(i18n("Full Screen"), "window_fullscreen",
- CTRL+SHIFT+Key_F, this,
- SLOT(slotToggleFullScreen()),
+ CTRL+SHIFT+Key_F, TQT_TQOBJECT(this),
+ TQT_SLOT(slotToggleFullScreen()),
actionCollection(), "editorwindow_fullscreen");
m_fullScreenAction->setWhatsThis(i18n("Toggle the window to full screen mode"));
d->slideShowAction = new KAction(i18n("Slideshow"), "slideshow", Key_F9,
- this, SLOT(slotToggleSlideShow()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotToggleSlideShow()),
actionCollection(),"editorwindow_slideshow");
d->viewUnderExpoAction = new KToggleAction(i18n("Under-Exposure Indicator"), "underexposure",
- Key_F10, this,
- SLOT(slotToggleUnderExposureIndicator()),
+ Key_F10, TQT_TQOBJECT(this),
+ TQT_SLOT(slotToggleUnderExposureIndicator()),
actionCollection(),"editorwindow_underexposure");
d->viewOverExpoAction = new KToggleAction(i18n("Over-Exposure Indicator"), "overexposure",
- Key_F11, this,
- SLOT(slotToggleOverExposureIndicator()),
+ Key_F11, TQT_TQOBJECT(this),
+ TQT_SLOT(slotToggleOverExposureIndicator()),
actionCollection(),"editorwindow_overexposure");
d->viewCMViewAction = new KToggleAction(i18n("Color Managed View"), "tv",
- Key_F12, this,
- SLOT(slotToggleColorManagedView()),
+ Key_F12, TQT_TQOBJECT(this),
+ TQT_SLOT(slotToggleColorManagedView()),
actionCollection(),"editorwindow_cmview");
// -- Standard 'Transform' menu actions ---------------------------------------------
d->resizeAction = new KAction(i18n("&Resize..."), "resize_image", 0,
- this, SLOT(slotResize()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotResize()),
actionCollection(), "editorwindow_resize");
d->cropAction = new KAction(i18n("Crop"), "crop",
CTRL+Key_X,
- m_canvas, SLOT(slotCrop()),
+ TQT_TQOBJECT(m_canvas), TQT_SLOT(slotCrop()),
actionCollection(), "editorwindow_crop");
d->cropAction->setEnabled(false);
@@ -443,13 +443,13 @@ void EditorWindow::setupStandardActions()
// -- Standard 'Flip' menu actions ---------------------------------------------
- d->flipHorizAction = new KAction(i18n("Flip Horizontally"), "mirror", CTRL+Key_Asterisk,
- m_canvas, SLOT(slotFlipHoriz()),
+ d->flipHorizAction = new KAction(i18n("FlipQt::Horizontally"), "mirror", CTRL+Key_Asterisk,
+ TQT_TQOBJECT(m_canvas), TQT_SLOT(slotFlipHoriz()),
actionCollection(), "editorwindow_flip_horiz");
d->flipHorizAction->setEnabled(false);
- d->flipVertAction = new KAction(i18n("Flip Vertically"), "flip", CTRL+Key_Slash,
- m_canvas, SLOT(slotFlipVert()),
+ d->flipVertAction = new KAction(i18n("FlipQt::Vertically"), "flip", CTRL+Key_Slash,
+ TQT_TQOBJECT(m_canvas), TQT_SLOT(slotFlipVert()),
actionCollection(), "editorwindow_flip_vert");
d->flipVertAction->setEnabled(false);
@@ -457,55 +457,55 @@ void EditorWindow::setupStandardActions()
d->rotateLeftAction = new KAction(i18n("Rotate Left"),
"rotate_ccw", SHIFT+CTRL+Key_Left,
- m_canvas, SLOT(slotRotate270()),
+ TQT_TQOBJECT(m_canvas), TQT_SLOT(slotRotate270()),
actionCollection(),
"editorwindow_rotate_left");
d->rotateLeftAction->setEnabled(false);
d->rotateRightAction = new KAction(i18n("Rotate Right"),
"rotate_cw", SHIFT+CTRL+Key_Right,
- m_canvas, SLOT(slotRotate90()),
+ TQT_TQOBJECT(m_canvas), TQT_SLOT(slotRotate90()),
actionCollection(),
"editorwindow_rotate_right");
d->rotateRightAction->setEnabled(false);
// -- Standard 'Configure' menu actions ----------------------------------------
- d->showMenuBarAction = KStdAction::showMenubar(this, SLOT(slotShowMenuBar()), actionCollection());
+ d->showMenuBarAction = KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(slotShowMenuBar()), actionCollection());
- KStdAction::keyBindings(this, SLOT(slotEditKeys()), actionCollection());
- KStdAction::configureToolbars(this, SLOT(slotConfToolbars()), actionCollection());
- KStdAction::preferences(this, SLOT(slotSetup()), actionCollection());
+ KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotEditKeys()), actionCollection());
+ KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfToolbars()), actionCollection());
+ KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotSetup()), actionCollection());
// -----------------------------------------------------------------------------------------
m_themeMenuAction = new KSelectAction(i18n("&Themes"), 0, actionCollection(), "theme_menu");
m_themeMenuAction->setItems(ThemeEngine::instance()->themeNames());
- connect(m_themeMenuAction, SIGNAL(activated(const QString&)),
- this, SLOT(slotChangeTheme(const QString&)));
+ connect(m_themeMenuAction, TQT_SIGNAL(activated(const TQString&)),
+ TQT_TQOBJECT(this), TQT_SLOT(slotChangeTheme(const TQString&)));
- connect(ThemeEngine::instance(), SIGNAL(signalThemeChanged()),
- this, SLOT(slotThemeChanged()));
+ connect(ThemeEngine::instance(), TQT_SIGNAL(signalThemeChanged()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotThemeChanged()));
// -- Standard 'Help' menu actions ---------------------------------------------
d->donateMoneyAction = new KAction(i18n("Donate..."),
0, 0,
- this, SLOT(slotDonateMoney()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotDonateMoney()),
actionCollection(),
"editorwindow_donatemoney");
d->contributeAction = new KAction(i18n("Contribute..."),
0, 0,
- this, SLOT(slotContribute()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotContribute()),
actionCollection(),
"editorwindow_contribute");
d->rawCameraListAction = new KAction(i18n("Supported RAW Cameras"),
"kdcraw",
0,
- this,
- SLOT(slotRawCameraList()),
+ TQT_TQOBJECT(this),
+ TQT_SLOT(slotRawCameraList()),
actionCollection(),
"editorwindow_rawcameralist");
}
@@ -516,92 +516,92 @@ void EditorWindow::setupStandardAccelerators()
d->accelerators->insert("Exit fullscreen", i18n("Exit Fullscreen mode"),
i18n("Exit out of the fullscreen mode"),
- Key_Escape, this, SLOT(slotEscapePressed()),
+ Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(slotEscapePressed()),
false, true);
d->accelerators->insert("Next Image Key_Space", i18n("Next Image"),
i18n("Load Next Image"),
- Key_Space, this, SLOT(slotForward()),
+ Key_Space, TQT_TQOBJECT(this), TQT_SLOT(slotForward()),
false, true);
d->accelerators->insert("Previous Image SHIFT+Key_Space", i18n("Previous Image"),
i18n("Load Previous Image"),
- SHIFT+Key_Space, this, SLOT(slotBackward()),
+ SHIFT+Key_Space, TQT_TQOBJECT(this), TQT_SLOT(slotBackward()),
false, true);
d->accelerators->insert("Previous Image Key_Backspace", i18n("Previous Image"),
i18n("Load Previous Image"),
- Key_Backspace, this, SLOT(slotBackward()),
+ Key_Backspace, TQT_TQOBJECT(this), TQT_SLOT(slotBackward()),
false, true);
d->accelerators->insert("Next Image Key_Next", i18n("Next Image"),
i18n("Load Next Image"),
- Key_Next, this, SLOT(slotForward()),
+ Key_Next, TQT_TQOBJECT(this), TQT_SLOT(slotForward()),
false, true);
d->accelerators->insert("Previous Image Key_Prior", i18n("Previous Image"),
i18n("Load Previous Image"),
- Key_Prior, this, SLOT(slotBackward()),
+ Key_Prior, TQT_TQOBJECT(this), TQT_SLOT(slotBackward()),
false, true);
d->accelerators->insert("Zoom Plus Key_Plus", i18n("Zoom In"),
i18n("Zoom in on Image"),
- Key_Plus, this, SLOT(slotIncreaseZoom()),
+ Key_Plus, TQT_TQOBJECT(this), TQT_SLOT(slotIncreaseZoom()),
false, true);
d->accelerators->insert("Zoom Plus Key_Minus", i18n("Zoom Out"),
i18n("Zoom out of Image"),
- Key_Minus, this, SLOT(slotDecreaseZoom()),
+ Key_Minus, TQT_TQOBJECT(this), TQT_SLOT(slotDecreaseZoom()),
false, true);
d->accelerators->insert("Redo CTRL+Key_Y", i18n("Redo"),
i18n("Redo Last action"),
- CTRL+Key_Y, m_canvas, SLOT(slotRedo()),
+ CTRL+Key_Y, TQT_TQOBJECT(m_canvas), TQT_SLOT(slotRedo()),
false, true);
}
void EditorWindow::setupStatusBar()
{
m_nameLabel = new StatusProgressBar(statusBar());
- m_nameLabel->setAlignment(Qt::AlignCenter);
+ m_nameLabel->tqsetAlignment(TQt::AlignCenter);
m_nameLabel->setMaximumHeight(fontMetrics().height()+2);
statusBar()->addWidget(m_nameLabel, 100);
- d->selectLabel = new QLabel(i18n("No selection"), statusBar());
- d->selectLabel->setAlignment(Qt::AlignCenter);
+ d->selectLabel = new TQLabel(i18n("No selection"), statusBar());
+ d->selectLabel->tqsetAlignment(TQt::AlignCenter);
d->selectLabel->setMaximumHeight(fontMetrics().height()+2);
statusBar()->addWidget(d->selectLabel, 100);
- QToolTip::add(d->selectLabel, i18n("Information about current selection area"));
+ TQToolTip::add(d->selectLabel, i18n("Information about current selection area"));
- m_resLabel = new QLabel(statusBar());
- m_resLabel->setAlignment(Qt::AlignCenter);
+ m_resLabel = new TQLabel(statusBar());
+ m_resLabel->tqsetAlignment(TQt::AlignCenter);
m_resLabel->setMaximumHeight(fontMetrics().height()+2);
statusBar()->addWidget(m_resLabel, 100);
- QToolTip::add(m_resLabel, i18n("Information about image size"));
+ TQToolTip::add(m_resLabel, i18n("Information about image size"));
- d->underExposureIndicator = new QToolButton(statusBar());
+ d->underExposureIndicator = new TQToolButton(statusBar());
d->underExposureIndicator->setIconSet(SmallIcon("underexposure"));
d->underExposureIndicator->setToggleButton(true);
statusBar()->addWidget(d->underExposureIndicator, 1);
- d->overExposureIndicator = new QToolButton(statusBar());
+ d->overExposureIndicator = new TQToolButton(statusBar());
d->overExposureIndicator->setIconSet(SmallIcon("overexposure"));
d->overExposureIndicator->setToggleButton(true);
statusBar()->addWidget(d->overExposureIndicator, 1);
- d->cmViewIndicator = new QToolButton(statusBar());
+ d->cmViewIndicator = new TQToolButton(statusBar());
d->cmViewIndicator->setIconSet(SmallIcon("tv"));
d->cmViewIndicator->setToggleButton(true);
statusBar()->addWidget(d->cmViewIndicator, 1);
- connect(d->underExposureIndicator, SIGNAL(toggled(bool)),
- this, SLOT(slotToggleUnderExposureIndicator()));
+ connect(d->underExposureIndicator, TQT_SIGNAL(toggled(bool)),
+ TQT_TQOBJECT(this), TQT_SLOT(slotToggleUnderExposureIndicator()));
- connect(d->overExposureIndicator, SIGNAL(toggled(bool)),
- this, SLOT(slotToggleOverExposureIndicator()));
+ connect(d->overExposureIndicator, TQT_SIGNAL(toggled(bool)),
+ TQT_TQOBJECT(this), TQT_SLOT(slotToggleOverExposureIndicator()));
- connect(d->cmViewIndicator, SIGNAL(toggled(bool)),
- this, SLOT(slotToggleColorManagedView()));
+ connect(d->cmViewIndicator, TQT_SIGNAL(toggled(bool)),
+ TQT_TQOBJECT(this), TQT_SLOT(slotToggleColorManagedView()));
}
void EditorWindow::printImage(KURL url)
@@ -618,22 +618,22 @@ void EditorWindow::printImage(KURL url)
DImg image(w, h, sixteenBit, hasAlpha, ptr);
KPrinter printer;
- QString appName = KApplication::kApplication()->aboutData()->appName();
+ TQString appName = KApplication::kApplication()->aboutData()->appName();
printer.setDocName( url.filename() );
printer.setCreator( appName );
#if KDE_IS_VERSION(3,2,0)
printer.setUsePrinterResolution(true);
#endif
- KPrinter::addDialogPage( new ImageEditorPrintDialogPage(image, this, (appName.append(" page")).ascii() ));
+ KPrinter::addDialogPage( new ImageEditorPrintDialogPage(image, this, TQString(appName.append(" page")).ascii() ));
- if ( printer.setup( this, i18n("Print %1").arg(printer.docName().section('/', -1)) ) )
+ if ( printer.setup( this, i18n("Print %1").tqarg(printer.docName().section('/', -1)) ) )
{
ImagePrint printOperations(image, printer, url.filename());
- if (!printOperations.printImageWithQt())
+ if (!printOperations.printImageWithTQt())
{
KMessageBox::error(this, i18n("Failed to print file: '%1'")
- .arg(url.filename()));
+ .tqarg(url.filename()));
}
}
}
@@ -643,7 +643,7 @@ void EditorWindow::slotEditKeys()
KKeyDialog dialog(true, this);
dialog.insert( actionCollection(), i18n( "General" ) );
- QPtrList<ImagePlugin> pluginList = ImagePluginLoader::instance()->pluginList();
+ TQPtrList<ImagePlugin> pluginList = ImagePluginLoader::instance()->pluginList();
for (ImagePlugin* plugin = pluginList.first();
plugin; plugin = pluginList.next())
@@ -666,13 +666,13 @@ void EditorWindow::slotResize()
void EditorWindow::slotAboutToShowUndoMenu()
{
m_undoAction->popupMenu()->clear();
- QStringList titles;
+ TQStringList titles;
m_canvas->getUndoHistory(titles);
if(!titles.isEmpty())
{
int id = 1;
- QStringList::Iterator iter = titles.begin();
+ TQStringList::Iterator iter = titles.begin();
for(; iter != titles.end(); ++iter,++id)
{
m_undoAction->popupMenu()->insertItem(*iter, id);
@@ -683,13 +683,13 @@ void EditorWindow::slotAboutToShowUndoMenu()
void EditorWindow::slotAboutToShowRedoMenu()
{
m_redoAction->popupMenu()->clear();
- QStringList titles;
+ TQStringList titles;
m_canvas->getRedoHistory(titles);
if(!titles.isEmpty())
{
int id = 1;
- QStringList::Iterator iter = titles.begin();
+ TQStringList::Iterator iter = titles.begin();
for(; iter != titles.end(); ++iter,++id)
{
m_redoAction->popupMenu()->insertItem(*iter, id);
@@ -702,8 +702,8 @@ void EditorWindow::slotConfToolbars()
saveMainWindowSettings(KGlobal::config(), "ImageViewer Settings");
KEditToolbar dlg(factory(), this);
- connect(&dlg, SIGNAL(newToolbarConfig()),
- this, SLOT(slotNewToolbarConfig()));
+ connect(&dlg, TQT_SIGNAL(newToolbarConfig()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotNewToolbarConfig()));
dlg.exec();
}
@@ -749,12 +749,12 @@ void EditorWindow::slotZoomTo100Percents()
void EditorWindow::slotZoomSelected()
{
- QString txt = d->zoomCombo->currentText();
- txt = txt.left(txt.find('%'));
+ TQString txt = d->zoomCombo->currentText();
+ txt = txt.left(txt.tqfind('%'));
slotZoomTextChanged(txt);
}
-void EditorWindow::slotZoomTextChanged(const QString &txt)
+void EditorWindow::slotZoomTextChanged(const TQString &txt)
{
bool r = false;
double zoom = KGlobal::locale()->readNumber(txt, &r) / 100.0;
@@ -768,7 +768,7 @@ void EditorWindow::slotZoomChanged(bool isMax, bool isMin, double zoom)
d->zoomMinusAction->setEnabled(!isMin);
d->zoomCombo->blockSignals(true);
- d->zoomCombo->setCurrentText(QString::number(lround(zoom*100.0)) + QString("%"));
+ d->zoomCombo->setCurrentText(TQString::number(lround(zoom*100.0)) + TQString("%"));
d->zoomCombo->blockSignals(false);
}
@@ -795,7 +795,7 @@ void EditorWindow::plugActionAccel(KAction* action)
action->whatsThis(),
action->shortcut(),
action,
- SLOT(activate()));
+ TQT_SLOT(activate()));
}
void EditorWindow::unplugActionAccel(KAction* action)
@@ -805,7 +805,7 @@ void EditorWindow::unplugActionAccel(KAction* action)
void EditorWindow::loadImagePlugins()
{
- QPtrList<ImagePlugin> pluginList = m_imagePluginLoader->pluginList();
+ TQPtrList<ImagePlugin> pluginList = m_imagePluginLoader->pluginList();
for (ImagePlugin* plugin = pluginList.first();
plugin; plugin = pluginList.next())
@@ -822,7 +822,7 @@ void EditorWindow::loadImagePlugins()
void EditorWindow::unLoadImagePlugins()
{
- QPtrList<ImagePlugin> pluginList = m_imagePluginLoader->pluginList();
+ TQPtrList<ImagePlugin> pluginList = m_imagePluginLoader->pluginList();
for (ImagePlugin* plugin = pluginList.first();
plugin; plugin = pluginList.next())
@@ -867,10 +867,10 @@ void EditorWindow::applyStandardSettings()
d->ICCSettings->BPCSetting = config->readBoolEntry("BPCAlgorithm",false);
d->ICCSettings->managedViewSetting = config->readBoolEntry("ManagedView", false);
d->ICCSettings->renderingSetting = config->readNumEntry("RenderingIntent");
- d->ICCSettings->inputSetting = config->readPathEntry("InProfileFile", QString());
- d->ICCSettings->workspaceSetting = config->readPathEntry("WorkProfileFile", QString());
- d->ICCSettings->monitorSetting = config->readPathEntry("MonitorProfileFile", QString());
- d->ICCSettings->proofSetting = config->readPathEntry("ProofProfileFile", QString());
+ d->ICCSettings->inputSetting = config->readPathEntry("InProfileFile", TQString());
+ d->ICCSettings->workspaceSetting = config->readPathEntry("WorkProfileFile", TQString());
+ d->ICCSettings->monitorSetting = config->readPathEntry("MonitorProfileFile", TQString());
+ d->ICCSettings->proofSetting = config->readPathEntry("ProofProfileFile", TQString());
d->viewCMViewAction->setEnabled(d->ICCSettings->enableCMSetting);
d->viewCMViewAction->setChecked(d->ICCSettings->managedViewSetting);
@@ -936,11 +936,11 @@ void EditorWindow::applyStandardSettings()
// -- GUI Settings -------------------------------------------------------
- QSizePolicy rightSzPolicy(QSizePolicy::Preferred, QSizePolicy::Expanding, 2, 1);
+ TQSizePolicy rightSzPolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding, 2, 1);
if(config->hasKey("Splitter Sizes"))
m_splitter->setSizes(config->readIntListEntry("Splitter Sizes"));
else
- m_canvas->setSizePolicy(rightSzPolicy);
+ m_canvas->tqsetSizePolicy(rightSzPolicy);
d->fullScreenHideToolBar = config->readBoolEntry("FullScreen Hide ToolBar", false);
@@ -948,8 +948,8 @@ void EditorWindow::applyStandardSettings()
// -- Exposure Indicators Settings ---------------------------------------
- QColor black(Qt::black);
- QColor white(Qt::white);
+ TQColor black(TQt::black);
+ TQColor white(TQt::white);
d->exposureSettings->underExposureIndicator = config->readBoolEntry("UnderExposureIndicator", false);
d->exposureSettings->overExposureIndicator = config->readBoolEntry("OverExposureIndicator", false);
d->exposureSettings->underExposureColor = config->readColorEntry("UnderExposureColor", &white);
@@ -1024,7 +1024,7 @@ void EditorWindow::toggleStandardActions(bool val)
m_redoAction->setEnabled(val);
}
- QPtrList<ImagePlugin> pluginList = m_imagePluginLoader->pluginList();
+ TQPtrList<ImagePlugin> pluginList = m_imagePluginLoader->pluginList();
for (ImagePlugin* plugin = pluginList.first();
plugin; plugin = pluginList.next())
@@ -1042,11 +1042,7 @@ void EditorWindow::slotToggleFullScreen()
{
m_canvas->setBackgroundColor(m_bgColor);
-#if QT_VERSION >= 0x030300
setWindowState( windowState() & ~WindowFullScreen );
-#else
- showNormal();
-#endif
menuBar()->show();
statusBar()->show();
leftDock()->show();
@@ -1054,11 +1050,11 @@ void EditorWindow::slotToggleFullScreen()
topDock()->show();
bottomDock()->show();
- QObject* obj = child("ToolBar","KToolBar");
+ TQObject* obj = child("ToolBar","KToolBar");
if (obj)
{
- KToolBar* toolBar = static_cast<KToolBar*>(obj);
+ KToolBar* toolBar = static_cast<KToolBar*>(TQT_TQWIDGET(obj));
if (m_fullScreenAction->isPlugged(toolBar) && d->removeFullScreenButton)
m_fullScreenAction->unplug(toolBar);
@@ -1090,7 +1086,7 @@ void EditorWindow::slotToggleFullScreen()
}
else // go to fullscreen
{
- m_canvas->setBackgroundColor(QColor(Qt::black));
+ m_canvas->setBackgroundColor(TQColor(TQt::black));
// hide the menubar and the statusbar
menuBar()->hide();
@@ -1100,11 +1096,11 @@ void EditorWindow::slotToggleFullScreen()
rightDock()->hide();
bottomDock()->hide();
- QObject* obj = child("ToolBar","KToolBar");
+ TQObject* obj = child("ToolBar","KToolBar");
if (obj)
{
- KToolBar* toolBar = static_cast<KToolBar*>(obj);
+ KToolBar* toolBar = static_cast<KToolBar*>(TQT_TQWIDGET(obj));
if (d->fullScreenHideToolBar)
{
@@ -1157,21 +1153,21 @@ void EditorWindow::slotRotatedOrFlipped()
m_rotatedOrFlipped = true;
}
-void EditorWindow::slotLoadingProgress(const QString&, float progress)
+void EditorWindow::slotLoadingProgress(const TQString&, float progress)
{
m_nameLabel->setProgressValue((int)(progress*100.0));
}
-void EditorWindow::slotSavingProgress(const QString&, float progress)
+void EditorWindow::slotSavingProgress(const TQString&, float progress)
{
m_nameLabel->setProgressValue((int)(progress*100.0));
}
bool EditorWindow::promptForOverWrite()
{
- QFileInfo fi(m_canvas->currentImageFilePath());
- QString warnMsg(i18n("About to overwrite file \"%1\"\nAre you sure?")
- .arg(fi.fileName()));
+ TQFileInfo fi(m_canvas->currentImageFilePath());
+ TQString warnMsg(i18n("About to overwrite file \"%1\"\nAre you sure?")
+ .tqarg(fi.fileName()));
return (KMessageBox::warningContinueCancel(this,
warnMsg,
i18n("Warning"),
@@ -1193,8 +1189,8 @@ bool EditorWindow::promptUserSave(const KURL& url)
int result = KMessageBox::warningYesNoCancel(this,
i18n("The image '%1' has been modified.\n"
"Do you want to save it?")
- .arg(url.filename()),
- QString(),
+ .tqarg(url.filename()),
+ TQString(),
KStdGuiItem::save(),
KStdGuiItem::discard());
@@ -1257,10 +1253,10 @@ bool EditorWindow::waitForSavingToComplete()
void EditorWindow::enter_loop()
{
- QWidget dummy(0, 0, WType_Dialog | WShowModal);
- dummy.setFocusPolicy( QWidget::NoFocus );
+ TQWidget dummy(0, 0, WType_Dialog | WShowModal);
+ dummy.setFocusPolicy( TQ_NoFocus );
qt_enter_modal(&dummy);
- qApp->enter_loop();
+ tqApp->enter_loop();
qt_leave_modal(&dummy);
}
@@ -1280,21 +1276,21 @@ void EditorWindow::slotSelected(bool val)
}
}
- QRect sel = m_canvas->getSelectedArea();
+ TQRect sel = m_canvas->getSelectedArea();
// Update histogram into sidebar.
emit signalSelectionChanged(sel);
// Update status bar
if (val)
- d->selectLabel->setText(QString("(%1, %2) (%3 x %4)").arg(sel.x()).arg(sel.y())
- .arg(sel.width()).arg(sel.height()));
+ d->selectLabel->setText(TQString("(%1, %2) (%3 x %4)").tqarg(sel.x()).tqarg(sel.y())
+ .tqarg(sel.width()).tqarg(sel.height()));
else
d->selectLabel->setText(i18n("No selection"));
}
void EditorWindow::hideToolBars()
{
- QPtrListIterator<KToolBar> it = toolBarIterator();
+ TQPtrListIterator<KToolBar> it = toolBarIterator();
KToolBar* bar;
for(;it.current()!=0L; ++it)
@@ -1310,7 +1306,7 @@ void EditorWindow::hideToolBars()
void EditorWindow::showToolBars()
{
- QPtrListIterator<KToolBar> it = toolBarIterator();
+ TQPtrListIterator<KToolBar> it = toolBarIterator();
KToolBar* bar;
for( ; it.current()!=0L ; ++it)
@@ -1332,14 +1328,14 @@ void EditorWindow::slotPrepareToLoad()
slotUpdateItemInfo();
}
-void EditorWindow::slotLoadingStarted(const QString& /*filename*/)
+void EditorWindow::slotLoadingStarted(const TQString& /*filename*/)
{
setCursor( KCursor::waitCursor() );
m_nameLabel->progressBarMode(StatusProgressBar::ProgressBarMode, i18n("Loading: "));
}
-void EditorWindow::slotLoadingFinished(const QString& filename, bool success)
+void EditorWindow::slotLoadingFinished(const TQString& filename, bool success)
{
m_nameLabel->progressBarMode(StatusProgressBar::TextMode);
slotUpdateItemInfo();
@@ -1351,10 +1347,10 @@ void EditorWindow::slotLoadingFinished(const QString& filename, bool success)
unsetCursor();
// Note: in showfoto, we using a null filename to clear canvas.
- if (!success && filename != QString())
+ if (!success && filename != TQString())
{
- QFileInfo fi(filename);
- QString message = i18n("Failed to load image \"%1\"").arg(fi.fileName());
+ TQFileInfo fi(filename);
+ TQString message = i18n("Failed to load image \"%1\"").tqarg(fi.fileName());
KMessageBox::error(this, message);
DWarning() << "Failed to load image " << fi.fileName() << endl;
}
@@ -1381,7 +1377,7 @@ void EditorWindow::slotSave()
save();
}
-void EditorWindow::slotSavingStarted(const QString& /*filename*/)
+void EditorWindow::slotSavingStarted(const TQString& /*filename*/)
{
setCursor( KCursor::waitCursor() );
@@ -1392,7 +1388,7 @@ void EditorWindow::slotSavingStarted(const QString& /*filename*/)
m_nameLabel->progressBarMode(StatusProgressBar::CancelProgressBarMode, i18n("Saving: "));
}
-void EditorWindow::slotSavingFinished(const QString& filename, bool success)
+void EditorWindow::slotSavingFinished(const TQString& filename, bool success)
{
if (m_savingContext->savingState == SavingContextContainer::SavingStateSave)
{
@@ -1404,8 +1400,8 @@ void EditorWindow::slotSavingFinished(const QString& filename, bool success)
if (!m_savingContext->abortingSaving)
{
KMessageBox::error(this, i18n("Failed to save file\n\"%1\"\nto\n\"%2\".")
- .arg(m_savingContext->destinationURL.filename())
- .arg(m_savingContext->destinationURL.path()));
+ .tqarg(m_savingContext->destinationURL.filename())
+ .tqarg(m_savingContext->destinationURL.path()));
}
finishSaving(false);
return;
@@ -1445,8 +1441,8 @@ void EditorWindow::slotSavingFinished(const QString& filename, bool success)
if (!m_savingContext->abortingSaving)
{
KMessageBox::error(this, i18n("Failed to save file\n\"%1\"\nto\n\"%2\".")
- .arg(m_savingContext->destinationURL.filename())
- .arg(m_savingContext->destinationURL.path()));
+ .tqarg(m_savingContext->destinationURL.filename())
+ .tqarg(m_savingContext->destinationURL.path()));
}
finishSaving(false);
return;
@@ -1485,9 +1481,9 @@ void EditorWindow::finishSaving(bool success)
m_savingContext->saveTempFile = 0;
}
- // Exit of internal Qt event loop to unlock promptUserSave() method.
+ // Exit of internal TQt event loop to unlock promptUserSave() method.
if (m_savingContext->synchronizingState == SavingContextContainer::SynchronousSaving)
- qApp->exit_loop();
+ tqApp->exit_loop();
// Enable actions as appropriate after saving
toggleActions(true);
@@ -1532,7 +1528,7 @@ bool EditorWindow::startingSaveAs(const KURL& url)
if (m_savingContext->savingState != SavingContextContainer::SavingStateNone)
return false;
- QString mimetypes = KImageIO::mimeTypes(KImageIO::Writing).join(" ");
+ TQString mimetypes = KImageIO::mimeTypes(KImageIO::Writing).join(" ");
mimetypes.append(" image/tiff");
DDebug () << "mimetypes=" << mimetypes << endl;
@@ -1540,18 +1536,18 @@ bool EditorWindow::startingSaveAs(const KURL& url)
FileSaveOptionsBox *options = new FileSaveOptionsBox();
KFileDialog imageFileSaveDialog(m_savingContext->srcURL.isLocalFile() ?
- m_savingContext->srcURL.directory() : QDir::homeDirPath(),
- QString(),
+ m_savingContext->srcURL.directory() : TQDir::homeDirPath(),
+ TQString(),
this,
"imageFileSaveDialog",
false,
options);
- connect(&imageFileSaveDialog, SIGNAL(filterChanged(const QString &)),
- options, SLOT(slotImageFileFormatChanged(const QString &)));
+ connect(&imageFileSaveDialog, TQT_SIGNAL(filterChanged(const TQString &)),
+ options, TQT_SLOT(slotImageFileFormatChanged(const TQString &)));
- connect(&imageFileSaveDialog, SIGNAL(fileSelected(const QString &)),
- options, SLOT(slotImageFileSelected(const QString &)));
+ connect(&imageFileSaveDialog, TQT_SIGNAL(fileSelected(const TQString &)),
+ options, TQT_SLOT(slotImageFileSelected(const TQString &)));
ImageDialogPreview *preview = new ImageDialogPreview(&imageFileSaveDialog);
imageFileSaveDialog.setPreviewWidget(preview);
@@ -1560,11 +1556,11 @@ bool EditorWindow::startingSaveAs(const KURL& url)
imageFileSaveDialog.setCaption(i18n("New Image File Name"));
imageFileSaveDialog.setFilter(mimetypes);
- QFileInfo info(m_savingContext->srcURL.fileName());
+ TQFileInfo info(m_savingContext->srcURL.fileName());
KConfig* config = kapp->config();
config->setGroup("ImageViewer Settings");
- QString ext = config->readEntry("LastSavedImageTypeMime", "png");
- QString fileName = info.baseName(false) + QString(".") + ext;
+ TQString ext = config->readEntry("LastSavedImageTypeMime", "png");
+ TQString fileName = info.baseName(false) + TQString(".") + ext;
imageFileSaveDialog.setSelection(fileName);
// Start dialog and check if canceled.
@@ -1584,36 +1580,36 @@ bool EditorWindow::startingSaveAs(const KURL& url)
{
// Else, check if target image format have been add to target image file name using extension.
- QFileInfo fi(newURL.path());
+ TQFileInfo fi(newURL.path());
m_savingContext->format = fi.extension(false);
if ( m_savingContext->format.isEmpty() )
{
// If format is empty then file format is same as that of the original file.
- m_savingContext->format = QImageIO::imageFormat(m_savingContext->srcURL.path());
+ m_savingContext->format = TQImageIO::imageFormat(m_savingContext->srcURL.path());
}
else
{
// Else, check if format from file name extension is include on file mime type list.
- QString imgExtPattern;
- QStringList imgExtList = QStringList::split(" ", mimetypes);
- for (QStringList::ConstIterator it = imgExtList.begin() ; it != imgExtList.end() ; ++it)
+ TQString imgExtPattern;
+ TQStringList imgExtList = TQStringList::split(" ", mimetypes);
+ for (TQStringList::ConstIterator it = imgExtList.begin() ; it != imgExtList.end() ; ++it)
{
imgExtPattern.append (KImageIO::typeForMime(*it).upper());
imgExtPattern.append (" ");
}
imgExtPattern.append (" TIF TIFF");
- if ( imgExtPattern.contains("JPEG") )
+ if ( imgExtPattern.tqcontains("JPEG") )
{
imgExtPattern.append (" JPG");
imgExtPattern.append (" JPE");
}
- if ( !imgExtPattern.contains( m_savingContext->format.upper() ) )
+ if ( !imgExtPattern.tqcontains( m_savingContext->format.upper() ) )
{
KMessageBox::error(this, i18n("Target image file format \"%1\" unsupported.")
- .arg(m_savingContext->format));
+ .tqarg(m_savingContext->format));
DWarning() << k_funcinfo << "target image file format " << m_savingContext->format << " unsupported!" << endl;
return false;
}
@@ -1623,8 +1619,8 @@ bool EditorWindow::startingSaveAs(const KURL& url)
if (!newURL.isValid())
{
KMessageBox::error(this, i18n("Failed to save file\n\"%1\" to\n\"%2\".")
- .arg(newURL.filename())
- .arg(newURL.path().section('/', -2, -2)));
+ .tqarg(newURL.filename())
+ .tqarg(newURL.path().section('/', -2, -2)));
DWarning() << k_funcinfo << "target URL is not valid !" << endl;
return false;
}
@@ -1646,7 +1642,7 @@ bool EditorWindow::startingSaveAs(const KURL& url)
// Check for overwrite ----------------------------------------------------------
- QFileInfo fi(newURL.path());
+ TQFileInfo fi(newURL.path());
m_savingContext->destinationExisted = fi.exists();
if ( m_savingContext->destinationExisted )
{
@@ -1655,7 +1651,7 @@ bool EditorWindow::startingSaveAs(const KURL& url)
KMessageBox::warningYesNo( this, i18n("A file named \"%1\" already "
"exists. Are you sure you want "
"to overwrite it?")
- .arg(newURL.filename()),
+ .tqarg(newURL.filename()),
i18n("Overwrite File?"),
i18n("Overwrite"),
KStdGuiItem::cancel() );
@@ -1691,7 +1687,7 @@ bool EditorWindow::checkPermissions(const KURL& url)
//TODO: Check that the permissions can actually be changed
// if write permissions are not available.
- QFileInfo fi(url.path());
+ TQFileInfo fi(url.path());
if (fi.exists() && !fi.isWritable())
{
@@ -1701,7 +1697,7 @@ bool EditorWindow::checkPermissions(const KURL& url)
"for the file named \"%1\". "
"Are you sure you want "
"to overwrite it?")
- .arg(url.filename()),
+ .tqarg(url.filename()),
i18n("Overwrite File?"),
i18n("Overwrite"),
KStdGuiItem::cancel() );
@@ -1715,7 +1711,7 @@ bool EditorWindow::checkPermissions(const KURL& url)
bool EditorWindow::moveFile()
{
- QCString dstFileName = QFile::encodeName(m_savingContext->destinationURL.path());
+ TQCString dstFileName = TQFile::encodeName(m_savingContext->destinationURL.path());
// Store old permissions:
// Just get the current umask.
@@ -1737,7 +1733,7 @@ bool EditorWindow::moveFile()
}
// rename tmp file to dest
- if (::rename(QFile::encodeName(m_savingContext->saveTempFile->name()), dstFileName) != 0)
+ if (::rename(TQFile::encodeName(m_savingContext->saveTempFile->name()), dstFileName) != 0)
{
KMessageBox::error(this, i18n("Failed to overwrite original file"),
i18n("Error Saving File"));
@@ -1781,8 +1777,8 @@ void EditorWindow::slotToggleColorManagedView()
void EditorWindow::setColorManagedViewIndicatorToolTip(bool available, bool cmv)
{
- QToolTip::remove(d->cmViewIndicator);
- QString tooltip;
+ TQToolTip::remove(d->cmViewIndicator);
+ TQString tooltip;
if (available)
{
if (cmv)
@@ -1794,7 +1790,7 @@ void EditorWindow::setColorManagedViewIndicatorToolTip(bool available, bool cmv)
{
tooltip = i18n("Color Management is not configured, so the Color Managed View is not available");
}
- QToolTip::add(d->cmViewIndicator, tooltip);
+ TQToolTip::add(d->cmViewIndicator, tooltip);
}
void EditorWindow::slotToggleUnderExposureIndicator()
@@ -1813,8 +1809,8 @@ void EditorWindow::slotToggleUnderExposureIndicator()
void EditorWindow::setUnderExposureToolTip(bool uei)
{
- QToolTip::remove(d->underExposureIndicator);
- QToolTip::add(d->underExposureIndicator,
+ TQToolTip::remove(d->underExposureIndicator);
+ TQToolTip::add(d->underExposureIndicator,
uei ? i18n("Under-Exposure indicator is enabled")
: i18n("Under-Exposure indicator is disabled"));
}
@@ -1835,8 +1831,8 @@ void EditorWindow::slotToggleOverExposureIndicator()
void EditorWindow::setOverExposureToolTip(bool oei)
{
- QToolTip::remove(d->overExposureIndicator);
- QToolTip::add(d->overExposureIndicator,
+ TQToolTip::remove(d->overExposureIndicator);
+ TQToolTip::add(d->overExposureIndicator,
oei ? i18n("Over-Exposure indicator is enabled")
: i18n("Over-Exposure indicator is disabled"));
}
@@ -1869,10 +1865,10 @@ void EditorWindow::slotToggleSlideShow()
slideShow(startWithCurrent, settings);
}
-void EditorWindow::slotSelectionChanged(const QRect& sel)
+void EditorWindow::slotSelectionChanged(const TQRect& sel)
{
- d->selectLabel->setText(QString("(%1, %2) (%3 x %4)").arg(sel.x()).arg(sel.y())
- .arg(sel.width()).arg(sel.height()));
+ d->selectLabel->setText(TQString("(%1, %2) (%3 x %4)").tqarg(sel.x()).tqarg(sel.y())
+ .tqarg(sel.width()).tqarg(sel.height()));
}
void EditorWindow::slotRawCameraList()
@@ -1883,10 +1879,10 @@ void EditorWindow::slotRawCameraList()
void EditorWindow::slotThemeChanged()
{
- QStringList themes(ThemeEngine::instance()->themeNames());
- int index = themes.findIndex(ThemeEngine::instance()->getCurrentThemeName());
+ TQStringList themes(ThemeEngine::instance()->themeNames());
+ int index = themes.tqfindIndex(ThemeEngine::instance()->getCurrentThemeName());
if (index == -1)
- index = themes.findIndex(i18n("Default"));
+ index = themes.tqfindIndex(i18n("Default"));
m_themeMenuAction->setCurrentItem(index);
@@ -1894,22 +1890,22 @@ void EditorWindow::slotThemeChanged()
config->setGroup("ImageViewer Settings");
if (!config->readBoolEntry("UseThemeBackgroundColor", true))
- m_bgColor = config->readColorEntry("BackgroundColor", &Qt::black);
+ m_bgColor = config->readColorEntry("BackgroundColor", &TQt::black);
else
m_bgColor = ThemeEngine::instance()->baseColor();
m_canvas->setBackgroundColor(m_bgColor);
}
-void EditorWindow::slotChangeTheme(const QString& theme)
+void EditorWindow::slotChangeTheme(const TQString& theme)
{
ThemeEngine::instance()->slotChangeTheme(theme);
}
-void EditorWindow::setToolStartProgress(const QString& toolName)
+void EditorWindow::setToolStartProgress(const TQString& toolName)
{
m_nameLabel->setProgressValue(0);
- m_nameLabel->progressBarMode(StatusProgressBar::CancelProgressBarMode, QString("%1: ").arg(toolName));
+ m_nameLabel->progressBarMode(StatusProgressBar::CancelProgressBarMode, TQString("%1: ").tqarg(toolName));
}
void EditorWindow::setToolProgress(int progress)
diff --git a/digikam/utilities/imageeditor/editor/editorwindow.h b/digikam/utilities/imageeditor/editor/editorwindow.h
index 6cb20cf..160f543 100644
--- a/digikam/utilities/imageeditor/editor/editorwindow.h
+++ b/digikam/utilities/imageeditor/editor/editorwindow.h
@@ -24,11 +24,11 @@
#ifndef EDITORWINDOW_H
#define EDITORWINDOW_H
-// Qt includes.
+// TQt includes.
-#include <qcolor.h>
-#include <qstring.h>
-#include <qrect.h>
+#include <tqcolor.h>
+#include <tqstring.h>
+#include <tqrect.h>
// KDE includes.
@@ -40,9 +40,9 @@
#include "sidebar.h"
#include "digikam_export.h"
-class QSplitter;
-class QPopupMenu;
-class QLabel;
+class TQSplitter;
+class TQPopupMenu;
+class TQLabel;
class KToolBarPopupAction;
class KToggleAction;
@@ -66,6 +66,7 @@ class EditorWindowPriv;
class DIGIKAM_EXPORT EditorWindow : public KMainWindow
{
Q_OBJECT
+ TQ_OBJECT
public:
@@ -77,7 +78,7 @@ public:
signals:
- void signalSelectionChanged( const QRect & );
+ void signalSelectionChanged( const TQRect & );
void signalNoCurrentItem();
protected:
@@ -87,11 +88,11 @@ protected:
bool m_rotatedOrFlipped;
bool m_setExifOrientationTag;
- QLabel *m_resLabel;
+ TQLabel *m_resLabel;
- QColor m_bgColor;
+ TQColor m_bgColor;
- QSplitter *m_splitter;
+ TQSplitter *m_splitter;
KAction *m_saveAction;
KAction *m_saveAsAction;
@@ -188,19 +189,19 @@ protected slots:
void slotSelected(bool);
- void slotLoadingProgress(const QString& filePath, float progress);
- void slotSavingProgress(const QString& filePath, float progress);
+ void slotLoadingProgress(const TQString& filePath, float progress);
+ void slotSavingProgress(const TQString& filePath, float progress);
void slotNameLabelCancelButtonPressed();
void slotThemeChanged();
- virtual void slotLoadingStarted(const QString& filename);
- virtual void slotLoadingFinished(const QString &filename, bool success);
- virtual void slotSavingStarted(const QString &filename);
+ virtual void slotLoadingStarted(const TQString& filename);
+ virtual void slotLoadingFinished(const TQString &filename, bool success);
+ virtual void slotSavingStarted(const TQString &filename);
virtual void slotSetup(){ setup(); };
- virtual void slotChangeTheme(const QString& theme);
+ virtual void slotChangeTheme(const TQString& theme);
virtual void slotFilePrint()=0;
virtual void slotDeleteCurrentItem()=0;
@@ -219,15 +220,15 @@ private slots:
void slotToggleOverExposureIndicator();
void slotToggleColorManagedView();
void slotRotatedOrFlipped();
- void slotSavingFinished(const QString &filename, bool success);
+ void slotSavingFinished(const TQString &filename, bool success);
void slotDonateMoney();
void slotContribute();
void slotToggleSlideShow();
void slotZoomTo100Percents();
void slotZoomSelected();
- void slotZoomTextChanged(const QString &);
+ void slotZoomTextChanged(const TQString &);
void slotZoomChanged(bool isMax, bool isMin, double zoom);
- void slotSelectionChanged(const QRect& sel);
+ void slotSelectionChanged(const TQRect& sel);
void slotToggleFitToWindow();
void slotToggleOffFitToWindow();
void slotFitToSelect();
@@ -246,7 +247,7 @@ private:
void setUnderExposureToolTip(bool uei);
void setOverExposureToolTip(bool oei);
- void setToolStartProgress(const QString& toolName);
+ void setToolStartProgress(const TQString& toolName);
void setToolProgress(int progress);
void setToolStopProgress();
diff --git a/digikam/utilities/imageeditor/editor/editorwindowprivate.h b/digikam/utilities/imageeditor/editor/editorwindowprivate.h
index e66504e..51265b9 100644
--- a/digikam/utilities/imageeditor/editor/editorwindowprivate.h
+++ b/digikam/utilities/imageeditor/editor/editorwindowprivate.h
@@ -25,8 +25,8 @@
#ifndef EDITORWINDOWPRIVATE_H
#define EDITORWINDOWPRIVATE_H
-class QToolButton;
-class QLabel;
+class TQToolButton;
+class TQLabel;
class KComboBox;
class KAction;
@@ -94,11 +94,11 @@ public:
bool removeFullScreenButton;
bool fullScreenHideToolBar;
- QLabel *selectLabel;
+ TQLabel *selectLabel;
- QToolButton *cmViewIndicator;
- QToolButton *underExposureIndicator;
- QToolButton *overExposureIndicator;
+ TQToolButton *cmViewIndicator;
+ TQToolButton *underExposureIndicator;
+ TQToolButton *overExposureIndicator;
KAction *rawCameraListAction;
KAction *donateMoneyAction;
diff --git a/digikam/utilities/imageeditor/editor/imageiface.cpp b/digikam/utilities/imageeditor/editor/imageiface.cpp
index 600482c..d6134b3 100644
--- a/digikam/utilities/imageeditor/editor/imageiface.cpp
+++ b/digikam/utilities/imageeditor/editor/imageiface.cpp
@@ -22,13 +22,13 @@
*
* ============================================================ */
-// Qt includes.
+// TQt includes.
-#include <qwidget.h>
-#include <qsize.h>
-#include <qpixmap.h>
-#include <qbitmap.h>
-#include <qpainter.h>
+#include <tqwidget.h>
+#include <tqsize.h>
+#include <tqpixmap.h>
+#include <tqbitmap.h>
+#include <tqpainter.h>
// Local includes.
@@ -67,9 +67,9 @@ public:
int previewWidth;
int previewHeight;
- QPixmap qcheck;
- QPixmap qpix;
- QBitmap qmask;
+ TQPixmap qcheck;
+ TQPixmap qpix;
+ TQBitmap qtqmask;
DImg previewImage;
DImg targetPreviewImage;
@@ -86,15 +86,15 @@ ImageIface::ImageIface(int w, int h)
d->originalHeight = DImgInterface::defaultInterface()->origHeight();
d->originalBytesDepth = DImgInterface::defaultInterface()->bytesDepth();
- d->qpix.setMask(d->qmask);
+ d->qpix.setMask(d->qtqmask);
d->qcheck.resize(8, 8);
- QPainter p;
+ TQPainter p;
p.begin(&d->qcheck);
- p.fillRect(0, 0, 4, 4, QColor(144,144,144));
- p.fillRect(4, 4, 4, 4, QColor(144,144,144));
- p.fillRect(0, 4, 4, 4, QColor(100,100,100));
- p.fillRect(4, 0, 4, 4, QColor(100,100,100));
+ p.fillRect(0, 0, 4, 4, TQColor(144,144,144));
+ p.fillRect(4, 4, 4, 4, TQColor(144,144,144));
+ p.fillRect(0, 4, 4, 4, TQColor(100,100,100));
+ p.fillRect(4, 0, 4, 4, TQColor(100,100,100));
p.end();
}
@@ -113,7 +113,7 @@ bool ImageIface::previewType()
return d->usePreviewSelection;
}
-DColor ImageIface::getColorInfoFromOriginalImage(const QPoint& point)
+DColor ImageIface::getColorInfoFromOriginalImage(const TQPoint& point)
{
if ( !DImgInterface::defaultInterface()->getImage() || point.x() > originalWidth() || point.y() > originalHeight() )
{
@@ -124,7 +124,7 @@ DColor ImageIface::getColorInfoFromOriginalImage(const QPoint& point)
return DImgInterface::defaultInterface()->getImg()->getPixelColor(point.x(), point.y());
}
-DColor ImageIface::getColorInfoFromPreviewImage(const QPoint& point)
+DColor ImageIface::getColorInfoFromPreviewImage(const TQPoint& point)
{
if ( d->previewImage.isNull() || point.x() > previewWidth() || point.y() > previewHeight() )
{
@@ -135,7 +135,7 @@ DColor ImageIface::getColorInfoFromPreviewImage(const QPoint& point)
return d->previewImage.getPixelColor(point.x(), point.y());
}
-DColor ImageIface::getColorInfoFromTargetPreviewImage(const QPoint& point)
+DColor ImageIface::getColorInfoFromTargetPreviewImage(const TQPoint& point)
{
if ( d->targetPreviewImage.isNull() || point.x() > previewWidth() || point.y() > previewHeight() )
{
@@ -189,8 +189,8 @@ uchar* ImageIface::getPreviewImage() const
}
}
- QSize sz(im->width(), im->height());
- sz.scale(d->constrainWidth, d->constrainHeight, QSize::ScaleMin);
+ TQSize sz(im->width(), im->height());
+ sz.tqscale(d->constrainWidth, d->constrainHeight, TQSize::ScaleMin);
d->previewImage = im->smoothScale(sz.width(), sz.height());
d->previewWidth = d->previewImage.width();
@@ -199,7 +199,7 @@ uchar* ImageIface::getPreviewImage() const
// only create another copy if needed, in putPreviewImage
d->targetPreviewImage = d->previewImage;
- d->qmask.resize(d->previewWidth, d->previewHeight);
+ d->qtqmask.resize(d->previewWidth, d->previewHeight);
d->qpix.resize(d->previewWidth, d->previewHeight);
if (d->usePreviewSelection)
@@ -248,7 +248,7 @@ void ImageIface::putPreviewImage(uchar* data)
}
}
-void ImageIface::putOriginalImage(const QString &caller, uchar* data, int w, int h)
+void ImageIface::putOriginalImage(const TQString &caller, uchar* data, int w, int h)
{
if (!data)
return;
@@ -256,12 +256,12 @@ void ImageIface::putOriginalImage(const QString &caller, uchar* data, int w, int
DImgInterface::defaultInterface()->putImage(caller, data, w, h);
}
-void ImageIface::setEmbeddedICCToOriginalImage(const QString& profilePath)
+void ImageIface::setEmbeddedICCToOriginalImage(const TQString& profilePath)
{
DImgInterface::defaultInterface()->setEmbeddedICCToOriginalImage( profilePath );
}
-void ImageIface::putImageSelection(const QString &caller, uchar* data)
+void ImageIface::putImageSelection(const TQString &caller, uchar* data)
{
if (!data)
return;
@@ -358,22 +358,22 @@ void ImageIface::convertOriginalColorDepth(int depth)
DImgInterface::defaultInterface()->convertDepth(depth);
}
-QPixmap ImageIface::convertToPixmap(DImg& img)
+TQPixmap ImageIface::convertToPixmap(DImg& img)
{
return DImgInterface::defaultInterface()->convertToPixmap(img);
}
-QByteArray ImageIface::getEmbeddedICCFromOriginalImage()
+TQByteArray ImageIface::getEmbeddedICCFromOriginalImage()
{
return DImgInterface::defaultInterface()->getEmbeddedICC();
}
-QByteArray ImageIface::getExifFromOriginalImage()
+TQByteArray ImageIface::getExifFromOriginalImage()
{
return DImgInterface::defaultInterface()->getExif();
}
-QByteArray ImageIface::getIptcFromOriginalImage()
+TQByteArray ImageIface::getIptcFromOriginalImage()
{
return DImgInterface::defaultInterface()->getIptc();
}
@@ -386,19 +386,19 @@ PhotoInfoContainer ImageIface::getPhotographInformations() const
return meta.getPhotographInformations();
}
-void ImageIface::paint(QPaintDevice* device, int x, int y, int w, int h,
+void ImageIface::paint(TQPaintDevice* device, int x, int y, int w, int h,
bool underExposure, bool overExposure)
{
if ( !d->targetPreviewImage.isNull() )
{
if (d->targetPreviewImage.hasAlpha())
{
- QPainter p(&d->qpix);
+ TQPainter p(&d->qpix);
p.drawTiledPixmap(0, 0, d->qpix.width(), d->qpix.height(), d->qcheck);
p.end();
}
- QPixmap pixImage;
+ TQPixmap pixImage;
ICCSettingsContainer *iccSettings = DImgInterface::defaultInterface()->getICCSettings();
if (iccSettings)
@@ -420,7 +420,7 @@ void ImageIface::paint(QPaintDevice* device, int x, int y, int w, int h,
pixImage = d->targetPreviewImage.convertToPixmap();
}
- bitBlt(&d->qpix, 0, 0, &pixImage, 0, 0, w, h, Qt::CopyROP, false);
+ bitBlt(TQT_TQPAINTDEVICE(&d->qpix), 0, 0, TQT_TQPAINTDEVICE(&pixImage), 0, 0, w, h, TQt::CopyROP, false);
// Show the Over/Under exposure pixels indicators
@@ -432,13 +432,13 @@ void ImageIface::paint(QPaintDevice* device, int x, int y, int w, int h,
expoSettings.underExposureColor = DImgInterface::defaultInterface()->underExposureColor();
expoSettings.overExposureColor = DImgInterface::defaultInterface()->overExposureColor();
- QImage pureColorMask = d->targetPreviewImage.pureColorMask(&expoSettings);
- QPixmap pixMask(pureColorMask);
- bitBlt(&d->qpix, 0, 0, &pixMask, 0, 0, w, h, Qt::CopyROP, false);
+ TQImage pureColorMask = d->targetPreviewImage.pureColorMask(&expoSettings);
+ TQPixmap pixMask(pureColorMask);
+ bitBlt(TQT_TQPAINTDEVICE(&d->qpix), 0, 0, TQT_TQPAINTDEVICE(&pixMask), 0, 0, w, h, TQt::CopyROP, false);
}
}
- bitBlt(device, x, y, &d->qpix, 0, 0, -1, -1, Qt::CopyROP, false);
+ bitBlt(TQT_TQPAINTDEVICE(device), x, y, TQT_TQPAINTDEVICE(&d->qpix), 0, 0, -1, -1, TQt::CopyROP, false);
}
} // namespace Digikam
diff --git a/digikam/utilities/imageeditor/editor/imageiface.h b/digikam/utilities/imageeditor/editor/imageiface.h
index 61d752b..70e1a3e 100644
--- a/digikam/utilities/imageeditor/editor/imageiface.h
+++ b/digikam/utilities/imageeditor/editor/imageiface.h
@@ -25,10 +25,10 @@
#ifndef IMAGEIFACE_H
#define IMAGEIFACE_H
-// Qt includes.
+// TQt includes.
-#include <qglobal.h>
-#include <qstring.h>
+#include <tqglobal.h>
+#include <tqstring.h>
// KDE includes.
@@ -41,11 +41,11 @@
#include "photoinfocontainer.h"
#include "digikam_export.h"
-#define MAX3(a, b, c) (QMAX(QMAX(a,b),b))
-#define MIN3(a, b, c) (QMIN(QMIN(a,b),b))
+#define MAX3(a, b, c) (TQMAX(TQMAX(a,b),b))
+#define MIN3(a, b, c) (TQMIN(TQMIN(a,b),b))
#define ROUND(x) ((int) ((x) + 0.5))
-class QPaintDevice;
+class TQPaintDevice;
namespace Digikam
{
@@ -102,12 +102,12 @@ public:
If w == -1 and h == -1, the size is unchanged.
Caller is an i18n'ed string that will be shown as the undo/redo action name.
*/
- void putOriginalImage(const QString &caller, uchar* data, int w=-1, int h=-1);
+ void putOriginalImage(const TQString &caller, uchar* data, int w=-1, int h=-1);
/** Embed the Color Profile we have used in ICC plugin when this option is
selected
*/
- void setEmbeddedICCToOriginalImage(const QString& profilePath);
+ void setEmbeddedICCToOriginalImage(const TQString& profilePath);
/** Replace the data of the current original image selection with the given data.
The characteristics of the data must match the characteristics of the current
@@ -116,7 +116,7 @@ public:
No ownership of the data pointer is assumed.
Caller is an i18n'ed string that will be shown as the undo/redo action name.
*/
- void putImageSelection(const QString &caller, uchar* data);
+ void putImageSelection(const TQString &caller, uchar* data);
/** Replace the stored target preview data with the given data.
The characteristics of the data must match the characteristics of the current
@@ -132,9 +132,9 @@ public:
or target preview (set by putPreviewImage) image.
*/
- DColor getColorInfoFromOriginalImage(const QPoint& point);
- DColor getColorInfoFromPreviewImage(const QPoint& point);
- DColor getColorInfoFromTargetPreviewImage(const QPoint& point);
+ DColor getColorInfoFromOriginalImage(const TQPoint& point);
+ DColor getColorInfoFromPreviewImage(const TQPoint& point);
+ DColor getColorInfoFromTargetPreviewImage(const TQPoint& point);
/** Original image information.*/
int originalWidth();
@@ -143,9 +143,9 @@ public:
bool originalHasAlpha();
/** Original image metadata.*/
- QByteArray getEmbeddedICCFromOriginalImage();
- QByteArray getExifFromOriginalImage();
- QByteArray getIptcFromOriginalImage();
+ TQByteArray getEmbeddedICCFromOriginalImage();
+ TQByteArray getExifFromOriginalImage();
+ TQByteArray getIptcFromOriginalImage();
/** Get photograph information from original image.*/
PhotoInfoContainer getPhotographInformations() const;
@@ -179,13 +179,13 @@ public:
/** Convert a DImg image to a pixmap for screen using color
managemed view if necessary */
- QPixmap convertToPixmap(DImg& img);
+ TQPixmap convertToPixmap(DImg& img);
/** Paint the current target preview image (or the preview image,
if putPreviewImage has not been called) on the given paint device.
at x|y, with given maximum width and height.
*/
- void paint(QPaintDevice* device, int x, int y, int w, int h,
+ void paint(TQPaintDevice* device, int x, int y, int w, int h,
bool underExposure=false, bool overExposure=false);
private:
diff --git a/digikam/utilities/imageeditor/editor/imagewindow.cpp b/digikam/utilities/imageeditor/editor/imagewindow.cpp
index d17c6c0..c026568 100644
--- a/digikam/utilities/imageeditor/editor/imagewindow.cpp
+++ b/digikam/utilities/imageeditor/editor/imagewindow.cpp
@@ -26,15 +26,15 @@
#include <cstdio>
-// Qt includes.
+// TQt includes.
-#include <qcursor.h>
-#include <qtimer.h>
-#include <qlabel.h>
-#include <qimage.h>
-#include <qsplitter.h>
-#include <qpainter.h>
-#include <qpixmap.h>
+#include <tqcursor.h>
+#include <tqtimer.h>
+#include <tqlabel.h>
+#include <tqimage.h>
+#include <tqsplitter.h>
+#include <tqpainter.h>
+#include <tqpixmap.h>
// KDE includes.
@@ -217,7 +217,7 @@ Sidebar* ImageWindow::rightSideBar() const
return dynamic_cast<Sidebar*>(d->rightSidebar);
}
-void ImageWindow::closeEvent(QCloseEvent* e)
+void ImageWindow::closeEvent(TQCloseEvent* e)
{
if (!e)
return;
@@ -253,30 +253,30 @@ void ImageWindow::setupConnections()
// To toggle properly keyboards shortcuts from comments & tags side bar tab.
- connect(d->rightSidebar, SIGNAL(signalNextItem()),
- this, SLOT(slotForward()));
+ connect(d->rightSidebar, TQT_SIGNAL(signalNextItem()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotForward()));
- connect(d->rightSidebar, SIGNAL(signalPrevItem()),
- this, SLOT(slotBackward()));
+ connect(d->rightSidebar, TQT_SIGNAL(signalPrevItem()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotBackward()));
- connect(this, SIGNAL(signalSelectionChanged( const QRect &)),
- d->rightSidebar, SLOT(slotImageSelectionChanged( const QRect &)));
+ connect(this, TQT_SIGNAL(signalSelectionChanged( const TQRect &)),
+ d->rightSidebar, TQT_SLOT(slotImageSelectionChanged( const TQRect &)));
- connect(this, SIGNAL(signalNoCurrentItem()),
- d->rightSidebar, SLOT(slotNoCurrentItem()));
+ connect(this, TQT_SIGNAL(signalNoCurrentItem()),
+ d->rightSidebar, TQT_SLOT(slotNoCurrentItem()));
ImageAttributesWatch *watch = ImageAttributesWatch::instance();
- connect(watch, SIGNAL(signalFileMetadataChanged(const KURL &)),
- this, SLOT(slotFileMetadataChanged(const KURL &)));
+ connect(watch, TQT_SIGNAL(signalFileMetadataChanged(const KURL &)),
+ TQT_TQOBJECT(this), TQT_SLOT(slotFileMetadataChanged(const KURL &)));
}
void ImageWindow::setupUserArea()
{
- QWidget* widget = new QWidget(this);
- QHBoxLayout *lay = new QHBoxLayout(widget);
+ TQWidget* widget = new TQWidget(this);
+ TQHBoxLayout *lay = new TQHBoxLayout(widget);
- m_splitter = new QSplitter(widget);
+ m_splitter = new TQSplitter(widget);
m_stackView = new EditorStackView(m_splitter);
m_canvas = new Canvas(m_stackView);
m_stackView->setCanvas(m_canvas);
@@ -284,17 +284,17 @@ void ImageWindow::setupUserArea()
m_canvas->makeDefaultEditingCanvas();
- QSizePolicy rightSzPolicy(QSizePolicy::Preferred, QSizePolicy::Expanding, 2, 1);
- m_canvas->setSizePolicy(rightSzPolicy);
+ TQSizePolicy rightSzPolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding, 2, 1);
+ m_canvas->tqsetSizePolicy(rightSzPolicy);
d->rightSidebar = new ImagePropertiesSideBarDB(widget, "ImageEditor Right Sidebar", m_splitter,
Sidebar::Right, true);
lay->addWidget(m_splitter);
lay->addWidget(d->rightSidebar);
- m_splitter->setFrameStyle( QFrame::NoFrame );
- m_splitter->setFrameShadow( QFrame::Plain );
- m_splitter->setFrameShape( QFrame::NoFrame );
+ m_splitter->setFrameStyle( TQFrame::NoFrame );
+ m_splitter->setFrameShadow( TQFrame::Plain );
+ m_splitter->setFrameShape( TQFrame::NoFrame );
m_splitter->setOpaqueResize(false);
setCentralWidget(widget);
}
@@ -312,22 +312,22 @@ void ImageWindow::setupActions()
// -- Rating actions ---------------------------------------------------------------
d->star0 = new KAction(i18n("Assign Rating \"No Stars\""), CTRL+Key_0,
- this, SLOT(slotAssignRatingNoStar()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotAssignRatingNoStar()),
actionCollection(), "imageview_ratenostar");
d->star1 = new KAction(i18n("Assign Rating \"One Star\""), CTRL+Key_1,
- this, SLOT(slotAssignRatingOneStar()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotAssignRatingOneStar()),
actionCollection(), "imageview_rateonestar");
d->star2 = new KAction(i18n("Assign Rating \"Two Stars\""), CTRL+Key_2,
- this, SLOT(slotAssignRatingTwoStar()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotAssignRatingTwoStar()),
actionCollection(), "imageview_ratetwostar");
d->star3 = new KAction(i18n("Assign Rating \"Three Stars\""), CTRL+Key_3,
- this, SLOT(slotAssignRatingThreeStar()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotAssignRatingThreeStar()),
actionCollection(), "imageview_ratethreestar");
d->star4 = new KAction(i18n("Assign Rating \"Four Stars\""), CTRL+Key_4,
- this, SLOT(slotAssignRatingFourStar()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotAssignRatingFourStar()),
actionCollection(), "imageview_ratefourstar");
d->star5 = new KAction(i18n("Assign Rating \"Five Stars\""), CTRL+Key_5,
- this, SLOT(slotAssignRatingFiveStar()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotAssignRatingFiveStar()),
actionCollection(), "imageview_ratefivestar");
// -- Special Delete actions ---------------------------------------------------------------
@@ -336,8 +336,8 @@ void ImageWindow::setupActions()
d->fileDeletePermanentlyAction = new KAction(i18n("Delete File Permanently"),
"editdelete",
SHIFT+Key_Delete,
- this,
- SLOT(slotDeleteCurrentItemPermanently()),
+ TQT_TQOBJECT(this),
+ TQT_SLOT(slotDeleteCurrentItemPermanently()),
actionCollection(),
"image_delete_permanently");
@@ -346,16 +346,16 @@ void ImageWindow::setupActions()
d->fileDeletePermanentlyDirectlyAction = new KAction(i18n("Delete Permanently without Confirmation"),
"editdelete",
0,
- this,
- SLOT(slotDeleteCurrentItemPermanentlyDirectly()),
+ TQT_TQOBJECT(this),
+ TQT_SLOT(slotDeleteCurrentItemPermanentlyDirectly()),
actionCollection(),
"image_delete_permanently_directly");
d->fileTrashDirectlyAction = new KAction(i18n("Move to Trash without Confirmation"),
"edittrash",
0,
- this,
- SLOT(slotTrashCurrentItemDirectly()),
+ TQT_TQOBJECT(this),
+ TQT_SLOT(slotTrashCurrentItemDirectly()),
actionCollection(),
"image_trash_directly");
@@ -384,7 +384,7 @@ void ImageWindow::refreshView()
}
void ImageWindow::loadURL(const KURL::List& urlList, const KURL& urlCurrent,
- const QString& caption, bool allowSaving)
+ const TQString& caption, bool allowSaving)
{
if (!promptUserSave(d->urlCurrent))
return;
@@ -398,7 +398,7 @@ void ImageWindow::loadURL(const KURL::List& urlList, const KURL& urlCurrent,
}
void ImageWindow::loadImageInfos(const ImageInfoList &imageInfoList, ImageInfo *imageInfoCurrent,
- const QString& caption, bool allowSaving)
+ const TQString& caption, bool allowSaving)
{
// The ownership of objects of imageInfoList is passed to us.
// imageInfoCurrent is contained in imageInfoList.
@@ -433,7 +433,7 @@ void ImageWindow::loadImageInfos(const ImageInfoList &imageInfoList, ImageInfo *
loadCurrentList(caption, allowSaving);
}
-void ImageWindow::loadCurrentList(const QString& caption, bool allowSaving)
+void ImageWindow::loadCurrentList(const TQString& caption, bool allowSaving)
{
// this method contains the code shared by loadURL and loadImageInfos
@@ -444,7 +444,7 @@ void ImageWindow::loadCurrentList(const QString& caption, bool allowSaving)
}
if (!caption.isEmpty())
- setCaption(i18n("Image Editor - %1").arg(caption));
+ setCaption(i18n("Image Editor - %1").tqarg(caption));
else
setCaption(i18n("Image Editor"));
@@ -455,12 +455,12 @@ void ImageWindow::loadCurrentList(const QString& caption, bool allowSaving)
m_undoAction->setEnabled(false);
m_redoAction->setEnabled(false);
- QTimer::singleShot(0, this, SLOT(slotLoadCurrent()));
+ TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotLoadCurrent()));
}
void ImageWindow::slotLoadCurrent()
{
- KURL::List::iterator it = d->urlList.find(d->urlCurrent);
+ KURL::List::iterator it = d->urlList.tqfind(d->urlCurrent);
if (it != d->urlList.end())
{
@@ -487,8 +487,8 @@ void ImageWindow::slotForward()
if(!promptUserSave(d->urlCurrent))
return;
- KURL::List::iterator it = d->urlList.find(d->urlCurrent);
- int index = d->imageInfoList.find(d->imageInfoCurrent);
+ KURL::List::iterator it = d->urlList.tqfind(d->urlCurrent);
+ int index = d->imageInfoList.tqfind(d->imageInfoCurrent);
if (it != d->urlList.end())
{
@@ -507,8 +507,8 @@ void ImageWindow::slotBackward()
if(!promptUserSave(d->urlCurrent))
return;
- KURL::List::iterator it = d->urlList.find(d->urlCurrent);
- int index = d->imageInfoList.find(d->imageInfoCurrent);
+ KURL::List::iterator it = d->urlList.tqfind(d->urlCurrent);
+ int index = d->imageInfoList.tqfind(d->imageInfoCurrent);
if (it != d->urlList.begin())
{
@@ -556,8 +556,8 @@ void ImageWindow::slotContextMenu()
{
// Bulk assignment/removal of tags --------------------------
- Q_LLONG id = d->imageInfoCurrent->id();
- QValueList<Q_LLONG> idList;
+ TQ_LLONG id = d->imageInfoCurrent->id();
+ TQValueList<TQ_LLONG> idList;
idList.append(id);
assignTagsMenu = new TagsPopupMenu(idList, 1000, TagsPopupMenu::ASSIGN);
@@ -568,11 +568,11 @@ void ImageWindow::slotContextMenu()
m_contextMenu->insertItem(i18n("Assign Tag"), assignTagsMenu);
int i = m_contextMenu->insertItem(i18n("Remove Tag"), removeTagsMenu);
- connect(assignTagsMenu, SIGNAL(signalTagActivated(int)),
- this, SLOT(slotAssignTag(int)));
+ connect(assignTagsMenu, TQT_SIGNAL(signalTagActivated(int)),
+ TQT_TQOBJECT(this), TQT_SLOT(slotAssignTag(int)));
- connect(removeTagsMenu, SIGNAL(signalTagActivated(int)),
- this, SLOT(slotRemoveTag(int)));
+ connect(removeTagsMenu, TQT_SIGNAL(signalTagActivated(int)),
+ TQT_TQOBJECT(this), TQT_SLOT(slotRemoveTag(int)));
AlbumDB* db = AlbumManager::instance()->albumDB();
if (!db->hasTags( idList ))
@@ -584,13 +584,13 @@ void ImageWindow::slotContextMenu()
ratingMenu = new RatingPopupMenu();
- connect(ratingMenu, SIGNAL(activated(int)),
- this, SLOT(slotAssignRating(int)));
+ connect(ratingMenu, TQT_SIGNAL(activated(int)),
+ TQT_TQOBJECT(this), TQT_SLOT(slotAssignRating(int)));
m_contextMenu->insertItem(i18n("Assign Rating"), ratingMenu);
}
- m_contextMenu->exec(QCursor::pos());
+ m_contextMenu->exec(TQCursor::pos());
if (separatorID1 != -1)
m_contextMenu->removeItem(separatorID1);
@@ -605,11 +605,11 @@ void ImageWindow::slotContextMenu()
void ImageWindow::slotChanged()
{
- QString mpixels;
- QSize dims(m_canvas->imageWidth(), m_canvas->imageHeight());
+ TQString mpixels;
+ TQSize dims(m_canvas->imageWidth(), m_canvas->imageHeight());
mpixels.setNum(dims.width()*dims.height()/1000000.0, 'f', 2);
- QString str = (!dims.isValid()) ? i18n("Unknown") : i18n("%1x%2 (%3Mpx)")
- .arg(dims.width()).arg(dims.height()).arg(mpixels);
+ TQString str = (!dims.isValid()) ? i18n("Unknown") : i18n("%1x%2 (%3Mpx)")
+ .tqarg(dims.width()).tqarg(dims.height()).tqarg(mpixels);
m_resLabel->setText(str);
if (d->urlCurrent.isValid())
@@ -699,7 +699,7 @@ void ImageWindow::slotAssignRatingFiveStar()
void ImageWindow::slotAssignRating(int rating)
{
- rating = QMIN(RatingMax, QMAX(RatingMin, rating));
+ rating = TQMIN(RatingMax, TQMAX(RatingMin, rating));
if (d->imageInfoCurrent)
{
MetadataHub hub;
@@ -712,13 +712,13 @@ void ImageWindow::slotAssignRating(int rating)
void ImageWindow::slotUpdateItemInfo()
{
- uint index = d->urlList.findIndex(d->urlCurrent);
+ uint index = d->urlList.tqfindIndex(d->urlCurrent);
m_rotatedOrFlipped = false;
- QString text = d->urlCurrent.filename() + i18n(" (%2 of %3)")
- .arg(QString::number(index+1))
- .arg(QString::number(d->urlList.count()));
+ TQString text = d->urlCurrent.filename() + i18n(" (%2 of %3)")
+ .tqarg(TQString::number(index+1))
+ .tqarg(TQString::number(d->urlList.count()));
m_nameLabel->setText(text);
if (d->urlList.count() == 1)
@@ -769,7 +769,7 @@ bool ImageWindow::setup(bool iccSetupPage)
{
Setup setup(this, 0, iccSetupPage ? Setup::IccProfiles : Setup::LastPageUsed);
- if (setup.exec() != QDialog::Accepted)
+ if (setup.exec() != TQDialog::Accepted)
return false;
kapp->config()->sync();
@@ -799,7 +799,7 @@ void ImageWindow::saveIsComplete()
emit signalFileModified(m_savingContext->destinationURL);
// all that is done in slotLoadCurrent, except for loading
- KURL::List::iterator it = d->urlList.find(d->urlCurrent);
+ KURL::List::iterator it = d->urlList.tqfind(d->urlCurrent);
setViewToURL(*it);
if (++it != d->urlList.end())
@@ -817,10 +817,10 @@ void ImageWindow::saveAsIsComplete()
// Find the src and dest albums ------------------------------------------
- KURL srcDirURL(QDir::cleanDirPath(m_savingContext->srcURL.directory()));
+ KURL srcDirURL(TQDir::cleanDirPath(m_savingContext->srcURL.directory()));
PAlbum* srcAlbum = AlbumManager::instance()->findPAlbum(srcDirURL);
- KURL dstDirURL(QDir::cleanDirPath(m_savingContext->destinationURL.directory()));
+ KURL dstDirURL(TQDir::cleanDirPath(m_savingContext->destinationURL.directory()));
PAlbum* dstAlbum = AlbumManager::instance()->findPAlbum(dstDirURL);
if (dstAlbum && srcAlbum)
@@ -829,10 +829,10 @@ void ImageWindow::saveAsIsComplete()
ImageInfo newInfo(d->imageInfoCurrent->copyItem(dstAlbum, m_savingContext->destinationURL.fileName()));
- if ( d->urlList.find(m_savingContext->destinationURL) == d->urlList.end() )
+ if ( d->urlList.tqfind(m_savingContext->destinationURL) == d->urlList.end() )
{ // The image file did not exist in the list.
- KURL::List::iterator it = d->urlList.find(m_savingContext->srcURL);
- int index = d->urlList.findIndex(m_savingContext->srcURL);
+ KURL::List::iterator it = d->urlList.tqfind(m_savingContext->srcURL);
+ int index = d->urlList.tqfindIndex(m_savingContext->srcURL);
d->urlList.insert(it, m_savingContext->destinationURL);
d->imageInfoCurrent = new ImageInfo(newInfo);
d->imageInfoList.insert(index, d->imageInfoCurrent);
@@ -845,7 +845,7 @@ void ImageWindow::saveAsIsComplete()
{
d->imageInfoCurrent = new ImageInfo(newInfo);
// setAutoDelete is true
- d->imageInfoList.replace(d->imageInfoList.at(), d->imageInfoCurrent);
+ d->imageInfoList.tqreplace(d->imageInfoList.at(), d->imageInfoCurrent);
break;
}
}
@@ -869,7 +869,7 @@ void ImageWindow::saveAsIsComplete()
emit signalFileAdded(m_savingContext->destinationURL);
// all that is done in slotLoadCurrent, except for loading
- KURL::List::iterator it = d->urlList.find(d->urlCurrent);
+ KURL::List::iterator it = d->urlList.tqfind(d->urlCurrent);
if (it != d->urlList.end())
{
@@ -987,7 +987,7 @@ void ImageWindow::deleteCurrentItem(bool ask, bool permanently)
if (!SyncJob::del(kioURL, useTrash))
{
- QString errMsg(SyncJob::lastErrorMsg());
+ TQString errMsg(SyncJob::lastErrorMsg());
KMessageBox::error(this, errMsg, errMsg);
return;
}
@@ -995,8 +995,8 @@ void ImageWindow::deleteCurrentItem(bool ask, bool permanently)
emit signalFileDeleted(d->urlCurrent);
KURL CurrentToRemove = d->urlCurrent;
- KURL::List::iterator it = d->urlList.find(d->urlCurrent);
- int index = d->imageInfoList.find(d->imageInfoCurrent);
+ KURL::List::iterator it = d->urlList.tqfind(d->urlCurrent);
+ int index = d->imageInfoList.tqfind(d->imageInfoCurrent);
if (it != d->urlList.end())
{
@@ -1110,7 +1110,7 @@ void ImageWindow::slideShow(bool startWithCurrent, SlideShowSettings& settings)
}
}
- m_nameLabel->progressBarMode(StatusProgressBar::TextMode, QString());
+ m_nameLabel->progressBarMode(StatusProgressBar::TextMode, TQString());
if (!m_cancelSlideShow)
{
@@ -1125,11 +1125,11 @@ void ImageWindow::slideShow(bool startWithCurrent, SlideShowSettings& settings)
}
}
-void ImageWindow::dragMoveEvent(QDragMoveEvent *e)
+void ImageWindow::dragMoveEvent(TQDragMoveEvent *e)
{
int albumID;
- QValueList<int> albumIDs;
- QValueList<int> imageIDs;
+ TQValueList<int> albumIDs;
+ TQValueList<int> imageIDs;
KURL::List urls;
KURL::List kioURLs;
@@ -1144,11 +1144,11 @@ void ImageWindow::dragMoveEvent(QDragMoveEvent *e)
e->ignore();
}
-void ImageWindow::dropEvent(QDropEvent *e)
+void ImageWindow::dropEvent(TQDropEvent *e)
{
int albumID;
- QValueList<int> albumIDs;
- QValueList<int> imageIDs;
+ TQValueList<int> albumIDs;
+ TQValueList<int> imageIDs;
KURL::List urls;
KURL::List kioURLs;
@@ -1156,7 +1156,7 @@ void ImageWindow::dropEvent(QDropEvent *e)
{
ImageInfoList imageInfoList;
- for (QValueList<int>::const_iterator it = imageIDs.begin();
+ for (TQValueList<int>::const_iterator it = imageIDs.begin();
it != imageIDs.end(); ++it)
{
ImageInfo *info = new ImageInfo(*it);
@@ -1169,7 +1169,7 @@ void ImageWindow::dropEvent(QDropEvent *e)
return;
}
- QString ATitle;
+ TQString ATitle;
AlbumManager* man = AlbumManager::instance();
PAlbum* palbum = man->findPAlbum(albumIDs.first());
if (palbum) ATitle = palbum->title();
@@ -1178,16 +1178,16 @@ void ImageWindow::dropEvent(QDropEvent *e)
if (talbum) ATitle = talbum->title();
loadImageInfos(imageInfoList, imageInfoList.first(),
- i18n("Album \"%1\"").arg(ATitle), true);
+ i18n("Album \"%1\"").tqarg(ATitle), true);
e->accept();
}
else if (AlbumDrag::decode(e, urls, albumID))
{
AlbumManager* man = AlbumManager::instance();
- QValueList<Q_LLONG> itemIDs = man->albumDB()->getItemIDsInAlbum(albumID);
+ TQValueList<TQ_LLONG> itemIDs = man->albumDB()->getItemIDsInAlbum(albumID);
ImageInfoList imageInfoList;
- for (QValueList<Q_LLONG>::const_iterator it = itemIDs.begin();
+ for (TQValueList<TQ_LLONG>::const_iterator it = itemIDs.begin();
it != itemIDs.end(); ++it)
{
ImageInfo *info = new ImageInfo(*it);
@@ -1200,26 +1200,26 @@ void ImageWindow::dropEvent(QDropEvent *e)
return;
}
- QString ATitle;
+ TQString ATitle;
PAlbum* palbum = man->findPAlbum(albumIDs.first());
if (palbum) ATitle = palbum->title();
loadImageInfos(imageInfoList, imageInfoList.first(),
- i18n("Album \"%1\"").arg(ATitle), true);
+ i18n("Album \"%1\"").tqarg(ATitle), true);
e->accept();
}
else if(TagDrag::canDecode(e))
{
- QByteArray ba = e->encodedData("digikam/tag-id");
- QDataStream ds(ba, IO_ReadOnly);
+ TQByteArray ba = e->tqencodedData("digikam/tag-id");
+ TQDataStream ds(ba, IO_ReadOnly);
int tagID;
ds >> tagID;
AlbumManager* man = AlbumManager::instance();
- QValueList<Q_LLONG> itemIDs = man->albumDB()->getItemIDsInTag(tagID, true);
+ TQValueList<TQ_LLONG> itemIDs = man->albumDB()->getItemIDsInTag(tagID, true);
ImageInfoList imageInfoList;
- for (QValueList<Q_LLONG>::const_iterator it = itemIDs.begin();
+ for (TQValueList<TQ_LLONG>::const_iterator it = itemIDs.begin();
it != itemIDs.end(); ++it)
{
ImageInfo *info = new ImageInfo(*it);
@@ -1232,12 +1232,12 @@ void ImageWindow::dropEvent(QDropEvent *e)
return;
}
- QString ATitle;
+ TQString ATitle;
TAlbum* talbum = man->findTAlbum(tagID);
if (talbum) ATitle = talbum->title();
loadImageInfos(imageInfoList, imageInfoList.first(),
- i18n("Album \"%1\"").arg(ATitle), true);
+ i18n("Album \"%1\"").tqarg(ATitle), true);
e->accept();
}
else
@@ -1254,7 +1254,7 @@ void ImageWindow::slotRevert()
m_canvas->slotRestore();
}
-void ImageWindow::slotChangeTheme(const QString& theme)
+void ImageWindow::slotChangeTheme(const TQString& theme)
{
AlbumSettings::instance()->setCurrentTheme(theme);
ThemeEngine::instance()->slotChangeTheme(theme);
diff --git a/digikam/utilities/imageeditor/editor/imagewindow.h b/digikam/utilities/imageeditor/editor/imagewindow.h
index c9f9e62..7416a82 100644
--- a/digikam/utilities/imageeditor/editor/imagewindow.h
+++ b/digikam/utilities/imageeditor/editor/imagewindow.h
@@ -25,9 +25,9 @@
#ifndef IMAGEWINDOW_H
#define IMAGEWINDOW_H
-// Qt includes.
+// TQt includes.
-#include <qstring.h>
+#include <tqstring.h>
// KDE includes.
@@ -38,8 +38,8 @@
#include "editorwindow.h"
#include "imageinfo.h"
-class QDragMoveEvent;
-class QDropEvent;
+class TQDragMoveEvent;
+class TQDropEvent;
namespace Digikam
{
@@ -51,18 +51,19 @@ class SlideShowSettings;
class ImageWindow : public EditorWindow
{
Q_OBJECT
+ TQ_OBJECT
public:
~ImageWindow();
void loadURL(const KURL::List& urlList, const KURL& urlCurrent,
- const QString& caption=QString(),
+ const TQString& caption=TQString(),
bool allowSaving=true);
void loadImageInfos(const ImageInfoList &imageInfoList,
ImageInfo *imageInfoCurrent,
- const QString& caption, bool allowSaving);
+ const TQString& caption, bool allowSaving);
static ImageWindow* imagewindow();
static bool imagewindowCreated();
@@ -82,11 +83,11 @@ signals:
private:
- void loadCurrentList(const QString& caption, bool allowSaving);
- void closeEvent(QCloseEvent* e);
+ void loadCurrentList(const TQString& caption, bool allowSaving);
+ void closeEvent(TQCloseEvent* e);
- void dragMoveEvent(QDragMoveEvent *e);
- void dropEvent(QDropEvent *e);
+ void dragMoveEvent(TQDragMoveEvent *e);
+ void dropEvent(TQDropEvent *e);
void setupActions();
void setupConnections();
@@ -140,7 +141,7 @@ private slots:
void slotAssignRating(int rating);
void slotFileMetadataChanged(const KURL &);
- void slotChangeTheme(const QString& theme);
+ void slotChangeTheme(const TQString& theme);
private:
diff --git a/digikam/utilities/imageeditor/editor/savingcontextcontainer.h b/digikam/utilities/imageeditor/editor/savingcontextcontainer.h
index 2ada4bd..b240a10 100644
--- a/digikam/utilities/imageeditor/editor/savingcontextcontainer.h
+++ b/digikam/utilities/imageeditor/editor/savingcontextcontainer.h
@@ -25,9 +25,9 @@
#ifndef SAVINGCONTEXTCONTAINER_H
#define SAVINGCONTEXTCONTAINER_H
-// Qt includes.
+// TQt includes.
-#include <qstring.h>
+#include <tqstring.h>
// KDE includes.
@@ -75,8 +75,8 @@ public:
bool destinationExisted;
bool abortingSaving;
- QString originalFormat;
- QString format;
+ TQString originalFormat;
+ TQString format;
KURL srcURL;
KURL destinationURL;