summaryrefslogtreecommitdiffstats
path: root/kipi-plugins/rawconverter
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-05-18 06:46:40 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-05-18 06:46:40 +0000
commit7c19562ad065b6729bac8eb9b40dfe0452a72272 (patch)
tree33325d1e02ecc9ca614c7209296f8f796a1c3478 /kipi-plugins/rawconverter
parenta65baa328fac0a1ce12971fef8d998ce7bfbe237 (diff)
downloadkipi-plugins-7c19562ad065b6729bac8eb9b40dfe0452a72272.tar.gz
kipi-plugins-7c19562ad065b6729bac8eb9b40dfe0452a72272.zip
TQt4 port kipi-plugins
This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/libraries/kipi-plugins@1232561 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kipi-plugins/rawconverter')
-rw-r--r--kipi-plugins/rawconverter/actions.h8
-rw-r--r--kipi-plugins/rawconverter/actionthread.cpp54
-rw-r--r--kipi-plugins/rawconverter/actionthread.h16
-rw-r--r--kipi-plugins/rawconverter/batchdialog.cpp124
-rw-r--r--kipi-plugins/rawconverter/batchdialog.h37
-rw-r--r--kipi-plugins/rawconverter/clistviewitem.h38
-rw-r--r--kipi-plugins/rawconverter/iccjpeg.c12
-rw-r--r--kipi-plugins/rawconverter/mtqueue.h10
-rw-r--r--kipi-plugins/rawconverter/plugin_rawconverter.cpp50
-rw-r--r--kipi-plugins/rawconverter/plugin_rawconverter.h9
-rw-r--r--kipi-plugins/rawconverter/previewwidget.cpp90
-rw-r--r--kipi-plugins/rawconverter/previewwidget.h29
-rw-r--r--kipi-plugins/rawconverter/rawdecodingiface.cpp92
-rw-r--r--kipi-plugins/rawconverter/rawdecodingiface.h25
-rw-r--r--kipi-plugins/rawconverter/savesettingswidget.cpp54
-rw-r--r--kipi-plugins/rawconverter/savesettingswidget.h9
-rw-r--r--kipi-plugins/rawconverter/singledialog.cpp112
-rw-r--r--kipi-plugins/rawconverter/singledialog.h39
18 files changed, 407 insertions, 401 deletions
diff --git a/kipi-plugins/rawconverter/actions.h b/kipi-plugins/rawconverter/actions.h
index 5dd3e3e..5479165 100644
--- a/kipi-plugins/rawconverter/actions.h
+++ b/kipi-plugins/rawconverter/actions.h
@@ -49,11 +49,11 @@ public:
bool starting;
bool success;
- QString filePath;
- QString destPath;
- QString message;
+ TQString filePath;
+ TQString destPath;
+ TQString message;
- QImage image;
+ TQImage image;
Action action;
};
diff --git a/kipi-plugins/rawconverter/actionthread.cpp b/kipi-plugins/rawconverter/actionthread.cpp
index 52a41b5..ad85b81 100644
--- a/kipi-plugins/rawconverter/actionthread.cpp
+++ b/kipi-plugins/rawconverter/actionthread.cpp
@@ -32,11 +32,11 @@ extern "C"
#include <unistd.h>
}
-// Qt includes.
+// TQt includes.
-#include <qapplication.h>
-#include <qdir.h>
-#include <qdeepcopy.h>
+#include <tqapplication.h>
+#include <tqdir.h>
+#include <tqdeepcopy.h>
// KDE includes.
@@ -54,8 +54,8 @@ extern "C"
namespace KIPIRawConverterPlugin
{
-ActionThread::ActionThread(QObject *parent)
- : QThread(), m_parent(parent)
+ActionThread::ActionThread(TQObject *tqparent)
+ : TQThread(), m_parent(tqparent)
{
}
@@ -80,7 +80,7 @@ void ActionThread::identifyRawFiles(const KURL::List& urlList, bool full)
it != urlList.end(); ++it )
{
Task *t = new Task;
- t->filePath = QDeepCopy<QString>((*it).path()); //deep copy
+ t->filePath = TQDeepCopy<TQString>((*it).path()); //deep copy
t->action = full ? IDENTIFY_FULL : IDENTIFY;
m_taskQueue.enqueue(t);
}
@@ -113,7 +113,7 @@ void ActionThread::processRawFiles(const KURL::List& urlList)
it != urlList.end(); ++it )
{
Task *t = new Task;
- t->filePath = QDeepCopy<QString>((*it).path()); //deep copy
+ t->filePath = TQDeepCopy<TQString>((*it).path()); //deep copy
t->outputFormat = m_outputFormat;
t->decodingSettings = m_rawDecodingSettings;
t->action = PROCESS;
@@ -127,7 +127,7 @@ void ActionThread::processHalfRawFiles(const KURL::List& urlList)
it != urlList.end(); ++it )
{
Task *t = new Task;
- t->filePath = QDeepCopy<QString>((*it).path()); //deep copy
+ t->filePath = TQDeepCopy<TQString>((*it).path()); //deep copy
t->outputFormat = m_outputFormat;
t->decodingSettings = m_rawDecodingSettings;
t->action = PREVIEW;
@@ -148,7 +148,7 @@ void ActionThread::run()
Task *t = m_taskQueue.dequeue();
if (!t) continue;
- QString errString;
+ TQString errString;
EventData *d = new EventData;
@@ -158,47 +158,47 @@ void ActionThread::run()
case IDENTIFY_FULL:
{
// Get embedded RAW file thumbnail.
- QImage image;
+ TQImage image;
m_dcrawIface.loadDcrawPreview(image, t->filePath);
// Identify Camera model.
KDcrawIface::DcrawInfoContainer info;
m_dcrawIface.rawFileIdentify(info, t->filePath);
- QString identify = i18n("Cannot identify Raw image");
+ TQString identify = i18n("Cannot identify Raw image");
if (info.isDecodable)
{
if (t->action == IDENTIFY)
- identify = info.make + QString("-") + info.model;
+ identify = info.make + TQString("-") + info.model;
else
{
- identify = i18n("Make: %1\n").arg(info.make);
- identify.append(i18n("Model: %1\n").arg(info.model));
+ identify = i18n("Make: %1\n").tqarg(info.make);
+ identify.append(i18n("Model: %1\n").tqarg(info.model));
if (info.dateTime.isValid())
{
identify.append(i18n("Created: %1\n")
- .arg(KGlobal::locale()->formatDateTime(info.dateTime, true, true)));
+ .tqarg(KGlobal::locale()->formatDateTime(info.dateTime, true, true)));
}
if (info.aperture != -1.0)
{
- identify.append(i18n("Aperture: f/%1\n").arg(QString::number(info.aperture)));
+ identify.append(i18n("Aperture: f/%1\n").tqarg(TQString::number(info.aperture)));
}
if (info.focalLength != -1.0)
{
- identify.append(i18n("Focal: %1 mm\n").arg(info.focalLength));
+ identify.append(i18n("Focal: %1 mm\n").tqarg(info.focalLength));
}
if (info.exposureTime != -1.0)
{
- identify.append(i18n("Exposure: 1/%1 s\n").arg(info.exposureTime));
+ identify.append(i18n("Exposure: 1/%1 s\n").tqarg(info.exposureTime));
}
if (info.sensitivity != -1)
{
- identify.append(i18n("Sensitivity: %1 ISO").arg(info.sensitivity));
+ identify.append(i18n("Sensitivity: %1 ISO").tqarg(info.sensitivity));
}
}
}
@@ -209,7 +209,7 @@ void ActionThread::run()
r->image = image;
r->message = identify;
r->success = true;
- QApplication::postEvent(m_parent, new QCustomEvent(QEvent::User, r));
+ TQApplication::postEvent(m_parent, new TQCustomEvent(TQEvent::User, r));
break;
}
@@ -218,9 +218,9 @@ void ActionThread::run()
d->action = PREVIEW;
d->filePath = t->filePath;
d->starting = true;
- QApplication::postEvent(m_parent, new QCustomEvent(QEvent::User, d));
+ TQApplication::postEvent(m_parent, new TQCustomEvent(TQEvent::User, d));
- QString destPath;
+ TQString destPath;
bool result = m_dcrawIface.decodeHalfRAWImage(t->filePath, destPath,
t->outputFormat, t->decodingSettings);
@@ -229,7 +229,7 @@ void ActionThread::run()
r->filePath = t->filePath;
r->destPath = destPath;
r->success = result;
- QApplication::postEvent(m_parent, new QCustomEvent(QEvent::User, r));
+ TQApplication::postEvent(m_parent, new TQCustomEvent(TQEvent::User, r));
break;
}
@@ -238,9 +238,9 @@ void ActionThread::run()
d->action = PROCESS;
d->filePath = t->filePath;
d->starting = true;
- QApplication::postEvent(m_parent, new QCustomEvent(QEvent::User, d));
+ TQApplication::postEvent(m_parent, new TQCustomEvent(TQEvent::User, d));
- QString destPath;
+ TQString destPath;
bool result = m_dcrawIface.decodeRAWImage(t->filePath, destPath,
t->outputFormat, t->decodingSettings);
@@ -249,7 +249,7 @@ void ActionThread::run()
r->filePath = t->filePath;
r->destPath = destPath;
r->success = result;
- QApplication::postEvent(m_parent, new QCustomEvent(QEvent::User, r));
+ TQApplication::postEvent(m_parent, new TQCustomEvent(TQEvent::User, r));
break;
}
diff --git a/kipi-plugins/rawconverter/actionthread.h b/kipi-plugins/rawconverter/actionthread.h
index bebc7b9..044ca84 100644
--- a/kipi-plugins/rawconverter/actionthread.h
+++ b/kipi-plugins/rawconverter/actionthread.h
@@ -24,10 +24,10 @@
#ifndef ACTIONTHREAD_H
#define ACTIONTHREAD_H
-// Qt includes.
+// TQt includes.
-#include <qthread.h>
-#include <qstring.h>
+#include <tqthread.h>
+#include <tqstring.h>
// KDE includes.
@@ -44,17 +44,17 @@
#include "actions.h"
#include "mtqueue.h"
-class QObject;
+class TQObject;
namespace KIPIRawConverterPlugin
{
-class ActionThread : public QThread
+class ActionThread : public TQThread
{
public:
- ActionThread(QObject *parent);
+ ActionThread(TQObject *tqparent);
~ActionThread();
void setRawDecodingSettings(KDcrawIface::RawDecodingSettings rawDecodingSettings,
@@ -79,7 +79,7 @@ private:
struct Task_
{
- QString filePath;
+ TQString filePath;
Action action;
SaveSettingsWidget::OutputFormat outputFormat;
KDcrawIface::RawDecodingSettings decodingSettings;
@@ -87,7 +87,7 @@ private:
typedef struct Task_ Task;
- QObject *m_parent;
+ TQObject *m_parent;
SaveSettingsWidget::OutputFormat m_outputFormat;
diff --git a/kipi-plugins/rawconverter/batchdialog.cpp b/kipi-plugins/rawconverter/batchdialog.cpp
index 63447e6..06b30cd 100644
--- a/kipi-plugins/rawconverter/batchdialog.cpp
+++ b/kipi-plugins/rawconverter/batchdialog.cpp
@@ -34,18 +34,18 @@ extern "C"
#include <cstdio>
-// Qt includes.
-
-#include <qframe.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qtimer.h>
-#include <qfileinfo.h>
-#include <qevent.h>
-#include <qpixmap.h>
-#include <qpushbutton.h>
-#include <qfile.h>
+// TQt includes.
+
+#include <tqframe.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqtooltip.h>
+#include <tqtimer.h>
+#include <tqfileinfo.h>
+#include <tqevent.h>
+#include <tqpixmap.h>
+#include <tqpushbutton.h>
+#include <tqfile.h>
// KDE includes.
@@ -83,16 +83,16 @@ extern "C"
namespace KIPIRawConverterPlugin
{
-BatchDialog::BatchDialog(QWidget* /*parent*/)
+BatchDialog::BatchDialog(TQWidget* /*tqparent*/)
: KDialogBase(0, 0, false, i18n("Raw Images Batch Converter"),
Help|Default|User1|User2|Close, Close, true,
i18n("Con&vert"), i18n("&Abort"))
{
m_currentConvertItem = 0;
m_thread = 0;
- m_page = new QWidget( this );
+ m_page = new TQWidget( this );
setMainWidget( m_page );
- QGridLayout *mainLayout = new QGridLayout(m_page, 2, 1, 0, spacingHint());
+ TQGridLayout *mainLayout = new TQGridLayout(m_page, 2, 1, 0, spacingHint());
//---------------------------------------------
@@ -101,11 +101,11 @@ BatchDialog::BatchDialog(QWidget* /*parent*/)
m_listView->addColumn( i18n("Raw File") );
m_listView->addColumn( i18n("Target File") );
m_listView->addColumn( i18n("Camera") );
- m_listView->setResizeMode(QListView::AllColumns);
+ m_listView->setResizeMode(TQListView::AllColumns);
m_listView->setAllColumnsShowFocus(true);
m_listView->setSorting(-1);
- m_listView->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
- m_listView->setSelectionMode(QListView::Single);
+ m_listView->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+ m_listView->setSelectionMode(TQListView::Single);
m_listView->setMinimumWidth(450);
// ---------------------------------------------------------------
@@ -149,7 +149,7 @@ BatchDialog::BatchDialog(QWidget* /*parent*/)
KHelpMenu* helpMenu = new KHelpMenu(this, m_about, false);
helpMenu->menu()->removeItemAt(0);
helpMenu->menu()->insertItem(i18n("Plugin Handbook"),
- this, SLOT(slotHelp()), 0, -1, 0);
+ this, TQT_SLOT(slotHelp()), 0, -1, 0);
actionButton(Help)->setPopup( helpMenu->menu() );
// ---------------------------------------------------------------
@@ -158,16 +158,16 @@ BatchDialog::BatchDialog(QWidget* /*parent*/)
setButtonTip( User2, i18n("<p>Abort the current Raw files conversion"));
setButtonTip( Close, i18n("<p>Exit Raw Converter"));
- m_blinkConvertTimer = new QTimer(this);
- m_thread = new ActionThread(this);
+ m_blinkConvertTimer = new TQTimer(this);
+ m_thread = new ActionThread(TQT_TQOBJECT(this));
// ---------------------------------------------------------------
- connect(m_blinkConvertTimer, SIGNAL(timeout()),
- this, SLOT(slotConvertBlinkTimerDone()));
+ connect(m_blinkConvertTimer, TQT_SIGNAL(timeout()),
+ this, TQT_SLOT(slotConvertBlinkTimerDone()));
- connect(m_saveSettingsBox, SIGNAL(signalSaveFormatChanged()),
- this, SLOT(slotSaveFormatChanged()));
+ connect(m_saveSettingsBox, TQT_SIGNAL(signalSaveFormatChanged()),
+ this, TQT_SLOT(slotSaveFormatChanged()));
// ---------------------------------------------------------------
@@ -182,7 +182,7 @@ BatchDialog::~BatchDialog()
delete m_thread;
}
-void BatchDialog::closeEvent(QCloseEvent *e)
+void BatchDialog::closeEvent(TQCloseEvent *e)
{
if (!e) return;
m_blinkConvertTimer->stop();
@@ -248,7 +248,7 @@ void BatchDialog::readSettings()
(SaveSettingsWidget::ConflictRule)config.readNumEntry("Conflict",
(int)(SaveSettingsWidget::OVERWRITE)));
- resize(configDialogSize(config, QString("Batch Raw Converter Dialog")));
+ resize(configDialogSize(config, TQString("Batch Raw Converter Dialog")));
}
void BatchDialog::saveSettings()
@@ -281,7 +281,7 @@ void BatchDialog::saveSettings()
config.writeEntry("Output Format", (int)m_saveSettingsBox->fileFormat());
config.writeEntry("Conflict", (int)m_saveSettingsBox->conflictRule());
- saveDialogSize(config, QString("Batch Raw Converter Dialog"));
+ saveDialogSize(config, TQString("Batch Raw Converter Dialog"));
config.sync();
}
@@ -294,14 +294,14 @@ void BatchDialog::slotUser1()
{
m_fileList.clear();
- QListViewItemIterator it( m_listView );
+ TQListViewItemIterator it( m_listView );
while ( it.current() )
{
CListViewItem *item = (CListViewItem*) it.current();
if (item->isEnabled())
{
item->setPixmap(1, 0);
- m_fileList.append(item->rawItem->directory + QString("/") + item->rawItem->src);
+ m_fileList.append(item->rawItem->directory + TQString("/") + item->rawItem->src);
}
++it;
}
@@ -355,7 +355,7 @@ void BatchDialog::slotUser2()
if (m_currentConvertItem)
m_currentConvertItem->viewItem->setPixmap(1, SmallIcon("cancel"));
- QTimer::singleShot(500, this, SLOT(slotAborted()));
+ TQTimer::singleShot(500, this, TQT_SLOT(slotAborted()));
}
void BatchDialog::slotAborted()
@@ -364,9 +364,9 @@ void BatchDialog::slotAborted()
m_progressBar->hide();
}
-void BatchDialog::addItems(const QStringList& itemList)
+void BatchDialog::addItems(const TQStringList& itemList)
{
- QString ext;
+ TQString ext;
switch(m_saveSettingsBox->fileFormat())
{
@@ -386,18 +386,18 @@ void BatchDialog::addItems(const QStringList& itemList)
KURL::List urlList;
- QPixmap pix(SmallIcon( "file_broken", KIcon::SizeLarge, KIcon::DisabledState ));
+ TQPixmap pix(SmallIcon( "file_broken", KIcon::SizeLarge, KIcon::DisabledState ));
- for (QStringList::const_iterator it = itemList.begin();
+ for (TQStringList::const_iterator it = itemList.begin();
it != itemList.end(); ++it)
{
- QFileInfo fi(*it);
- if (fi.exists() && !m_itemDict.find(fi.fileName()))
+ TQFileInfo fi(*it);
+ if (fi.exists() && !m_itemDict.tqfind(fi.fileName()))
{
RawItem *item = new RawItem;
item->directory = fi.dirPath();
item->src = fi.fileName();
- item->dest = fi.baseName() + QString(".") + ext;
+ item->dest = fi.baseName() + TQString(".") + ext;
new CListViewItem(m_listView, pix, item, m_listView->lastItem());
m_itemDict.insert(item->src, item);
urlList.append(fi.absFilePath());
@@ -414,7 +414,7 @@ void BatchDialog::addItems(const QStringList& itemList)
void BatchDialog::slotSaveFormatChanged()
{
- QString ext;
+ TQString ext;
switch(m_saveSettingsBox->fileFormat())
{
@@ -432,15 +432,15 @@ void BatchDialog::slotSaveFormatChanged()
break;
}
- QListViewItemIterator it( m_listView );
+ TQListViewItemIterator it( m_listView );
while ( it.current() )
{
CListViewItem *item = (CListViewItem*) it.current();
if (item->isEnabled())
{
RawItem *rawItem = item->rawItem;
- QFileInfo fi(rawItem->directory + QString("/") + rawItem->src);
- rawItem->dest = fi.baseName() + QString(".") + ext;
+ TQFileInfo fi(rawItem->directory + TQString("/") + rawItem->src);
+ rawItem->dest = fi.baseName() + TQString(".") + ext;
item->setText(2, rawItem->dest);
}
++it;
@@ -456,7 +456,7 @@ void BatchDialog::processOne()
return;
}
- QString file(m_fileList.first());
+ TQString file(m_fileList.first());
m_fileList.pop_front();
m_thread->processRawFile(KURL(file));
@@ -494,10 +494,10 @@ void BatchDialog::slotConvertBlinkTimerDone()
m_blinkConvertTimer->start(500);
}
-void BatchDialog::processing(const QString& file)
+void BatchDialog::processing(const TQString& file)
{
- QString filename = QFileInfo(file).fileName();
- m_currentConvertItem = m_itemDict.find(filename);
+ TQString filename = TQFileInfo(file).fileName();
+ m_currentConvertItem = m_itemDict.tqfind(filename);
if (m_currentConvertItem)
{
m_listView->setSelected(m_currentConvertItem->viewItem, true);
@@ -508,19 +508,19 @@ void BatchDialog::processing(const QString& file)
m_blinkConvertTimer->start(500);
}
-void BatchDialog::processed(const QString& file, const QString& tmpFile)
+void BatchDialog::processed(const TQString& file, const TQString& tmpFile)
{
m_blinkConvertTimer->stop();
- QString filename = QFileInfo(file).fileName();
- QString destFile(m_currentConvertItem->directory + QString("/") + m_currentConvertItem->dest);
+ TQString filename = TQFileInfo(file).fileName();
+ TQString destFile(m_currentConvertItem->directory + TQString("/") + m_currentConvertItem->dest);
if (m_saveSettingsBox->conflictRule() != SaveSettingsWidget::OVERWRITE)
{
struct stat statBuf;
- if (::stat(QFile::encodeName(destFile), &statBuf) == 0)
+ if (::stat(TQFile::encodeName(destFile), &statBuf) == 0)
{
KIO::RenameDlg dlg(this, i18n("Save Raw Image converted from '%1' as")
- .arg(m_currentConvertItem->src),
+ .tqarg(m_currentConvertItem->src),
tmpFile, destFile,
KIO::RenameDlg_Mode(KIO::M_SINGLE | KIO::M_OVERWRITE | KIO::M_SKIP));
@@ -529,7 +529,7 @@ void BatchDialog::processed(const QString& file, const QString& tmpFile)
case KIO::R_CANCEL:
case KIO::R_SKIP:
{
- destFile = QString();
+ destFile = TQString();
m_currentConvertItem->viewItem->setPixmap(1, SmallIcon("cancel"));
break;
}
@@ -546,14 +546,14 @@ void BatchDialog::processed(const QString& file, const QString& tmpFile)
if (!destFile.isEmpty())
{
- if (::rename(QFile::encodeName(tmpFile), QFile::encodeName(destFile)) != 0)
+ if (::rename(TQFile::encodeName(tmpFile), TQFile::encodeName(destFile)) != 0)
{
- KMessageBox::error(this, i18n("Failed to save image %1").arg( destFile ));
+ KMessageBox::error(this, i18n("Failed to save image %1").tqarg( destFile ));
m_currentConvertItem->viewItem->setPixmap(1, SmallIcon("cancel"));
}
else
{
- m_currentConvertItem->dest = QFileInfo(destFile).fileName();
+ m_currentConvertItem->dest = TQFileInfo(destFile).fileName();
m_currentConvertItem->viewItem->setText(2, m_currentConvertItem->dest);
m_currentConvertItem->viewItem->setPixmap(1, SmallIcon("ok"));
}
@@ -563,22 +563,22 @@ void BatchDialog::processed(const QString& file, const QString& tmpFile)
m_currentConvertItem = 0;
}
-void BatchDialog::processingFailed(const QString& file)
+void BatchDialog::processingFailed(const TQString& file)
{
- QString filename = QFileInfo(file).fileName();
+ TQString filename = TQFileInfo(file).fileName();
m_currentConvertItem->viewItem->setPixmap(1, SmallIcon("no"));
m_progressBar->advance(1);
m_currentConvertItem = 0;
}
-void BatchDialog::customEvent(QCustomEvent *event)
+void BatchDialog::customEvent(TQCustomEvent *event)
{
if (!event) return;
EventData *d = (EventData*) event->data();
if (!d) return;
- QString text;
+ TQString text;
if (d->starting) // Something have been started...
{
@@ -626,13 +626,13 @@ void BatchDialog::customEvent(QCustomEvent *event)
{
case(IDENTIFY):
{
- QFileInfo fi(d->filePath);
- RawItem *rawItem = m_itemDict.find(fi.fileName());
+ TQFileInfo fi(d->filePath);
+ RawItem *rawItem = m_itemDict.tqfind(fi.fileName());
if (rawItem)
{
if (!d->image.isNull())
{
- QPixmap pix = QPixmap(d->image.scale(64, 64, QImage::ScaleMin));
+ TQPixmap pix = TQPixmap(d->image.scale(64, 64, TQ_ScaleMin));
rawItem->viewItem->setThumbnail(pix);
}
rawItem->viewItem->setText(3, d->message);
diff --git a/kipi-plugins/rawconverter/batchdialog.h b/kipi-plugins/rawconverter/batchdialog.h
index 792fca6..f7013cd 100644
--- a/kipi-plugins/rawconverter/batchdialog.h
+++ b/kipi-plugins/rawconverter/batchdialog.h
@@ -24,10 +24,10 @@
#ifndef BATCHDIALOG_H
#define BATCHDIALOG_H
-// Qt includes.
+// TQt includes.
-#include <qstringlist.h>
-#include <qdict.h>
+#include <tqstringlist.h>
+#include <tqdict.h>
// KDE includes.
@@ -37,10 +37,10 @@
#include "kpaboutdata.h"
-class QTimer;
-class QWidget;
-class QCustomEvent;
-class QCloseEvent;
+class TQTimer;
+class TQWidget;
+class TQCustomEvent;
+class TQCloseEvent;
class KListView;
class KProgress;
@@ -61,18 +61,19 @@ class BatchDialog : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- BatchDialog(QWidget *parent);
+ BatchDialog(TQWidget *tqparent);
~BatchDialog();
- void addItems(const QStringList& itemList);
+ void addItems(const TQStringList& itemList);
protected:
- void customEvent(QCustomEvent *event);
- void closeEvent(QCloseEvent *e);
+ void customEvent(TQCustomEvent *event);
+ void closeEvent(TQCloseEvent *e);
private:
@@ -82,9 +83,9 @@ private:
void busy(bool busy);
void processOne();
- void processing(const QString& file);
- void processed(const QString& file, const QString& tmpFile);
- void processingFailed(const QString& file);
+ void processing(const TQString& file);
+ void processed(const TQString& file, const TQString& tmpFile);
+ void processingFailed(const TQString& file);
private slots:
@@ -102,13 +103,13 @@ private:
bool m_convertBlink;
- QTimer *m_blinkConvertTimer;
+ TQTimer *m_blinkConvertTimer;
- QWidget *m_page;
+ TQWidget *m_page;
- QDict<RawItem> m_itemDict;
+ TQDict<RawItem> m_itemDict;
- QStringList m_fileList;
+ TQStringList m_fileList;
KProgress *m_progressBar;
diff --git a/kipi-plugins/rawconverter/clistviewitem.h b/kipi-plugins/rawconverter/clistviewitem.h
index f7e3065..a964594 100644
--- a/kipi-plugins/rawconverter/clistviewitem.h
+++ b/kipi-plugins/rawconverter/clistviewitem.h
@@ -24,16 +24,16 @@
#ifndef CLISTVIEWITEM_H
#define CLISTVIEWITEM_H
-// Qt includes.
+// TQt includes.
-#include <qstring.h>
-#include <qpainter.h>
+#include <tqstring.h>
+#include <tqpainter.h>
// KDE includes.
#include <klistview.h>
-class QPixmap;
+class TQPixmap;
namespace KIPIRawConverterPlugin
{
@@ -42,10 +42,10 @@ class CListViewItem;
struct RawItem
{
- QString src;
- QString dest;
- QString directory;
- QString identity;
+ TQString src;
+ TQString dest;
+ TQString directory;
+ TQString identity;
CListViewItem *viewItem;
};
@@ -59,8 +59,8 @@ public:
public:
- CListViewItem(KListView *view, const QPixmap& pixmap,
- RawItem *item, QListViewItem *after)
+ CListViewItem(KListView *view, const TQPixmap& pixmap,
+ RawItem *item, TQListViewItem *after)
: KListViewItem(view, after), rawItem(item)
{
rawItem->viewItem = this;
@@ -72,7 +72,7 @@ public:
~CListViewItem(){}
- void setThumbnail(const QPixmap& pixmap)
+ void setThumbnail(const TQPixmap& pixmap)
{
setPixmap(0, pixmap);
}
@@ -80,7 +80,7 @@ public:
void setEnabled(bool d)
{
m_enabled = d;
- repaint();
+ tqrepaint();
}
bool isEnabled(void)
@@ -90,19 +90,19 @@ public:
protected:
- void paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int alignment)
+ void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment)
{
if (m_enabled)
{
- KListViewItem::paintCell(p, cg, column, width, alignment);
+ KListViewItem::paintCell(p, cg, column, width, tqalignment);
}
else
{
- QColorGroup _cg( cg );
- QColor c = _cg.text();
- _cg.setColor( QColorGroup::Text, Qt::gray );
- KListViewItem::paintCell( p, _cg, column, width, alignment );
- _cg.setColor( QColorGroup::Text, c );
+ TQColorGroup _cg( cg );
+ TQColor c = _cg.text();
+ _cg.setColor( TQColorGroup::Text, TQt::gray );
+ KListViewItem::paintCell( p, _cg, column, width, tqalignment );
+ _cg.setColor( TQColorGroup::Text, c );
}
}
diff --git a/kipi-plugins/rawconverter/iccjpeg.c b/kipi-plugins/rawconverter/iccjpeg.c
index fefa950..dc57124 100644
--- a/kipi-plugins/rawconverter/iccjpeg.c
+++ b/kipi-plugins/rawconverter/iccjpeg.c
@@ -133,7 +133,7 @@ write_icc_profile (j_compress_ptr cinfo,
void
setup_read_icc_profile (j_decompress_ptr cinfo)
{
- /* Tell the library to keep any APP2 data it may find */
+ /* Tell the library to keep any APP2 data it may tqfind */
jpeg_save_markers(cinfo, ICC_MARKER, 0xFFFF);
}
@@ -193,10 +193,10 @@ read_icc_profile (j_decompress_ptr cinfo,
int seq_no;
JOCTET *icc_data;
unsigned int total_length;
-#define MAX_SEQ_NO 255 /* sufficient since marker numbers are bytes */
- char marker_present[MAX_SEQ_NO+1]; /* 1 if marker found */
- unsigned int data_length[MAX_SEQ_NO+1]; /* size of profile data in marker */
- unsigned int data_offset[MAX_SEQ_NO+1]; /* offset for data in marker */
+#define MAX_SETQ_NO 255 /* sufficient since marker numbers are bytes */
+ char marker_present[MAX_SETQ_NO+1]; /* 1 if marker found */
+ unsigned int data_length[MAX_SETQ_NO+1]; /* size of profile data in marker */
+ unsigned int data_offset[MAX_SETQ_NO+1]; /* offset for data in marker */
*icc_data_ptr = NULL; /* avoid confusion if FALSE return */
*icc_data_len = 0;
@@ -205,7 +205,7 @@ read_icc_profile (j_decompress_ptr cinfo,
* any ICC markers and verifies the consistency of the marker numbering.
*/
- for (seq_no = 1; seq_no <= MAX_SEQ_NO; seq_no++)
+ for (seq_no = 1; seq_no <= MAX_SETQ_NO; seq_no++)
marker_present[seq_no] = 0;
for (marker = cinfo->marker_list; marker != NULL; marker = marker->next) {
diff --git a/kipi-plugins/rawconverter/mtqueue.h b/kipi-plugins/rawconverter/mtqueue.h
index 14ff5f2..6feb4d7 100644
--- a/kipi-plugins/rawconverter/mtqueue.h
+++ b/kipi-plugins/rawconverter/mtqueue.h
@@ -23,10 +23,10 @@
#ifndef MTQUEUE_H
#define MTQUEUE_H
-// Qt includes.
+// TQt includes.
-#include <qptrqueue.h>
-#include <qmutex.h>
+#include <tqptrqueue.h>
+#include <tqmutex.h>
namespace KIPIRawConverterPlugin
{
@@ -78,8 +78,8 @@ public:
private:
- QPtrQueue<Type> m_queue;
- QMutex m_mutex;
+ TQPtrQueue<Type> m_queue;
+ TQMutex m_mutex;
};
} // NameSpace KIPIRawConverterPlugin
diff --git a/kipi-plugins/rawconverter/plugin_rawconverter.cpp b/kipi-plugins/rawconverter/plugin_rawconverter.cpp
index e77a146..1135d93 100644
--- a/kipi-plugins/rawconverter/plugin_rawconverter.cpp
+++ b/kipi-plugins/rawconverter/plugin_rawconverter.cpp
@@ -35,10 +35,10 @@ extern "C"
#include <cstdlib>
-// Qt Includes.
+// TQt Includes.
-#include <qprocess.h>
-#include <qfileinfo.h>
+#include <tqprocess.h>
+#include <tqfileinfo.h>
// KDE includes.
@@ -72,20 +72,20 @@ typedef KGenericFactory<Plugin_RawConverter> Factory;
K_EXPORT_COMPONENT_FACTORY( kipiplugin_rawconverter,
Factory("kipiplugin_rawconverter"))
-Plugin_RawConverter::Plugin_RawConverter(QObject *parent, const char*, const QStringList&)
- : KIPI::Plugin( Factory::instance(), parent, "RawConverter")
+Plugin_RawConverter::Plugin_RawConverter(TQObject *tqparent, const char*, const TQStringList&)
+ : KIPI::Plugin( Factory::instance(), tqparent, "RawConverter")
{
kdDebug( 51001 ) << "Loaded RawConverter" << endl;
}
-void Plugin_RawConverter::setup( QWidget* widget )
+void Plugin_RawConverter::setup( TQWidget* widget )
{
KIPI::Plugin::setup( widget );
singleAction_ = new KAction (i18n("Raw Image Converter..."),
"rawconvertersingle",
0,
this,
- SLOT(slotActivateSingle()),
+ TQT_SLOT(slotActivateSingle()),
actionCollection(),
"raw_converter_single");
@@ -93,14 +93,14 @@ void Plugin_RawConverter::setup( QWidget* widget )
"rawconverterbatch",
0,
this,
- SLOT(slotActivateBatch()),
+ TQT_SLOT(slotActivateBatch()),
actionCollection(),
"raw_converter_batch");
addAction( singleAction_ );
addAction( batchAction_ );
- KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>( parent() );
+ KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>( tqparent() );
if ( !interface )
{
@@ -108,27 +108,27 @@ void Plugin_RawConverter::setup( QWidget* widget )
return;
}
- connect( interface, SIGNAL( selectionChanged( bool ) ),
- singleAction_, SLOT( setEnabled( bool ) ) );
+ connect( interface, TQT_SIGNAL( selectionChanged( bool ) ),
+ singleAction_, TQT_SLOT( setEnabled( bool ) ) );
- connect( interface, SIGNAL( currentAlbumChanged( bool ) ),
- batchAction_, SLOT( setEnabled( bool ) ) );
+ connect( interface, TQT_SIGNAL( currentAlbumChanged( bool ) ),
+ batchAction_, TQT_SLOT( setEnabled( bool ) ) );
}
Plugin_RawConverter::~Plugin_RawConverter()
{
}
-bool Plugin_RawConverter::isRAWFile(const QString& filePath)
+bool Plugin_RawConverter::isRAWFile(const TQString& filePath)
{
#if KDCRAW_VERSION < 0x000106
- QString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles());
+ TQString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles());
#else
- QString rawFilesExt(KDcrawIface::KDcraw::rawFiles());
+ TQString rawFilesExt(KDcrawIface::KDcraw::rawFiles());
#endif
- QFileInfo fileInfo(filePath);
- if (rawFilesExt.upper().contains( fileInfo.extension(false).upper() ))
+ TQFileInfo fileInfo(filePath);
+ if (rawFilesExt.upper().tqcontains( fileInfo.extension(false).upper() ))
return true;
return false;
@@ -147,7 +147,7 @@ bool Plugin_RawConverter::checkBinaries()
void Plugin_RawConverter::slotActivateSingle()
{
- KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>( parent() );
+ KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>( tqparent() );
if (!interface)
{
@@ -166,21 +166,21 @@ void Plugin_RawConverter::slotActivateSingle()
if (!isRAWFile(images.images()[0].path()))
{
- KMessageBox::error(kapp->activeWindow(),
- i18n("\"%1\" is not a Raw file.").arg(images.images()[0].fileName()));
+ KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()),
+ i18n("\"%1\" is not a Raw file.").tqarg(images.images()[0].fileName()));
return;
}
KIPIRawConverterPlugin::SingleDialog *converter =
new KIPIRawConverterPlugin::SingleDialog(images.images()[0].path(),
- kapp->activeWindow());
+ TQT_TQWIDGET(kapp->activeWindow()));
converter->show();
}
void Plugin_RawConverter::slotActivateBatch()
{
- KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>( parent() );
+ KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>( tqparent() );
if (!interface)
{
@@ -198,10 +198,10 @@ void Plugin_RawConverter::slotActivateBatch()
return;
KIPIRawConverterPlugin::BatchDialog *converter =
- new KIPIRawConverterPlugin::BatchDialog(kapp->activeWindow());
+ new KIPIRawConverterPlugin::BatchDialog(TQT_TQWIDGET(kapp->activeWindow()));
KURL::List urls = images.images();
- QStringList files;
+ TQStringList files;
for( KURL::List::Iterator it = urls.begin(); it != urls.end(); ++it )
{
diff --git a/kipi-plugins/rawconverter/plugin_rawconverter.h b/kipi-plugins/rawconverter/plugin_rawconverter.h
index 3b159ca..12b700f 100644
--- a/kipi-plugins/rawconverter/plugin_rawconverter.h
+++ b/kipi-plugins/rawconverter/plugin_rawconverter.h
@@ -34,21 +34,22 @@ class KAction;
class Plugin_RawConverter : public KIPI::Plugin
{
Q_OBJECT
+ TQ_OBJECT
public:
- Plugin_RawConverter(QObject *parent,
+ Plugin_RawConverter(TQObject *tqparent,
const char* name,
- const QStringList &args);
+ const TQStringList &args);
~Plugin_RawConverter();
KIPI::Category category( KAction* action ) const;
- virtual void setup( QWidget* widget );
+ virtual void setup( TQWidget* widget );
private:
bool checkBinaries();
- bool isRAWFile(const QString& filePath);
+ bool isRAWFile(const TQString& filePath);
private slots:
diff --git a/kipi-plugins/rawconverter/previewwidget.cpp b/kipi-plugins/rawconverter/previewwidget.cpp
index e1958f5..4718e0e 100644
--- a/kipi-plugins/rawconverter/previewwidget.cpp
+++ b/kipi-plugins/rawconverter/previewwidget.cpp
@@ -21,14 +21,14 @@
*
* ============================================================ */
-// Qt includes.
+// TQt includes.
-#include <qpainter.h>
-#include <qimage.h>
-#include <qstring.h>
-#include <qevent.h>
-#include <qtimer.h>
-#include <qfile.h>
+#include <tqpainter.h>
+#include <tqimage.h>
+#include <tqstring.h>
+#include <tqevent.h>
+#include <tqtimer.h>
+#include <tqfile.h>
// KDE includes.
@@ -52,34 +52,34 @@ public:
timer = 0;
}
- QPixmap *pix;
- QPixmap preview;
+ TQPixmap *pix;
+ TQPixmap preview;
- QTimer *timer;
+ TQTimer *timer;
- QString text;
+ TQString text;
- QImage image;
+ TQImage image;
};
-PreviewWidget::PreviewWidget(QWidget *parent)
- : QFrame(parent, 0, Qt::WRepaintNoErase)
+PreviewWidget::PreviewWidget(TQWidget *tqparent)
+ : TQFrame(tqparent, 0, TQt::WRepaintNoErase)
{
d = new PreviewWidgetPriv;
- setFrameStyle(QFrame::GroupBoxPanel|QFrame::Plain);
+ setFrameStyle(TQFrame::GroupBoxPanel|TQFrame::Plain);
setMargin(0);
setLineWidth(1);
- setMinimumSize(QSize(400, 300));
- setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+ setMinimumSize(TQSize(400, 300));
+ tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
- d->pix = new QPixmap(400, 300);
- d->pix->fill(Qt::black);
+ d->pix = new TQPixmap(400, 300);
+ d->pix->fill(TQt::black);
- d->timer = new QTimer(this);
+ d->timer = new TQTimer(this);
- connect(d->timer, SIGNAL(timeout()),
- this, SLOT(slotResize()));
+ connect(d->timer, TQT_SIGNAL(timeout()),
+ this, TQT_SLOT(slotResize()));
}
PreviewWidget::~PreviewWidget()
@@ -87,21 +87,21 @@ PreviewWidget::~PreviewWidget()
delete d;
}
-void PreviewWidget::load(const QString& file)
+void PreviewWidget::load(const TQString& file)
{
d->text = "";
- d->pix->fill(Qt::black);
+ d->pix->fill(TQt::black);
d->image.load(file);
if (!d->image.isNull())
{
- QImage img = d->image.scale(width(),height(),QImage::ScaleMin);
+ TQImage img = d->image.scale(width(),height(),TQ_ScaleMin);
int x = d->pix->width()/2 - img.width()/2;
int y = d->pix->height()/2 - img.height()/2;
- QPainter p(d->pix);
+ TQPainter p(d->pix);
p.drawImage(x, y, img);
- p.setPen(QPen(Qt::white));
+ p.setPen(TQPen(TQt::white));
p.drawRect(x,y,img.width(),img.height());
p.end();
}
@@ -114,37 +114,37 @@ void PreviewWidget::load(const QString& file)
update();
}
-void PreviewWidget::setInfo(const QString& text, const QColor& color, const QPixmap& preview)
+void PreviewWidget::setInfo(const TQString& text, const TQColor& color, const TQPixmap& preview)
{
d->text = text;
d->preview = preview;
- d->pix->fill(Qt::black);
- QPainter p(d->pix);
- p.setPen(QPen(color));
+ d->pix->fill(TQt::black);
+ TQPainter p(d->pix);
+ p.setPen(TQPen(color));
if (!d->preview.isNull())
{
p.drawPixmap(d->pix->width()/2-d->preview.width()/2, d->pix->height()/4-d->preview.height()/2,
d->preview, 0, 0, d->preview.width(), d->preview.height());
p.drawText(0, d->pix->height()/2, d->pix->width(), d->pix->height()/2,
- Qt::AlignCenter|Qt::WordBreak, d->text);
+ TQt::AlignCenter|TQt::WordBreak, d->text);
}
else
{
p.drawText(0, 0, d->pix->width(), d->pix->height(),
- Qt::AlignCenter|Qt::WordBreak, d->text);
+ TQt::AlignCenter|TQt::WordBreak, d->text);
}
p.end();
update();
}
-void PreviewWidget::paintEvent(QPaintEvent *e)
+void PreviewWidget::paintEvent(TQPaintEvent *e)
{
- QRect r(e->rect());
- bitBlt(this, r.topLeft(), d->pix, r, Qt::CopyROP);
+ TQRect r(e->rect());
+ bitBlt(this, r.topLeft(), d->pix, r, TQt::CopyROP);
}
-void PreviewWidget::resizeEvent(QResizeEvent*)
+void PreviewWidget::resizeEvent(TQResizeEvent*)
{
d->timer->start(10,true);
}
@@ -154,23 +154,23 @@ void PreviewWidget::slotResize()
if (d->timer->isActive()) return;
d->pix->resize(width(),height());
- d->pix->fill(Qt::black);
+ d->pix->fill(TQt::black);
if (!d->text.isEmpty())
{
- QPainter p(d->pix);
- p.setPen(QPen(Qt::white));
+ TQPainter p(d->pix);
+ p.setPen(TQPen(TQt::white));
if (!d->preview.isNull())
{
p.drawPixmap(d->pix->width()/2-d->preview.width()/2, d->pix->height()/4-d->preview.height()/2,
d->preview, 0, 0, d->preview.width(), d->preview.height());
p.drawText(0, d->pix->height()/2, d->pix->width(), d->pix->height()/2,
- Qt::AlignCenter|Qt::WordBreak, d->text);
+ TQt::AlignCenter|TQt::WordBreak, d->text);
}
else
{
p.drawText(0, 0, d->pix->width(), d->pix->height(),
- Qt::AlignCenter|Qt::WordBreak, d->text);
+ TQt::AlignCenter|TQt::WordBreak, d->text);
}
p.end();
@@ -179,13 +179,13 @@ void PreviewWidget::slotResize()
{
if (!d->image.isNull())
{
- QImage img = d->image.scale(width(),height(), QImage::ScaleMin);
+ TQImage img = d->image.scale(width(),height(), TQ_ScaleMin);
int x = d->pix->width()/2 - img.width()/2;
int y = d->pix->height()/2 - img.height()/2;
- QPainter p(d->pix);
+ TQPainter p(d->pix);
p.drawImage(x, y, img);
- p.setPen(QPen(Qt::white));
+ p.setPen(TQPen(TQt::white));
p.drawRect(x,y,img.width(),img.height());
p.end();
}
diff --git a/kipi-plugins/rawconverter/previewwidget.h b/kipi-plugins/rawconverter/previewwidget.h
index f1e6ca7..58abf0f 100644
--- a/kipi-plugins/rawconverter/previewwidget.h
+++ b/kipi-plugins/rawconverter/previewwidget.h
@@ -25,37 +25,38 @@
#ifndef PREVIEWWIDGET_H
#define PREVIEWWIDGET_H
-// Qt includes.
+// TQt includes.
-#include <qcolor.h>
-#include <qframe.h>
-#include <qpixmap.h>
-#include <qstring.h>
+#include <tqcolor.h>
+#include <tqframe.h>
+#include <tqpixmap.h>
+#include <tqstring.h>
-class QPaintEvent;
-class QResizeEvent;
+class TQPaintEvent;
+class TQResizeEvent;
namespace KIPIRawConverterPlugin
{
class PreviewWidgetPriv;
-class PreviewWidget : public QFrame
+class PreviewWidget : public TQFrame
{
Q_OBJECT
+ TQ_OBJECT
public:
- PreviewWidget(QWidget *parent);
+ PreviewWidget(TQWidget *tqparent);
~PreviewWidget();
- void load(const QString& file);
- void setInfo(const QString& text, const QColor& color=Qt::white,
- const QPixmap& preview=QPixmap());
+ void load(const TQString& file);
+ void setInfo(const TQString& text, const TQColor& color=TQt::white,
+ const TQPixmap& preview=TQPixmap());
protected:
- void paintEvent(QPaintEvent *e);
- void resizeEvent(QResizeEvent *e);
+ void paintEvent(TQPaintEvent *e);
+ void resizeEvent(TQResizeEvent *e);
private slots:
diff --git a/kipi-plugins/rawconverter/rawdecodingiface.cpp b/kipi-plugins/rawconverter/rawdecodingiface.cpp
index 1a86bae..70aff48 100644
--- a/kipi-plugins/rawconverter/rawdecodingiface.cpp
+++ b/kipi-plugins/rawconverter/rawdecodingiface.cpp
@@ -46,10 +46,10 @@ extern "C"
#include "iccjpeg.h"
}
-// Qt Includes.
+// TQt Includes.
-#include <qcstring.h>
-#include <qfileinfo.h>
+#include <tqcstring.h>
+#include <tqfileinfo.h>
// KDE includes.
@@ -77,9 +77,9 @@ RawDecodingIface::~RawDecodingIface()
{
}
-QByteArray RawDecodingIface::getICCProfilFromFile(KDcrawIface::RawDecodingSettings::OutputColorSpace colorSpace)
+TQByteArray RawDecodingIface::getICCProfilFromFile(KDcrawIface::RawDecodingSettings::OutputColorSpace colorSpace)
{
- QString filePath;
+ TQString filePath;
KGlobal::dirs()->addResourceType("profiles", KGlobal::dirs()->kde_default("data") +
"kipiplugin_rawconverter/profiles");
@@ -114,25 +114,25 @@ QByteArray RawDecodingIface::getICCProfilFromFile(KDcrawIface::RawDecodingSettin
}
if ( filePath.isEmpty() )
- return QByteArray();
+ return TQByteArray();
- QFile file(filePath);
+ TQFile file(filePath);
if ( !file.open(IO_ReadOnly) )
- return QByteArray();
+ return TQByteArray();
- QByteArray data(file.size());
- QDataStream stream( &file );
+ TQByteArray data(file.size());
+ TQDataStream stream( &file );
stream.readRawBytes(data.data(), data.size());
file.close();
return data;
}
-bool RawDecodingIface::decodeHalfRAWImage(const QString& filePath,
- QString& destPath, SaveSettingsWidget::OutputFormat outputFileFormat,
+bool RawDecodingIface::decodeHalfRAWImage(const TQString& filePath,
+ TQString& destPath, SaveSettingsWidget::OutputFormat outputFileFormat,
KDcrawIface::RawDecodingSettings rawDecodingSettings)
{
int width, height, rgbmax;
- QByteArray imageData;
+ TQByteArray imageData;
if (!KDcrawIface::KDcraw::decodeHalfRAWImage(filePath, rawDecodingSettings,
imageData, width, height, rgbmax))
return false;
@@ -141,12 +141,12 @@ bool RawDecodingIface::decodeHalfRAWImage(const QString& filePath,
imageData, width, height));
}
-bool RawDecodingIface::decodeRAWImage(const QString& filePath,
- QString& destPath, SaveSettingsWidget::OutputFormat outputFileFormat,
+bool RawDecodingIface::decodeRAWImage(const TQString& filePath,
+ TQString& destPath, SaveSettingsWidget::OutputFormat outputFileFormat,
KDcrawIface::RawDecodingSettings rawDecodingSettings)
{
int width, height, rgbmax;
- QByteArray imageData;
+ TQByteArray imageData;
if (!KDcrawIface::KDcraw::decodeRAWImage(filePath, rawDecodingSettings,
imageData, width, height, rgbmax))
return false;
@@ -157,13 +157,13 @@ bool RawDecodingIface::decodeRAWImage(const QString& filePath,
// ----------------------------------------------------------------------------------
-bool RawDecodingIface::loadedFromDcraw(const QString& filePath,
- QString& destPath, SaveSettingsWidget::OutputFormat outputFileFormat,
- const QByteArray& imageData, int width, int height)
+bool RawDecodingIface::loadedFromDcraw(const TQString& filePath,
+ TQString& destPath, SaveSettingsWidget::OutputFormat outputFileFormat,
+ const TQByteArray& imageData, int width, int height)
{
- // -- Use a QImage instance to write IPTC preview and Exif thumbnail -------
+ // -- Use a TQImage instance to write IPTC preview and Exif thumbnail -------
- QImage img(width, height, 32);
+ TQImage img(width, height, 32);
uchar* dptr = img.bits();
uchar* sptr = (uchar*)imageData.data();
@@ -178,22 +178,22 @@ bool RawDecodingIface::loadedFromDcraw(const QString& filePath,
sptr += 3;
}
- QImage iptcPreview = img.scale(1280, 1024, QImage::ScaleMin);
- QImage exifThumbnail = iptcPreview.scale(160, 120, QImage::ScaleMin);
+ TQImage iptcPreview = img.scale(1280, 1024, TQ_ScaleMin);
+ TQImage exifThumbnail = iptcPreview.scale(160, 120, TQ_ScaleMin);
// -- Write image data into destination file -------------------------------
- QByteArray ICCColorProfile = getICCProfilFromFile(m_rawDecodingSettings.outputColorSpace);
- QString soft = QString("Kipi-plugins v.%1").arg(kipiplugins_version);
- QFileInfo fi(filePath);
- destPath = fi.dirPath(true) + QString("/") + ".kipi-rawconverter-tmp-"
- + QString::number(::time(0));
+ TQByteArray ICCColorProfile = getICCProfilFromFile(m_rawDecodingSettings.outputColorSpace);
+ TQString soft = TQString("Kipi-plugins v.%1").tqarg(kipiplugins_version);
+ TQFileInfo fi(filePath);
+ destPath = fi.dirPath(true) + TQString("/") + ".kipi-rawconverter-tmp-"
+ + TQString::number(::time(0));
// Metadata restoration and update.
KExiv2Iface::KExiv2 exiv2Iface;
exiv2Iface.load(filePath);
- exiv2Iface.setImageProgramId(QString("Kipi-plugins"), QString(kipiplugins_version));
- exiv2Iface.setImageDimensions(QSize(width, height));
+ exiv2Iface.setImageProgramId(TQString("Kipi-plugins"), TQString(kipiplugins_version));
+ exiv2Iface.setImageDimensions(TQSize(width, height));
exiv2Iface.setExifThumbnail(exifThumbnail);
// Update Iptc preview.
@@ -211,7 +211,7 @@ bool RawDecodingIface::loadedFromDcraw(const QString& filePath,
case SaveSettingsWidget::OUTPUT_JPEG:
{
FILE* f = 0;
- f = fopen(QFile::encodeName(destPath), "wb");
+ f = fopen(TQFile::encodeName(destPath), "wb");
if (!f)
{
@@ -272,7 +272,7 @@ bool RawDecodingIface::loadedFromDcraw(const QString& filePath,
case SaveSettingsWidget::OUTPUT_PNG:
{
FILE* f = 0;
- f = fopen(QFile::encodeName(destPath), "wb");
+ f = fopen(TQFile::encodeName(destPath), "wb");
if (!f)
{
@@ -302,9 +302,9 @@ bool RawDecodingIface::loadedFromDcraw(const QString& filePath,
ICCColorProfile.data(), ICCColorProfile.size());
}
- QString libpngver(PNG_HEADER_VERSION_STRING);
- libpngver.replace('\n', ' ');
- soft.append(QString(" (%1)").arg(libpngver));
+ TQString libpngver(PNG_HEADER_VERSION_STRING);
+ libpngver.tqreplace('\n', ' ');
+ soft.append(TQString(" (%1)").tqarg(libpngver));
png_text text;
text.key = "Software";
text.text = (char *)soft.ascii();
@@ -312,15 +312,15 @@ bool RawDecodingIface::loadedFromDcraw(const QString& filePath,
png_set_text(png_ptr, info_ptr, &(text), 1);
// Store Exif data.
- QByteArray ba = exiv2Iface.getExif();
+ TQByteArray ba = exiv2Iface.getExif();
const uchar ExifHeader[] = {0x45, 0x78, 0x69, 0x66, 0x00, 0x00};
- QByteArray profile = QByteArray(ba.size() + sizeof(ExifHeader));
+ TQByteArray profile = TQByteArray(ba.size() + sizeof(ExifHeader));
memcpy(profile.data(), ExifHeader, sizeof(ExifHeader));
memcpy(profile.data()+sizeof(ExifHeader), ba.data(), ba.size());
writeRawProfile(png_ptr, info_ptr, "exif", profile.data(), (png_uint_32) profile.size());
// Store Iptc data.
- QByteArray ba2 = exiv2Iface.getIptc();
+ TQByteArray ba2 = exiv2Iface.getIptc();
writeRawProfile(png_ptr, info_ptr, "iptc", ba2.data(), (png_uint_32) ba2.size());
png_write_info(png_ptr, info_ptr);
@@ -349,7 +349,7 @@ bool RawDecodingIface::loadedFromDcraw(const QString& filePath,
int y;
int w;
- tif = TIFFOpen(QFile::encodeName(destPath), "wb");
+ tif = TIFFOpen(TQFile::encodeName(destPath), "wb");
if (!tif)
{
@@ -377,14 +377,14 @@ bool RawDecodingIface::loadedFromDcraw(const QString& filePath,
TIFFSetField(tif, TIFFTAG_ROWSPERSTRIP, TIFFDefaultStripSize(tif, 0));
// Store Iptc data.
- QByteArray ba2 = exiv2Iface.getIptc(true);
+ TQByteArray ba2 = exiv2Iface.getIptc(true);
#if defined(TIFFTAG_PHOTOSHOP)
TIFFSetField (tif, TIFFTAG_PHOTOSHOP, (uint32)ba2.size(), (uchar *)ba2.data());
#endif
- QString libtiffver(TIFFLIB_VERSION_STR);
- libtiffver.replace('\n', ' ');
- soft.append(QString(" ( %1 )").arg(libtiffver));
+ TQString libtiffver(TIFFLIB_VERSION_STR);
+ libtiffver.tqreplace('\n', ' ');
+ soft.append(TQString(" ( %1 )").tqarg(libtiffver));
TIFFSetField(tif, TIFFTAG_SOFTWARE, (const char*)soft.ascii());
// Write ICC profil.
@@ -408,7 +408,7 @@ bool RawDecodingIface::loadedFromDcraw(const QString& filePath,
// Write thumbnail in tiff directory IFD1
- QImage thumb = exiv2Iface.getExifThumbnail(false);
+ TQImage thumb = exiv2Iface.getExifThumbnail(false);
if (!thumb.isNull())
{
TIFFSetField(tif, TIFFTAG_IMAGEWIDTH, (uint32)thumb.width());
@@ -470,7 +470,7 @@ bool RawDecodingIface::loadedFromDcraw(const QString& filePath,
case SaveSettingsWidget::OUTPUT_PPM:
{
- FILE* f = fopen(QFile::encodeName(destPath), "wb");
+ FILE* f = fopen(TQFile::encodeName(destPath), "wb");
if (!f)
{
qDebug("Failed to open ppm file for writing");
@@ -491,7 +491,7 @@ bool RawDecodingIface::loadedFromDcraw(const QString& filePath,
if (m_cancel)
{
- ::remove(QFile::encodeName(destPath));
+ ::remove(TQFile::encodeName(destPath));
return false;
}
diff --git a/kipi-plugins/rawconverter/rawdecodingiface.h b/kipi-plugins/rawconverter/rawdecodingiface.h
index 6233447..94788c4 100644
--- a/kipi-plugins/rawconverter/rawdecodingiface.h
+++ b/kipi-plugins/rawconverter/rawdecodingiface.h
@@ -36,11 +36,11 @@ extern "C"
}
-// Qt Includes.
+// TQt Includes.
-#include <qstring.h>
-#include <qobject.h>
-#include <qimage.h>
+#include <tqstring.h>
+#include <tqobject.h>
+#include <tqimage.h>
// LibKDcraw includes.
@@ -57,6 +57,7 @@ namespace KIPIRawConverterPlugin
class RawDecodingIface : public KDcrawIface::KDcraw
{
Q_OBJECT
+ TQ_OBJECT
public:
@@ -68,24 +69,24 @@ public:
/** Extract a small size of decode RAW data in 8 bits/color/pixels
using sRGB color space.
*/
- bool decodeHalfRAWImage(const QString& filePath,
- QString& destPath, SaveSettingsWidget::OutputFormat outputFileFormat,
+ bool decodeHalfRAWImage(const TQString& filePath,
+ TQString& destPath, SaveSettingsWidget::OutputFormat outputFileFormat,
KDcrawIface::RawDecodingSettings rawDecodingSettings);
/** Extract a full size of RAW data in 8 bits/color/pixels using
sRGB color space.
*/
- bool decodeRAWImage(const QString& filePath,
- QString& destPath, SaveSettingsWidget::OutputFormat outputFileFormat,
+ bool decodeRAWImage(const TQString& filePath,
+ TQString& destPath, SaveSettingsWidget::OutputFormat outputFileFormat,
KDcrawIface::RawDecodingSettings rawDecodingSettings);
private:
- QByteArray getICCProfilFromFile(KDcrawIface::RawDecodingSettings::OutputColorSpace colorSpace);
+ TQByteArray getICCProfilFromFile(KDcrawIface::RawDecodingSettings::OutputColorSpace colorSpace);
- bool loadedFromDcraw(const QString& filePath,
- QString& destPath, SaveSettingsWidget::OutputFormat outputFileFormat,
- const QByteArray& imageData, int width, int height);
+ bool loadedFromDcraw(const TQString& filePath,
+ TQString& destPath, SaveSettingsWidget::OutputFormat outputFileFormat,
+ const TQByteArray& imageData, int width, int height);
void writeRawProfile(png_struct *ping, png_info *ping_info, char *profile_type,
char *profile_data, png_uint_32 length);
diff --git a/kipi-plugins/rawconverter/savesettingswidget.cpp b/kipi-plugins/rawconverter/savesettingswidget.cpp
index 8531863..c6af08a 100644
--- a/kipi-plugins/rawconverter/savesettingswidget.cpp
+++ b/kipi-plugins/rawconverter/savesettingswidget.cpp
@@ -20,15 +20,15 @@
*
* ============================================================ */
-// Qt includes.
+// TQt includes.
-#include <qcombobox.h>
-#include <qvbuttongroup.h>
-#include <qradiobutton.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qwhatsthis.h>
-#include <qstring.h>
+#include <tqcombobox.h>
+#include <tqvbuttongroup.h>
+#include <tqradiobutton.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqwhatsthis.h>
+#include <tqstring.h>
// KDE includes.
@@ -57,30 +57,30 @@ public:
promptButton = 0;
}
- QLabel *formatLabel;
- QLabel *conflictLabel;
+ TQLabel *formatLabel;
+ TQLabel *conflictLabel;
- QVButtonGroup *conflictButtonGroup;
+ TQVButtonGroup *conflictButtonGroup;
- QComboBox *formatComboBox;
+ TQComboBox *formatComboBox;
- QRadioButton *overwriteButton;
- QRadioButton *promptButton;
+ TQRadioButton *overwriteButton;
+ TQRadioButton *promptButton;
};
-SaveSettingsWidget::SaveSettingsWidget(QWidget *parent)
- : QWidget(parent, 0, Qt::WDestructiveClose)
+SaveSettingsWidget::SaveSettingsWidget(TQWidget *tqparent)
+ : TQWidget(tqparent, 0, TQt::WDestructiveClose)
{
d = new SaveSettingsWidgetPriv;
- QGridLayout* settingsBoxLayout = new QGridLayout(this, 3, 1, KDialog::spacingHint());
+ TQGridLayout* settingsBoxLayout = new TQGridLayout(this, 3, 1, KDialog::spacingHint());
- d->formatLabel = new QLabel(i18n("Output file format:"), this);
- d->formatComboBox = new QComboBox( false, this );
+ d->formatLabel = new TQLabel(i18n("Output file format:"), this);
+ d->formatComboBox = new TQComboBox( false, this );
d->formatComboBox->insertItem( "JPEG", OUTPUT_JPEG );
d->formatComboBox->insertItem( "TIFF", OUTPUT_TIFF );
d->formatComboBox->insertItem( "PPM", OUTPUT_PPM );
d->formatComboBox->insertItem( "PNG", OUTPUT_PNG );
- QWhatsThis::add(d->formatComboBox, i18n("<p>Set here the output file format to use:<p>"
+ TQWhatsThis::add(d->formatComboBox, i18n("<p>Set here the output file format to use:<p>"
"<b>JPEG</b>: output the processed image in JPEG Format. "
"this format will give smaller-sized files. Minimum JPEG "
"compression level will be used during Raw conversion.<p>"
@@ -98,15 +98,15 @@ SaveSettingsWidget::SaveSettingsWidget(QWidget *parent)
"losing quality. Maximum PNG compression "
"will be used during conversion."));
- d->conflictLabel = new QLabel(i18n("If Target File Exists:"), this);
- d->conflictButtonGroup = new QVButtonGroup(this);
- d->overwriteButton = new QRadioButton(i18n("Overwrite automatically"), d->conflictButtonGroup);
- d->promptButton = new QRadioButton(i18n("Open rename-file dialog"), d->conflictButtonGroup);
+ d->conflictLabel = new TQLabel(i18n("If Target File Exists:"), this);
+ d->conflictButtonGroup = new TQVButtonGroup(this);
+ d->overwriteButton = new TQRadioButton(i18n("Overwrite automatically"), d->conflictButtonGroup);
+ d->promptButton = new TQRadioButton(i18n("Open rename-file dialog"), d->conflictButtonGroup);
d->conflictButtonGroup->insert(d->overwriteButton, OVERWRITE);
d->conflictButtonGroup->insert(d->promptButton, ASKTOUSER);
d->conflictButtonGroup->setRadioButtonExclusive(true);
d->overwriteButton->setChecked(true);
- d->conflictButtonGroup->setFrameStyle(QFrame::NoFrame|QFrame::Plain);
+ d->conflictButtonGroup->setFrameStyle(TQFrame::NoFrame|TQFrame::Plain);
d->conflictButtonGroup->setInsideMargin(0);
settingsBoxLayout->addMultiCellWidget(d->formatLabel, 0, 0, 0, 0);
@@ -115,8 +115,8 @@ SaveSettingsWidget::SaveSettingsWidget(QWidget *parent)
settingsBoxLayout->addMultiCellWidget(d->conflictButtonGroup, 2, 2, 0, 1);
settingsBoxLayout->setRowStretch(3, 10);
- connect(d->formatComboBox, SIGNAL(activated(int)),
- this, SIGNAL(signalSaveFormatChanged()));
+ connect(d->formatComboBox, TQT_SIGNAL(activated(int)),
+ this, TQT_SIGNAL(signalSaveFormatChanged()));
}
SaveSettingsWidget::~SaveSettingsWidget()
diff --git a/kipi-plugins/rawconverter/savesettingswidget.h b/kipi-plugins/rawconverter/savesettingswidget.h
index a7b1f14..a5425a5 100644
--- a/kipi-plugins/rawconverter/savesettingswidget.h
+++ b/kipi-plugins/rawconverter/savesettingswidget.h
@@ -23,18 +23,19 @@
#ifndef SAVESETTINGSWIDGET_H
#define SAVESETTINGSWIDGET_H
-// Qt includes.
+// TQt includes.
-#include <qwidget.h>
+#include <tqwidget.h>
namespace KIPIRawConverterPlugin
{
class SaveSettingsWidgetPriv;
-class SaveSettingsWidget : public QWidget
+class SaveSettingsWidget : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
@@ -54,7 +55,7 @@ public:
public:
- SaveSettingsWidget(QWidget *parent);
+ SaveSettingsWidget(TQWidget *tqparent);
~SaveSettingsWidget();
SaveSettingsWidget::OutputFormat fileFormat();
diff --git a/kipi-plugins/rawconverter/singledialog.cpp b/kipi-plugins/rawconverter/singledialog.cpp
index e7c30b5..fb954cf 100644
--- a/kipi-plugins/rawconverter/singledialog.cpp
+++ b/kipi-plugins/rawconverter/singledialog.cpp
@@ -34,17 +34,17 @@ extern "C"
#include <cstdio>
-// Qt includes.
-
-#include <qtimer.h>
-#include <qframe.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qfileinfo.h>
-#include <qevent.h>
-#include <qpushbutton.h>
-#include <qfile.h>
+// TQt includes.
+
+#include <tqtimer.h>
+#include <tqframe.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqtooltip.h>
+#include <tqfileinfo.h>
+#include <tqevent.h>
+#include <tqpushbutton.h>
+#include <tqfile.h>
// KDE includes.
@@ -79,17 +79,17 @@ extern "C"
namespace KIPIRawConverterPlugin
{
-SingleDialog::SingleDialog(const QString& file, QWidget */*parent*/)
+SingleDialog::SingleDialog(const TQString& file, TQWidget */*tqparent*/)
: KDialogBase(0, 0, false, i18n("Raw Image Converter"),
Help|Default|User1|User2|User3|Close, Close, true,
i18n("&Preview"), i18n("Con&vert"), i18n("&Abort"))
{
m_inputFile = file;
- m_inputFileName = QFileInfo(file).fileName();
+ m_inputFileName = TQFileInfo(file).fileName();
- QWidget *page = new QWidget( this );
+ TQWidget *page = new TQWidget( this );
setMainWidget( page );
- QGridLayout *mainLayout = new QGridLayout(page, 1, 1, 0, spacingHint());
+ TQGridLayout *mainLayout = new TQGridLayout(page, 1, 1, 0, spacingHint());
m_previewWidget = new PreviewWidget(page);
@@ -128,7 +128,7 @@ SingleDialog::SingleDialog(const QString& file, QWidget */*parent*/)
KHelpMenu* helpMenu = new KHelpMenu(this, m_about, false);
helpMenu->menu()->removeItemAt(0);
- helpMenu->menu()->insertItem(i18n("Plugin Handbook"), this, SLOT(slotHelp()), 0, -1, 0);
+ helpMenu->menu()->insertItem(i18n("Plugin Handbook"), this, TQT_SLOT(slotHelp()), 0, -1, 0);
actionButton(Help)->setPopup( helpMenu->menu() );
// ---------------------------------------------------------------
@@ -144,23 +144,23 @@ SingleDialog::SingleDialog(const QString& file, QWidget */*parent*/)
setButtonTip( Close, i18n("<p>Exit Raw Converter"));
- m_blinkPreviewTimer = new QTimer(this);
- m_blinkConvertTimer = new QTimer(this);
- m_thread = new ActionThread(this);
+ m_blinkPreviewTimer = new TQTimer(this);
+ m_blinkConvertTimer = new TQTimer(this);
+ m_thread = new ActionThread(TQT_TQOBJECT(this));
// ---------------------------------------------------------------
- connect(m_blinkPreviewTimer, SIGNAL(timeout()),
- this, SLOT(slotPreviewBlinkTimerDone()));
+ connect(m_blinkPreviewTimer, TQT_SIGNAL(timeout()),
+ this, TQT_SLOT(slotPreviewBlinkTimerDone()));
- connect(m_blinkConvertTimer, SIGNAL(timeout()),
- this, SLOT(slotConvertBlinkTimerDone()));
+ connect(m_blinkConvertTimer, TQT_SIGNAL(timeout()),
+ this, TQT_SLOT(slotConvertBlinkTimerDone()));
// ---------------------------------------------------------------
busy(false);
readSettings();
- QTimer::singleShot(0, this, SLOT( slotIdentify() ) );
+ TQTimer::singleShot(0, this, TQT_SLOT( slotIdentify() ) );
}
SingleDialog::~SingleDialog()
@@ -169,7 +169,7 @@ SingleDialog::~SingleDialog()
delete m_thread;
}
-void SingleDialog::closeEvent(QCloseEvent *e)
+void SingleDialog::closeEvent(TQCloseEvent *e)
{
if (!e) return;
m_blinkPreviewTimer->stop();
@@ -237,7 +237,7 @@ void SingleDialog::readSettings()
(SaveSettingsWidget::ConflictRule)config.readNumEntry("Conflict",
(int)(SaveSettingsWidget::OVERWRITE)));
- resize(configDialogSize(config, QString("Single Raw Converter Dialog")));
+ resize(configDialogSize(config, TQString("Single Raw Converter Dialog")));
}
void SingleDialog::saveSettings()
@@ -270,7 +270,7 @@ void SingleDialog::saveSettings()
config.writeEntry("Output Format", (int)m_saveSettingsBox->fileFormat());
config.writeEntry("Conflict", (int)m_saveSettingsBox->conflictRule());
- saveDialogSize(config, QString("Single Raw Converter Dialog"));
+ saveDialogSize(config, TQString("Single Raw Converter Dialog"));
config.sync();
}
@@ -366,47 +366,47 @@ void SingleDialog::busy(bool val)
enableButton (Close, !val);
}
-void SingleDialog::identified(const QString&, const QString& identity, const QPixmap& preview)
+void SingleDialog::identified(const TQString&, const TQString& identity, const TQPixmap& preview)
{
- m_previewWidget->setInfo(m_inputFileName + QString(" :\n") + identity, Qt::white, preview);
+ m_previewWidget->setInfo(m_inputFileName + TQString(" :\n") + identity, TQt::white, preview);
}
-void SingleDialog::previewing(const QString&)
+void SingleDialog::previewing(const TQString&)
{
m_previewBlink = false;
m_previewWidget->setCursor( KCursor::waitCursor() );
m_blinkPreviewTimer->start(200);
}
-void SingleDialog::previewed(const QString&, const QString& tmpFile)
+void SingleDialog::previewed(const TQString&, const TQString& tmpFile)
{
m_previewWidget->unsetCursor();
m_blinkPreviewTimer->stop();
m_previewWidget->load(tmpFile);
- ::remove(QFile::encodeName(tmpFile));
+ ::remove(TQFile::encodeName(tmpFile));
}
-void SingleDialog::previewFailed(const QString&)
+void SingleDialog::previewFailed(const TQString&)
{
m_previewWidget->unsetCursor();
m_blinkPreviewTimer->stop();
- m_previewWidget->setInfo(i18n("Failed to generate preview"), Qt::red);
+ m_previewWidget->setInfo(i18n("Failed to generate preview"), TQt::red);
}
-void SingleDialog::processing(const QString&)
+void SingleDialog::processing(const TQString&)
{
m_convertBlink = false;
m_previewWidget->setCursor( KCursor::waitCursor() );
m_blinkConvertTimer->start(200);
}
-void SingleDialog::processed(const QString&, const QString& tmpFile)
+void SingleDialog::processed(const TQString&, const TQString& tmpFile)
{
m_previewWidget->unsetCursor();
m_blinkConvertTimer->stop();
m_previewWidget->load(tmpFile);
- QString filter("*.");
- QString ext;
+ TQString filter("*.");
+ TQString ext;
switch(m_saveSettingsBox->fileFormat())
{
@@ -425,15 +425,15 @@ void SingleDialog::processed(const QString&, const QString& tmpFile)
}
filter += ext;
- QFileInfo fi(m_inputFile);
- QString destFile = fi.dirPath(true) + QString("/") + fi.baseName() + QString(".") + ext;
+ TQFileInfo fi(m_inputFile);
+ TQString destFile = fi.dirPath(true) + TQString("/") + fi.baseName() + TQString(".") + ext;
if (m_saveSettingsBox->conflictRule() != SaveSettingsWidget::OVERWRITE)
{
struct stat statBuf;
- if (::stat(QFile::encodeName(destFile), &statBuf) == 0)
+ if (::stat(TQFile::encodeName(destFile), &statBuf) == 0)
{
- KIO::RenameDlg dlg(this, i18n("Save Raw Image converted from '%1' as").arg(fi.fileName()),
+ KIO::RenameDlg dlg(this, i18n("Save Raw Image converted from '%1' as").tqarg(fi.fileName()),
tmpFile, destFile,
KIO::RenameDlg_Mode(KIO::M_SINGLE | KIO::M_OVERWRITE | KIO::M_SKIP));
@@ -442,7 +442,7 @@ void SingleDialog::processed(const QString&, const QString& tmpFile)
case KIO::R_CANCEL:
case KIO::R_SKIP:
{
- destFile = QString();
+ destFile = TQString();
break;
}
case KIO::R_RENAME:
@@ -458,28 +458,28 @@ void SingleDialog::processed(const QString&, const QString& tmpFile)
if (!destFile.isEmpty())
{
- if (::rename(QFile::encodeName(tmpFile), QFile::encodeName(destFile)) != 0)
+ if (::rename(TQFile::encodeName(tmpFile), TQFile::encodeName(destFile)) != 0)
{
- KMessageBox::error(this, i18n("Failed to save image %1").arg( destFile ));
+ KMessageBox::error(this, i18n("Failed to save image %1").tqarg( destFile ));
}
}
}
-void SingleDialog::processingFailed(const QString&)
+void SingleDialog::processingFailed(const TQString&)
{
m_previewWidget->unsetCursor();
m_blinkConvertTimer->stop();
- m_previewWidget->setInfo(i18n("Failed to convert Raw image"), Qt::red);
+ m_previewWidget->setInfo(i18n("Failed to convert Raw image"), TQt::red);
}
void SingleDialog::slotPreviewBlinkTimerDone()
{
- QString preview = i18n("Generating Preview...");
+ TQString preview = i18n("Generating Preview...");
if (m_previewBlink)
- m_previewWidget->setInfo(preview, Qt::green);
+ m_previewWidget->setInfo(preview, TQt::green);
else
- m_previewWidget->setInfo(preview, Qt::darkGreen);
+ m_previewWidget->setInfo(preview, TQt::darkGreen);
m_previewBlink = !m_previewBlink;
m_blinkPreviewTimer->start(200);
@@ -487,25 +487,25 @@ void SingleDialog::slotPreviewBlinkTimerDone()
void SingleDialog::slotConvertBlinkTimerDone()
{
- QString convert = i18n("Converting Raw Image...");
+ TQString convert = i18n("Converting Raw Image...");
if (m_convertBlink)
- m_previewWidget->setInfo(convert, Qt::green);
+ m_previewWidget->setInfo(convert, TQt::green);
else
- m_previewWidget->setInfo(convert, Qt::darkGreen);
+ m_previewWidget->setInfo(convert, TQt::darkGreen);
m_convertBlink = !m_convertBlink;
m_blinkConvertTimer->start(200);
}
-void SingleDialog::customEvent(QCustomEvent *event)
+void SingleDialog::customEvent(TQCustomEvent *event)
{
if (!event) return;
EventData *d = (EventData*) event->data();
if (!d) return;
- QString text;
+ TQString text;
if (d->starting) // Something have been started...
{
@@ -565,7 +565,7 @@ void SingleDialog::customEvent(QCustomEvent *event)
{
case(IDENTIFY_FULL):
{
- QPixmap pix = QPixmap(d->image.scale(256, 256, QImage::ScaleMin));
+ TQPixmap pix = TQPixmap(d->image.scale(256, 256, TQ_ScaleMin));
identified(d->filePath, d->message, pix);
busy(false);
break;
diff --git a/kipi-plugins/rawconverter/singledialog.h b/kipi-plugins/rawconverter/singledialog.h
index 2038031..04cdd63 100644
--- a/kipi-plugins/rawconverter/singledialog.h
+++ b/kipi-plugins/rawconverter/singledialog.h
@@ -24,9 +24,9 @@
#ifndef SINGLEDIALOG_H
#define SINGLEDIALOG_H
-// Qt includes.
+// TQt includes.
-#include <qstring.h>
+#include <tqstring.h>
// KDE includes.
@@ -36,9 +36,9 @@
#include "kpaboutdata.h"
-class QCloseEvent;
-class QCustomEvent;
-class QTimer;
+class TQCloseEvent;
+class TQCustomEvent;
+class TQTimer;
namespace KDcrawIface
{
@@ -55,16 +55,17 @@ class SaveSettingsWidget;
class SingleDialog : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- SingleDialog(const QString& file, QWidget *parent);
+ SingleDialog(const TQString& file, TQWidget *tqparent);
~SingleDialog();
protected:
- void customEvent(QCustomEvent *event);
- void closeEvent(QCloseEvent *e);
+ void customEvent(TQCustomEvent *event);
+ void closeEvent(TQCloseEvent *e);
private:
@@ -73,15 +74,15 @@ private:
void busy(bool busy);
- void identified(const QString&, const QString& identity, const QPixmap& preview);
+ void identified(const TQString&, const TQString& identity, const TQPixmap& preview);
- void previewing(const QString&);
- void previewed(const QString&, const QString& tmpFile);
- void previewFailed(const QString&);
+ void previewing(const TQString&);
+ void previewed(const TQString&, const TQString& tmpFile);
+ void previewFailed(const TQString&);
- void processing(const QString&);
- void processed(const QString&, const QString& tmpFile);
- void processingFailed(const QString&);
+ void processing(const TQString&);
+ void processed(const TQString&, const TQString& tmpFile);
+ void processingFailed(const TQString&);
private slots:
@@ -102,11 +103,11 @@ private:
bool m_previewBlink;
bool m_convertBlink;
- QString m_inputFile;
- QString m_inputFileName;
+ TQString m_inputFile;
+ TQString m_inputFileName;
- QTimer *m_blinkPreviewTimer;
- QTimer *m_blinkConvertTimer;
+ TQTimer *m_blinkPreviewTimer;
+ TQTimer *m_blinkConvertTimer;
PreviewWidget *m_previewWidget;