Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent cee209f8b3
commit 00c3041bcc

@ -2005,7 +2005,7 @@ V 0.1.5-rc2 - 2008-02-01
Kipi-plugins from KDE3 branch : Batch Process : restore metadata Kipi-plugins from KDE3 branch : Batch Process : restore metadata
properlly with JPEG file during conversion. properlly with JPEG file during conversion.
Pawel, This patch sound like properlly under KDE3.5, but not Pawel, This patch sound like properlly under KDE3.5, but not
under KDE 3.4. I suspect a bug in KProcess or something like under KDE 3.4. I suspect a bug in TDEProcess or something like
that. that.
BUG: 152210 BUG: 152210
@ -2022,7 +2022,7 @@ V 0.1.5-rc2 - 2008-02-01
kipi-plugins/batchprocessimages/convertimagesdialog.cpp, kipi-plugins/batchprocessimages/convertimagesdialog.cpp,
kipi-plugins/batchprocessimages/convertimagesdialog.h, kipi-plugins/batchprocessimages/convertimagesdialog.h,
kipi-plugins/batchprocessimages/imagepreview.cpp: kipi-plugins/batchprocessimages/imagepreview.cpp:
Do not test is KProcess is out imediatly. Do not test is TDEProcess is out imediatly.
BUG: 151578 BUG: 151578
2007-11-19 13:40 cgilles 2007-11-19 13:40 cgilles
@ -2675,7 +2675,7 @@ V 0.1.5-rc1 - 2007-12-29
Kipi-plugins from KDE3 branch : Batch Process : restore metadata Kipi-plugins from KDE3 branch : Batch Process : restore metadata
properlly with JPEG file during conversion. properlly with JPEG file during conversion.
Pawel, This patch sound like properlly under KDE3.5, but not Pawel, This patch sound like properlly under KDE3.5, but not
under KDE 3.4. I suspect a bug in KProcess or something like under KDE 3.4. I suspect a bug in TDEProcess or something like
that. that.
BUG: 152210 BUG: 152210
@ -2692,7 +2692,7 @@ V 0.1.5-rc1 - 2007-12-29
kipi-plugins/batchprocessimages/convertimagesdialog.cpp, kipi-plugins/batchprocessimages/convertimagesdialog.cpp,
kipi-plugins/batchprocessimages/convertimagesdialog.h, kipi-plugins/batchprocessimages/convertimagesdialog.h,
kipi-plugins/batchprocessimages/imagepreview.cpp: kipi-plugins/batchprocessimages/imagepreview.cpp:
Do not test is KProcess is out imediatly. Do not test is TDEProcess is out imediatly.
BUG: 151578 BUG: 151578
2007-11-19 13:40 cgilles 2007-11-19 13:40 cgilles
@ -3387,7 +3387,7 @@ V 0.1.5-beta1 - 2007-10-07
kipi-plugins/batchprocessimages/imagepreview.cpp: kipi-plugins/batchprocessimages/imagepreview.cpp:
kipi-plugins from KDE3 branch : Bugfix with ImageMagick kipi-plugins from KDE3 branch : Bugfix with ImageMagick
background process creation : always checking if process background process creation : always checking if process
(KProcess) is ended properlly (no ImageMagick crash for ex.) (TDEProcess) is ended properlly (no ImageMagick crash for ex.)
2007-09-25 11:00 cgilles 2007-09-25 11:00 cgilles
@ -10191,7 +10191,7 @@ v 0.1.3-beta1 - 2006-11-29
rawconverter/singledialog.cpp: rawconverter/singledialog.cpp:
kipi-plugins from trunk : Raw Converter : full cancelable (when kipi-plugins from trunk : Raw Converter : full cancelable (when
you want) dcraw instance during RAW image data decoding. you want) dcraw instance during RAW image data decoding.
The code use now a KProcess instance instead a simple The code use now a TDEProcess instance instead a simple
non-cancelable popen() call. The implementation is inspired from non-cancelable popen() call. The implementation is inspired from
digiKam RAW image loader digiKam RAW image loader
CCBUGS: 107905, 128394 CCBUGS: 107905, 128394
@ -10689,7 +10689,7 @@ v 0.1.3-beta1 - 2006-11-29
This commit remove libmagick++ depency to process non-jpeg files This commit remove libmagick++ depency to process non-jpeg files
transforms. The plugin use an ImageMagick runtime dependency transforms. The plugin use an ImageMagick runtime dependency
instead (convert tool run by a KProcess instance). instead (convert tool run by a TDEProcess instance).
CCMAIL: kde-imaging@kde.org CCMAIL: kde-imaging@kde.org

@ -2131,7 +2131,7 @@ V 0.1.5-rc2 - 2008-02-01
Kipi-plugins from KDE3 branch : Batch Process : restore metadata Kipi-plugins from KDE3 branch : Batch Process : restore metadata
properlly with JPEG file during conversion. properlly with JPEG file during conversion.
Pawel, This patch sound like properlly under KDE3.5, but not Pawel, This patch sound like properlly under KDE3.5, but not
under KDE 3.4. I suspect a bug in KProcess or something like under KDE 3.4. I suspect a bug in TDEProcess or something like
that. that.
BUG: 152210 BUG: 152210
@ -2148,7 +2148,7 @@ V 0.1.5-rc2 - 2008-02-01
kipi-plugins/batchprocessimages/convertimagesdialog.cpp, kipi-plugins/batchprocessimages/convertimagesdialog.cpp,
kipi-plugins/batchprocessimages/convertimagesdialog.h, kipi-plugins/batchprocessimages/convertimagesdialog.h,
kipi-plugins/batchprocessimages/imagepreview.cpp: kipi-plugins/batchprocessimages/imagepreview.cpp:
Do not test is KProcess is out imediatly. Do not test is TDEProcess is out imediatly.
BUG: 151578 BUG: 151578
2007-11-19 13:40 cgilles 2007-11-19 13:40 cgilles
@ -2801,7 +2801,7 @@ V 0.1.5-rc1 - 2007-12-29
Kipi-plugins from KDE3 branch : Batch Process : restore metadata Kipi-plugins from KDE3 branch : Batch Process : restore metadata
properlly with JPEG file during conversion. properlly with JPEG file during conversion.
Pawel, This patch sound like properlly under KDE3.5, but not Pawel, This patch sound like properlly under KDE3.5, but not
under KDE 3.4. I suspect a bug in KProcess or something like under KDE 3.4. I suspect a bug in TDEProcess or something like
that. that.
BUG: 152210 BUG: 152210
@ -2818,7 +2818,7 @@ V 0.1.5-rc1 - 2007-12-29
kipi-plugins/batchprocessimages/convertimagesdialog.cpp, kipi-plugins/batchprocessimages/convertimagesdialog.cpp,
kipi-plugins/batchprocessimages/convertimagesdialog.h, kipi-plugins/batchprocessimages/convertimagesdialog.h,
kipi-plugins/batchprocessimages/imagepreview.cpp: kipi-plugins/batchprocessimages/imagepreview.cpp:
Do not test is KProcess is out imediatly. Do not test is TDEProcess is out imediatly.
BUG: 151578 BUG: 151578
2007-11-19 13:40 cgilles 2007-11-19 13:40 cgilles
@ -3513,7 +3513,7 @@ V 0.1.5-beta1 - 2007-10-07
kipi-plugins/batchprocessimages/imagepreview.cpp: kipi-plugins/batchprocessimages/imagepreview.cpp:
kipi-plugins from KDE3 branch : Bugfix with ImageMagick kipi-plugins from KDE3 branch : Bugfix with ImageMagick
background process creation : always checking if process background process creation : always checking if process
(KProcess) is ended properlly (no ImageMagick crash for ex.) (TDEProcess) is ended properlly (no ImageMagick crash for ex.)
2007-09-25 11:00 cgilles 2007-09-25 11:00 cgilles
@ -10317,7 +10317,7 @@ v 0.1.3-beta1 - 2006-11-29
rawconverter/singledialog.cpp: rawconverter/singledialog.cpp:
kipi-plugins from trunk : Raw Converter : full cancelable (when kipi-plugins from trunk : Raw Converter : full cancelable (when
you want) dcraw instance during RAW image data decoding. you want) dcraw instance during RAW image data decoding.
The code use now a KProcess instance instead a simple The code use now a TDEProcess instance instead a simple
non-cancelable popen() call. The implementation is inspired from non-cancelable popen() call. The implementation is inspired from
digiKam RAW image loader digiKam RAW image loader
CCBUGS: 107905, 128394 CCBUGS: 107905, 128394
@ -10815,7 +10815,7 @@ v 0.1.3-beta1 - 2006-11-29
This commit remove libmagick++ depency to process non-jpeg files This commit remove libmagick++ depency to process non-jpeg files
transforms. The plugin use an ImageMagick runtime dependency transforms. The plugin use an ImageMagick runtime dependency
instead (convert tool run by a KProcess instance). instead (convert tool run by a TDEProcess instance).
CCMAIL: kde-imaging@kde.org CCMAIL: kde-imaging@kde.org

@ -590,21 +590,21 @@ bool BatchProcessImagesDialog::startProcess(void)
} }
m_commandLine = TQString(); m_commandLine = TQString();
m_ProcessusProc = new KProcess; m_ProcessusProc = new TDEProcess;
m_commandLine.append(makeProcess(m_ProcessusProc, item, targetAlbum)); m_commandLine.append(makeProcess(m_ProcessusProc, item, targetAlbum));
item->changeOutputMess(m_commandLine + "\n\n"); item->changeOutputMess(m_commandLine + "\n\n");
connect(m_ProcessusProc, TQT_SIGNAL(processExited(KProcess *)), connect(m_ProcessusProc, TQT_SIGNAL(processExited(TDEProcess *)),
this, TQT_SLOT(slotProcessDone(KProcess*))); this, TQT_SLOT(slotProcessDone(TDEProcess*)));
connect(m_ProcessusProc, TQT_SIGNAL(receivedStdout(KProcess *, char*, int)), connect(m_ProcessusProc, TQT_SIGNAL(receivedStdout(TDEProcess *, char*, int)),
this, TQT_SLOT(slotReadStd(KProcess*, char*, int))); this, TQT_SLOT(slotReadStd(TDEProcess*, char*, int)));
connect(m_ProcessusProc, TQT_SIGNAL(receivedStderr(KProcess *, char*, int)), connect(m_ProcessusProc, TQT_SIGNAL(receivedStderr(TDEProcess *, char*, int)),
this, TQT_SLOT(slotReadStd(KProcess*, char*, int))); this, TQT_SLOT(slotReadStd(TDEProcess*, char*, int)));
bool result = m_ProcessusProc->start(KProcess::NotifyOnExit, KProcess::All); bool result = m_ProcessusProc->start(TDEProcess::NotifyOnExit, TDEProcess::All);
if(!result) if(!result)
{ {
KMessageBox::error(this, i18n("Cannot start 'convert' program from 'ImageMagick' package;\n" KMessageBox::error(this, i18n("Cannot start 'convert' program from 'ImageMagick' package;\n"
@ -615,13 +615,13 @@ bool BatchProcessImagesDialog::startProcess(void)
return true; return true;
} }
void BatchProcessImagesDialog::slotReadStd(KProcess* /*proc*/, char *buffer, int buflen) void BatchProcessImagesDialog::slotReadStd(TDEProcess* /*proc*/, char *buffer, int buflen)
{ {
BatchProcessImagesItem *item = static_cast<BatchProcessImagesItem*>( m_listFile2Process_iterator->current() ); BatchProcessImagesItem *item = static_cast<BatchProcessImagesItem*>( m_listFile2Process_iterator->current() );
item->changeOutputMess( TQString::fromLocal8Bit(buffer, buflen) ); item->changeOutputMess( TQString::fromLocal8Bit(buffer, buflen) );
} }
void BatchProcessImagesDialog::slotProcessDone(KProcess* proc) void BatchProcessImagesDialog::slotProcessDone(TDEProcess* proc)
{ {
if ( m_convertStatus == PROCESS_DONE ) if ( m_convertStatus == PROCESS_DONE )
{ {
@ -802,23 +802,23 @@ void BatchProcessImagesDialog::slotPreview(void)
this, TQT_SLOT(slotPreviewStop())); this, TQT_SLOT(slotPreviewStop()));
m_previewOutput = ""; m_previewOutput = "";
m_PreviewProc = new KProcess; m_PreviewProc = new TDEProcess;
m_previewOutput.append(makeProcess(m_PreviewProc, item, TQString(), true)); m_previewOutput.append(makeProcess(m_PreviewProc, item, TQString(), true));
*m_PreviewProc << m_tmpFolder + "/" + TQString::number(getpid()) + "preview.PNG"; *m_PreviewProc << m_tmpFolder + "/" + TQString::number(getpid()) + "preview.PNG";
m_previewOutput.append( " " + m_tmpFolder + "/" + TQString::number(getpid()) + "preview.PNG\n\n"); m_previewOutput.append( " " + m_tmpFolder + "/" + TQString::number(getpid()) + "preview.PNG\n\n");
connect(m_PreviewProc, TQT_SIGNAL(processExited(KProcess *)), connect(m_PreviewProc, TQT_SIGNAL(processExited(TDEProcess *)),
this, TQT_SLOT(slotPreviewProcessDone(KProcess*))); this, TQT_SLOT(slotPreviewProcessDone(TDEProcess*)));
connect(m_PreviewProc, TQT_SIGNAL(receivedStdout(KProcess *, char*, int)), connect(m_PreviewProc, TQT_SIGNAL(receivedStdout(TDEProcess *, char*, int)),
this, TQT_SLOT(slotPreviewReadStd(KProcess*, char*, int))); this, TQT_SLOT(slotPreviewReadStd(TDEProcess*, char*, int)));
connect(m_PreviewProc, TQT_SIGNAL(receivedStderr(KProcess *, char*, int)), connect(m_PreviewProc, TQT_SIGNAL(receivedStderr(TDEProcess *, char*, int)),
this, TQT_SLOT(slotPreviewReadStd(KProcess*, char*, int))); this, TQT_SLOT(slotPreviewReadStd(TDEProcess*, char*, int)));
bool result = m_PreviewProc->start(KProcess::NotifyOnExit, KProcess::All); bool result = m_PreviewProc->start(TDEProcess::NotifyOnExit, TDEProcess::All);
if(!result) if(!result)
{ {
KMessageBox::error(this, i18n("Cannot start 'convert' program from 'ImageMagick' package;\n" KMessageBox::error(this, i18n("Cannot start 'convert' program from 'ImageMagick' package;\n"
@ -828,12 +828,12 @@ void BatchProcessImagesDialog::slotPreview(void)
} }
} }
void BatchProcessImagesDialog::slotPreviewReadStd(KProcess* /*proc*/, char *buffer, int buflen) void BatchProcessImagesDialog::slotPreviewReadStd(TDEProcess* /*proc*/, char *buffer, int buflen)
{ {
m_previewOutput.append( TQString::fromLocal8Bit(buffer, buflen) ); m_previewOutput.append( TQString::fromLocal8Bit(buffer, buflen) );
} }
void BatchProcessImagesDialog::slotPreviewProcessDone(KProcess* proc) void BatchProcessImagesDialog::slotPreviewProcessDone(TDEProcess* proc)
{ {
if (!m_PreviewProc->normalExit()) if (!m_PreviewProc->normalExit())
{ {
@ -1078,7 +1078,7 @@ TQString BatchProcessImagesDialog::RenameTargetImageFile(TQFileInfo *fi)
return (NewDestUrl.path()); return (NewDestUrl.path());
} }
TQString BatchProcessImagesDialog::extractArguments(KProcess *proc) TQString BatchProcessImagesDialog::extractArguments(TDEProcess *proc)
{ {
TQString retArguments; TQString retArguments;
TQValueList<TQCString> argumentsList = proc->args(); TQValueList<TQCString> argumentsList = proc->args();

@ -64,7 +64,7 @@ class TQListViewItemIterator;
class TQListViewItem; class TQListViewItem;
class TQGroupBox; class TQGroupBox;
class KProcess; class TDEProcess;
class KConfig; class KConfig;
class KProgress; class KProgress;
class KURL; class KURL;
@ -98,12 +98,12 @@ private slots:
void slotOk( void ); void slotOk( void );
void slotProcessStart(void); void slotProcessStart(void);
void slotProcessDone(KProcess* proc); void slotProcessDone(TDEProcess* proc);
void slotReadStd(KProcess* proc, char *buffer, int buflen); void slotReadStd(TDEProcess* proc, char *buffer, int buflen);
void slotPreview(void); void slotPreview(void);
void slotPreviewProcessDone(KProcess* proc); void slotPreviewProcessDone(TDEProcess* proc);
void slotPreviewReadStd(KProcess* proc, char *buffer, int buflen); void slotPreviewReadStd(TDEProcess* proc, char *buffer, int buflen);
void slotPreviewStop( void ); void slotPreviewStop( void );
void slotListDoubleClicked(TQListViewItem *itemClicked); void slotListDoubleClicked(TQListViewItem *itemClicked);
@ -161,8 +161,8 @@ private slots:
int m_progressStatus; int m_progressStatus;
int m_nbItem; int m_nbItem;
KProcess *m_ProcessusProc; TDEProcess *m_ProcessusProc;
KProcess *m_PreviewProc; TDEProcess *m_PreviewProc;
TQListViewItemIterator *m_listFile2Process_iterator; TQListViewItemIterator *m_listFile2Process_iterator;
@ -192,10 +192,10 @@ private slots:
TQString RenameTargetImageFile(TQFileInfo *fi); TQString RenameTargetImageFile(TQFileInfo *fi);
// Extract the arguments from a KProcess an merge that in a TQString. Used by makeProcess for to // Extract the arguments from a TDEProcess an merge that in a TQString. Used by makeProcess for to
// show the command line arguments (debugging). // show the command line arguments (debugging).
TQString extractArguments(KProcess *proc); TQString extractArguments(TDEProcess *proc);
// -------------------------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------------------------
// Standards virtuals fonctions for re-implementation. // Standards virtuals fonctions for re-implementation.
@ -220,7 +220,7 @@ private slots:
// Called for to contruct the ImageMagick command line used for to process or preview the image traitements. // Called for to contruct the ImageMagick command line used for to process or preview the image traitements.
// If 'albumDest' = 0L ==> preview process. // If 'albumDest' = 0L ==> preview process.
virtual TQString makeProcess(KProcess* /*proc*/, BatchProcessImagesItem */*item*/, virtual TQString makeProcess(TDEProcess* /*proc*/, BatchProcessImagesItem */*item*/,
const TQString& /*albumDest*/ = TQString(), const TQString& /*albumDest*/ = TQString(),
bool /*previewMode*/ = false) bool /*previewMode*/ = false)
{ return TQString(); }; { return TQString(); };

@ -248,7 +248,7 @@ void BorderImagesDialog::saveSettings(void)
delete m_config; delete m_config;
} }
TQString BorderImagesDialog::makeProcess(KProcess* proc, BatchProcessImagesItem *item, TQString BorderImagesDialog::makeProcess(TDEProcess* proc, BatchProcessImagesItem *item,
const TQString& albumDest, bool previewMode) const TQString& albumDest, bool previewMode)
{ {
*proc << "convert"; *proc << "convert";

@ -64,7 +64,7 @@ Q_OBJECT
int m_bevelWidth; int m_bevelWidth;
TQColor m_frameColor; TQColor m_frameColor;
TQString makeProcess(KProcess* proc, BatchProcessImagesItem *item, TQString makeProcess(TDEProcess* proc, BatchProcessImagesItem *item,
const TQString& albumDest, bool previewMode); const TQString& albumDest, bool previewMode);
void readSettings(void); void readSettings(void);

@ -237,7 +237,7 @@ void ColorImagesDialog::saveSettings(void)
delete m_config; delete m_config;
} }
TQString ColorImagesDialog::makeProcess(KProcess* proc, BatchProcessImagesItem *item, TQString ColorImagesDialog::makeProcess(TDEProcess* proc, BatchProcessImagesItem *item,
const TQString& albumDest, bool previewMode) const TQString& albumDest, bool previewMode)
{ {
*proc << "convert"; *proc << "convert";

@ -57,7 +57,7 @@ Q_OBJECT
int m_segmentCluster; int m_segmentCluster;
int m_segmentSmooth; int m_segmentSmooth;
TQString makeProcess(KProcess* proc, BatchProcessImagesItem *item, TQString makeProcess(TDEProcess* proc, BatchProcessImagesItem *item,
const TQString& albumDest, bool previewMode); const TQString& albumDest, bool previewMode);
void readSettings(void); void readSettings(void);

@ -243,7 +243,7 @@ void ConvertImagesDialog::saveSettings(void)
delete m_config; delete m_config;
} }
TQString ConvertImagesDialog::makeProcess(KProcess* proc, BatchProcessImagesItem *item, TQString ConvertImagesDialog::makeProcess(TDEProcess* proc, BatchProcessImagesItem *item,
const TQString& albumDest, bool previewMode) const TQString& albumDest, bool previewMode)
{ {
*proc << "convert"; *proc << "convert";

@ -57,7 +57,7 @@ Q_OBJECT
TQString m_TIFFCompressionAlgo; TQString m_TIFFCompressionAlgo;
TQString m_TGACompressionAlgo; TQString m_TGACompressionAlgo;
TQString makeProcess(KProcess* proc, BatchProcessImagesItem *item, TQString makeProcess(TDEProcess* proc, BatchProcessImagesItem *item,
const TQString& albumDest, bool previewMode); const TQString& albumDest, bool previewMode);
void processDone(); void processDone();

@ -322,7 +322,7 @@ void EffectImagesDialog::saveSettings(void)
delete m_config; delete m_config;
} }
TQString EffectImagesDialog::makeProcess(KProcess* proc, BatchProcessImagesItem *item, TQString EffectImagesDialog::makeProcess(TDEProcess* proc, BatchProcessImagesItem *item,
const TQString& albumDest, bool previewMode) const TQString& albumDest, bool previewMode)
{ {
*proc << "convert"; *proc << "convert";

@ -68,7 +68,7 @@ Q_OBJECT
int m_waveAmplitude; int m_waveAmplitude;
int m_waveLength; int m_waveLength;
TQString makeProcess(KProcess* proc, BatchProcessImagesItem *item, TQString makeProcess(TDEProcess* proc, BatchProcessImagesItem *item,
const TQString& albumDest, bool previewMode); const TQString& albumDest, bool previewMode);
void readSettings(void); void readSettings(void);

@ -269,7 +269,7 @@ void FilterImagesDialog::saveSettings(void)
delete m_config; delete m_config;
} }
TQString FilterImagesDialog::makeProcess(KProcess* proc, BatchProcessImagesItem *item, TQString FilterImagesDialog::makeProcess(TDEProcess* proc, BatchProcessImagesItem *item,
const TQString& albumDest, bool previewMode) const TQString& albumDest, bool previewMode)
{ {
*proc << "convert"; *proc << "convert";

@ -63,7 +63,7 @@ Q_OBJECT
int m_unsharpenPercent; int m_unsharpenPercent;
int m_unsharpenThreshold; int m_unsharpenThreshold;
TQString makeProcess(KProcess* proc, BatchProcessImagesItem *item, TQString makeProcess(TDEProcess* proc, BatchProcessImagesItem *item,
const TQString& albumDest, bool previewMode); const TQString& albumDest, bool previewMode);
void readSettings(void); void readSettings(void);

@ -205,9 +205,9 @@ PixmapView::PixmapView(bool cropAction, TQWidget *parent, const char *name)
horizontalScrollBar()->setPageStep( 1 ); horizontalScrollBar()->setPageStep( 1 );
verticalScrollBar()->setLineStep( 1 ); verticalScrollBar()->setLineStep( 1 );
verticalScrollBar()->setPageStep( 1 ); verticalScrollBar()->setPageStep( 1 );
KGlobal::dirs()->addResourceType("kipi_handcursor", KGlobal::dirs()->kde_default("data") TDEGlobal::dirs()->addResourceType("kipi_handcursor", TDEGlobal::dirs()->kde_default("data")
+ "kipi/data"); + "kipi/data");
m_handCursor = new TQCursor( KGlobal::dirs()->findResourceDir("kipi_handcursor", "handcursor.png") m_handCursor = new TQCursor( TDEGlobal::dirs()->findResourceDir("kipi_handcursor", "handcursor.png")
+ "handcursor.png" ); + "handcursor.png" );
} }
@ -253,7 +253,7 @@ void PixmapView::PreviewCal(const TQString &ImagePath, const TQString &/*tmpPath
p.end(); p.end();
m_previewOutput ="convert"; m_previewOutput ="convert";
m_PreviewProc = new KProcess; m_PreviewProc = new TDEProcess;
*m_PreviewProc << "convert"; *m_PreviewProc << "convert";
*m_PreviewProc << "-verbose"; *m_PreviewProc << "-verbose";
@ -267,16 +267,16 @@ void PixmapView::PreviewCal(const TQString &ImagePath, const TQString &/*tmpPath
*m_PreviewProc << m_previewFileName; *m_PreviewProc << m_previewFileName;
m_previewOutput.append( " -verbose " + ImagePath + " " + m_previewFileName + "\n\n"); m_previewOutput.append( " -verbose " + ImagePath + " " + m_previewFileName + "\n\n");
connect(m_PreviewProc, TQT_SIGNAL(processExited(KProcess *)), connect(m_PreviewProc, TQT_SIGNAL(processExited(TDEProcess *)),
this, TQT_SLOT(PreviewProcessDone(KProcess*))); this, TQT_SLOT(PreviewProcessDone(TDEProcess*)));
connect(m_PreviewProc, TQT_SIGNAL(receivedStdout(KProcess *, char*, int)), connect(m_PreviewProc, TQT_SIGNAL(receivedStdout(TDEProcess *, char*, int)),
this, TQT_SLOT(slotPreviewReadStd(KProcess*, char*, int))); this, TQT_SLOT(slotPreviewReadStd(TDEProcess*, char*, int)));
connect(m_PreviewProc, TQT_SIGNAL(receivedStderr(KProcess *, char*, int)), connect(m_PreviewProc, TQT_SIGNAL(receivedStderr(TDEProcess *, char*, int)),
this, TQT_SLOT(slotPreviewReadStd(KProcess*, char*, int))); this, TQT_SLOT(slotPreviewReadStd(TDEProcess*, char*, int)));
bool result = m_PreviewProc->start(KProcess::NotifyOnExit, KProcess::All); bool result = m_PreviewProc->start(TDEProcess::NotifyOnExit, TDEProcess::All);
if(!result) if(!result)
{ {
KMessageBox::error(this, i18n("Cannot start 'convert' program from 'ImageMagick' package;\n" KMessageBox::error(this, i18n("Cannot start 'convert' program from 'ImageMagick' package;\n"
@ -285,12 +285,12 @@ void PixmapView::PreviewCal(const TQString &ImagePath, const TQString &/*tmpPath
} }
} }
void PixmapView::slotPreviewReadStd(KProcess* /*proc*/, char *buffer, int buflen) void PixmapView::slotPreviewReadStd(TDEProcess* /*proc*/, char *buffer, int buflen)
{ {
m_previewOutput.append( TQString::fromLocal8Bit(buffer, buflen) ); m_previewOutput.append( TQString::fromLocal8Bit(buffer, buflen) );
} }
void PixmapView::PreviewProcessDone(KProcess* proc) void PixmapView::PreviewProcessDone(TDEProcess* proc)
{ {
int ValRet = proc->exitStatus(); int ValRet = proc->exitStatus();
kdDebug (51000) << "Convert exit (" << ValRet << ")" << endl; kdDebug (51000) << "Convert exit (" << ValRet << ")" << endl;

@ -43,7 +43,7 @@ class TQLCDNumber;
class TQSlider; class TQSlider;
class TQPushButton; class TQPushButton;
class KProcess; class TDEProcess;
namespace KIPIBatchProcessImagesPlugin namespace KIPIBatchProcessImagesPlugin
{ {
@ -65,8 +65,8 @@ public:
private slots: private slots:
void slotPreviewReadStd(KProcess* proc, char *buffer, int buflen); void slotPreviewReadStd(TDEProcess* proc, char *buffer, int buflen);
void PreviewProcessDone(KProcess* proc); void PreviewProcessDone(TDEProcess* proc);
void contentsWheelEvent( TQWheelEvent * e ); void contentsWheelEvent( TQWheelEvent * e );
void contentsMousePressEvent ( TQMouseEvent * e ); void contentsMousePressEvent ( TQMouseEvent * e );
void contentsMouseReleaseEvent ( TQMouseEvent * e ); void contentsMouseReleaseEvent ( TQMouseEvent * e );
@ -87,7 +87,7 @@ protected:
int m_xpos; int m_xpos;
int m_ypos; int m_ypos;
KProcess *m_PreviewProc; TDEProcess *m_PreviewProc;
TQString m_previewOutput; TQString m_previewOutput;
TQString m_previewFileName; TQString m_previewFileName;

@ -174,7 +174,7 @@ void RecompressImagesDialog::saveSettings(void)
delete m_config; delete m_config;
} }
TQString RecompressImagesDialog::makeProcess(KProcess* proc, BatchProcessImagesItem *item, TQString RecompressImagesDialog::makeProcess(TDEProcess* proc, BatchProcessImagesItem *item,
const TQString& albumDest, bool previewMode) const TQString& albumDest, bool previewMode)
{ {
*proc << "convert"; *proc << "convert";

@ -56,7 +56,7 @@ Q_OBJECT
TQString m_TIFFCompressionAlgo; TQString m_TIFFCompressionAlgo;
TQString m_TGACompressionAlgo; TQString m_TGACompressionAlgo;
TQString makeProcess(KProcess* proc, BatchProcessImagesItem *item, TQString makeProcess(TDEProcess* proc, BatchProcessImagesItem *item,
const TQString& albumDest, bool previewMode); const TQString& albumDest, bool previewMode);
void readSettings(void); void readSettings(void);

@ -294,7 +294,7 @@ void ResizeImagesDialog::saveSettings(void)
delete m_config; delete m_config;
} }
TQString ResizeImagesDialog::makeProcess(KProcess* proc, BatchProcessImagesItem *item, TQString ResizeImagesDialog::makeProcess(TDEProcess* proc, BatchProcessImagesItem *item,
const TQString& albumDest, bool ) const TQString& albumDest, bool )
{ {
TQImage img; TQImage img;

@ -73,7 +73,7 @@ Q_OBJECT
int m_fixedHeight; int m_fixedHeight;
int m_quality; int m_quality;
TQString makeProcess(KProcess* proc, BatchProcessImagesItem *item, TQString makeProcess(TDEProcess* proc, BatchProcessImagesItem *item,
const TQString& albumDest, bool previewMode); const TQString& albumDest, bool previewMode);
void readSettings(void); void readSettings(void);

@ -99,8 +99,8 @@ void CalFormatter::init(int year, const TQString & ohFile, const TQString & fhFi
calendar = new KCal::CalendarLocal("UTC"); calendar = new KCal::CalendarLocal("UTC");
if (calendar->load(ohFile)) { if (calendar->load(ohFile)) {
TQDate dtFirst, dtLast; TQDate dtFirst, dtLast;
KGlobal::locale()->calendar()->setYMD(dtFirst, year_, 1, 1); TDEGlobal::locale()->calendar()->setYMD(dtFirst, year_, 1, 1);
KGlobal::locale()->calendar()->setYMD(dtLast, year_ + 1, 1, 1); TDEGlobal::locale()->calendar()->setYMD(dtLast, year_ + 1, 1, 1);
dtLast = dtLast.addDays(-1); dtLast = dtLast.addDays(-1);
KCal::Event::List list = calendar->rawEvents(dtFirst, dtLast); KCal::Event::List list = calendar->rawEvents(dtFirst, dtLast);
@ -155,8 +155,8 @@ void CalFormatter::init(int year, const TQString & ohFile, const TQString & fhFi
bool CalFormatter::isPrayDay(int month, int day) bool CalFormatter::isPrayDay(int month, int day)
{ {
TQDate dt; TQDate dt;
KGlobal::locale()->calendar()->setYMD(dt, year_, month, day); TDEGlobal::locale()->calendar()->setYMD(dt, year_, month, day);
return (dt.dayOfWeek() == KGlobal::locale()->calendar()->weekDayOfPray()); return (dt.dayOfWeek() == TDEGlobal::locale()->calendar()->weekDayOfPray());
} }
/*! /*!
@ -165,7 +165,7 @@ bool CalFormatter::isPrayDay(int month, int day)
bool KIPICalendarPlugin::CalFormatter::isSpecial(int month, int day) bool KIPICalendarPlugin::CalFormatter::isSpecial(int month, int day)
{ {
TQDate dt; TQDate dt;
KGlobal::locale()->calendar()->setYMD(dt, year_, month, day); TDEGlobal::locale()->calendar()->setYMD(dt, year_, month, day);
return (isPrayDay(month,day) || d->oh.contains(dt) || d->fh.contains(dt)); return (isPrayDay(month,day) || d->oh.contains(dt) || d->fh.contains(dt));
} }
@ -177,7 +177,7 @@ bool KIPICalendarPlugin::CalFormatter::isSpecial(int month, int day)
TQColor KIPICalendarPlugin::CalFormatter::getDayColor(int month, int day) TQColor KIPICalendarPlugin::CalFormatter::getDayColor(int month, int day)
{ {
TQDate dt; TQDate dt;
KGlobal::locale()->calendar()->setYMD(dt, year_, month, day); TDEGlobal::locale()->calendar()->setYMD(dt, year_, month, day);
if (isPrayDay(month, day)) if (isPrayDay(month, day))
return TQt::red; return TQt::red;
@ -199,7 +199,7 @@ TQColor KIPICalendarPlugin::CalFormatter::getDayColor(int month, int day)
TQString KIPICalendarPlugin::CalFormatter::getDayDescr(int month, int day) TQString KIPICalendarPlugin::CalFormatter::getDayDescr(int month, int day)
{ {
TQDate dt; TQDate dt;
KGlobal::locale()->calendar()->setYMD(dt, year_, month, day); TDEGlobal::locale()->calendar()->setYMD(dt, year_, month, day);
TQString ret; TQString ret;

@ -88,19 +88,19 @@ void CalPainter::paint(bool useDeviceMetrics)
// -------------------------------------------------- // --------------------------------------------------
int days[42]; int days[42];
int startDayOffset = KGlobal::locale()->weekStartDay(); int startDayOffset = TDEGlobal::locale()->weekStartDay();
for (int i=0; i<42; i++) for (int i=0; i<42; i++)
days[i] = -1; days[i] = -1;
TQDate d; TQDate d;
KGlobal::locale()->calendar()->setYMD(d, year_, month_, 1); TDEGlobal::locale()->calendar()->setYMD(d, year_, month_, 1);
int s = d.dayOfWeek(); int s = d.dayOfWeek();
if (s+7-startDayOffset >= 7) if (s+7-startDayOffset >= 7)
s=s-7; s=s-7;
for (int i=s; i<(s+KGlobal::locale()->calendar()->daysInMonth(d)); i++) { for (int i=s; i<(s+TDEGlobal::locale()->calendar()->daysInMonth(d)); i++) {
days[i + (7-startDayOffset)] = i-s+1; days[i + (7-startDayOffset)] = i-s+1;
} }
@ -217,10 +217,10 @@ void CalPainter::paint(bool useDeviceMetrics)
TQString::number(year_)); TQString::number(year_));
#if KDE_IS_VERSION(3,2,0) #if KDE_IS_VERSION(3,2,0)
painter->drawText(rCalHeader, TQt::AlignRight|TQt::AlignVCenter, painter->drawText(rCalHeader, TQt::AlignRight|TQt::AlignVCenter,
KGlobal::locale()->calendar()->monthName(month_, year_)); TDEGlobal::locale()->calendar()->monthName(month_, year_));
#else #else
painter->drawText(rCalHeader, TQt::AlignRight|TQt::AlignVCenter, painter->drawText(rCalHeader, TQt::AlignRight|TQt::AlignVCenter,
KGlobal::locale()->monthName(month_)); TDEGlobal::locale()->monthName(month_));
#endif #endif
painter->restore(); painter->restore();
@ -251,10 +251,10 @@ void CalPainter::paint(bool useDeviceMetrics)
rsmall.setHeight(r.height() - 2); rsmall.setHeight(r.height() - 2);
#if KDE_IS_VERSION(3,2,0) #if KDE_IS_VERSION(3,2,0)
painter->drawText(rsmall, TQt::AlignRight|TQt::AlignBottom, painter->drawText(rsmall, TQt::AlignRight|TQt::AlignBottom,
KGlobal::locale()->calendar()->weekDayName(dayname, true)); TDEGlobal::locale()->calendar()->weekDayName(dayname, true));
#else #else
painter->drawText(rsmall, TQt::AlignRight|TQt::AlignBottom, painter->drawText(rsmall, TQt::AlignRight|TQt::AlignBottom,
KGlobal::locale()->weekDayName(dayname, true)); TDEGlobal::locale()->weekDayName(dayname, true));
#endif #endif
} }
@ -315,19 +315,19 @@ CalBlockPainter::CalBlockPainter(TQObject *parent, int year, int month,
// -------------------------------------------------- // --------------------------------------------------
int days[42]; int days[42];
int startDayOffset = KGlobal::locale()->weekStartDay(); int startDayOffset = TDEGlobal::locale()->weekStartDay();
for (int i=0; i<42; i++) for (int i=0; i<42; i++)
days[i] = -1; days[i] = -1;
TQDate d; TQDate d;
KGlobal::locale()->calendar()->setYMD(d, year, month, 1); TDEGlobal::locale()->calendar()->setYMD(d, year, month, 1);
int s = d.dayOfWeek(); int s = d.dayOfWeek();
if (s+7-startDayOffset >= 7) if (s+7-startDayOffset >= 7)
s=s-7; s=s-7;
for (int i=s; i<(s+KGlobal::locale()->calendar()->daysInMonth(d)); i++) { for (int i=s; i<(s+TDEGlobal::locale()->calendar()->daysInMonth(d)); i++) {
days[i+(7-startDayOffset)] = i-s+1; days[i+(7-startDayOffset)] = i-s+1;
} }
@ -443,10 +443,10 @@ CalBlockPainter::CalBlockPainter(TQObject *parent, int year, int month,
TQString::number(year)); TQString::number(year));
#if KDE_IS_VERSION(3,2,0) #if KDE_IS_VERSION(3,2,0)
painter->drawText(rCalHeader, TQt::AlignRight|TQt::AlignVCenter, painter->drawText(rCalHeader, TQt::AlignRight|TQt::AlignVCenter,
KGlobal::locale()->calendar()->monthName(month, year)); TDEGlobal::locale()->calendar()->monthName(month, year));
#else #else
painter->drawText(rCalHeader, TQt::AlignRight|TQt::AlignVCenter, painter->drawText(rCalHeader, TQt::AlignRight|TQt::AlignVCenter,
KGlobal::locale()->monthName(month)); TDEGlobal::locale()->monthName(month));
#endif #endif
painter->restore(); painter->restore();
@ -477,10 +477,10 @@ CalBlockPainter::CalBlockPainter(TQObject *parent, int year, int month,
rsmall.setHeight(r.height() - 2); rsmall.setHeight(r.height() - 2);
#if KDE_IS_VERSION(3,2,0) #if KDE_IS_VERSION(3,2,0)
painter->drawText(rsmall, TQt::AlignRight|TQt::AlignBottom, painter->drawText(rsmall, TQt::AlignRight|TQt::AlignBottom,
KGlobal::locale()->calendar()->weekDayName(dayname, true)); TDEGlobal::locale()->calendar()->weekDayName(dayname, true));
#else #else
painter->drawText(rsmall, TQt::AlignRight|TQt::AlignBottom, painter->drawText(rsmall, TQt::AlignRight|TQt::AlignBottom,
KGlobal::locale()->weekDayName(dayname, true)); TDEGlobal::locale()->weekDayName(dayname, true));
#endif #endif
} }

@ -71,10 +71,10 @@ void CalSelect::setupView( KIPI::Interface* interface )
yearBox->layout()->addItem(new TQSpacerItem(5,5, yearBox->layout()->addItem(new TQSpacerItem(5,5,
TQSizePolicy::Expanding, TQSizePolicy::Expanding,
TQSizePolicy::Minimum)); TQSizePolicy::Minimum));
yearSpin_ = new TQSpinBox(KGlobal::locale()->calendar()->minValidYear(), yearSpin_ = new TQSpinBox(TDEGlobal::locale()->calendar()->minValidYear(),
KGlobal::locale()->calendar()->maxValidYear(), TDEGlobal::locale()->calendar()->maxValidYear(),
1,yearBox); 1,yearBox);
yearSpin_->setValue(KGlobal::locale()->calendar()->year(TQDate::currentDate())); yearSpin_->setValue(TDEGlobal::locale()->calendar()->year(TQDate::currentDate()));
slotYearChanged(yearSpin_->value()); slotYearChanged(yearSpin_->value());
connect(yearSpin_, TQT_SIGNAL(valueChanged(int)), connect(yearSpin_, TQT_SIGNAL(valueChanged(int)),
@ -98,8 +98,8 @@ void CalSelect::setupView( KIPI::Interface* interface )
urlList = images.images(); urlList = images.images();
TQDate d; TQDate d;
KGlobal::locale()->calendar()->setYMD(d, yearSpin_->value(), 1, 1); TDEGlobal::locale()->calendar()->setYMD(d, yearSpin_->value(), 1, 1);
unsigned int months = KGlobal::locale()->calendar()->monthsInYear(d); unsigned int months = TDEGlobal::locale()->calendar()->monthsInYear(d);
// span the monthWidgets over 2 rows. inRow should usually be 6 or 7 (for 12 or 13 months) // span the monthWidgets over 2 rows. inRow should usually be 6 or 7 (for 12 or 13 months)
int inRow = (months / 2) + ((months % 2) != 0); int inRow = (months / 2) + ((months % 2) != 0);
MonthWidget *w; MonthWidget *w;
@ -135,20 +135,20 @@ void CalSelect::slotYearChanged(int year)
{ {
int i, months; int i, months;
TQDate d, oldD; TQDate d, oldD;
KGlobal::locale()->calendar()->setYMD(d, year, 1, 1); TDEGlobal::locale()->calendar()->setYMD(d, year, 1, 1);
KGlobal::locale()->calendar()->setYMD(oldD, CalSettings::instance()->getYear(), 1, 1); TDEGlobal::locale()->calendar()->setYMD(oldD, CalSettings::instance()->getYear(), 1, 1);
months = KGlobal::locale()->calendar()->monthsInYear(d); months = TDEGlobal::locale()->calendar()->monthsInYear(d);
if ((KGlobal::locale()->calendar()->monthsInYear(oldD) != months) && !mwVector_->isEmpty()) if ((TDEGlobal::locale()->calendar()->monthsInYear(oldD) != months) && !mwVector_->isEmpty())
{ {
// hide the last months that are not present on the current year // hide the last months that are not present on the current year
for (i=months; (i<KGlobal::locale()->calendar()->monthsInYear(oldD)) && (i<(int)mwVector_->count()); i++) for (i=months; (i<TDEGlobal::locale()->calendar()->monthsInYear(oldD)) && (i<(int)mwVector_->count()); i++)
mwVector_->at(i)->hide(); mwVector_->at(i)->hide();
// span the monthWidgets over 2 rows. inRow should usually be 6 or 7 (for 12 or 13 months) // span the monthWidgets over 2 rows. inRow should usually be 6 or 7 (for 12 or 13 months)
int inRow = (months / 2) + ((months % 2) != 0); int inRow = (months / 2) + ((months % 2) != 0);
// remove all the monthWidgets, then readd the needed ones // remove all the monthWidgets, then readd the needed ones
for (i=0; i<KGlobal::locale()->calendar()->monthsInYear(oldD); i++) { for (i=0; i<TDEGlobal::locale()->calendar()->monthsInYear(oldD); i++) {
monthBoxLayout_->remove(mwVector_->at(i)); monthBoxLayout_->remove(mwVector_->at(i));
} }
for (i=0; (i<months) && (i<(int)mwVector_->count()); i++) { for (i=0; (i<months) && (i<(int)mwVector_->count()); i++) {

@ -37,7 +37,7 @@ CalSettings* CalSettings::instance_ = 0;
CalSettings::CalSettings() CalSettings::CalSettings()
{ {
instance_ = this; instance_ = this;
year_ = KGlobal::locale()->calendar()->minValidYear() + 1; year_ = TDEGlobal::locale()->calendar()->minValidYear() + 1;
} }
CalSettings::~CalSettings() CalSettings::~CalSettings()

@ -78,8 +78,8 @@ void CalWidget::recreate()
if (!calPainter_) if (!calPainter_)
calPainter_ = new CalPainter(TQT_TQPAINTDEVICE(pix_)); calPainter_ = new CalPainter(TQT_TQPAINTDEVICE(pix_));
calPainter_->setYearMonth(KGlobal::locale()->calendar()->year(TQDate::currentDate()), calPainter_->setYearMonth(TDEGlobal::locale()->calendar()->year(TQDate::currentDate()),
KGlobal::locale()->calendar()->month(TQDate::currentDate())); TDEGlobal::locale()->calendar()->month(TQDate::currentDate()));
calPainter_->paint(); calPainter_->paint();
update(); update();
} }

@ -196,12 +196,12 @@ void CalWizard::slotPageSelected(const TQString&)
TQString month; TQString month;
TQStringList printList; TQStringList printList;
TQDate d; TQDate d;
KGlobal::locale()->calendar()->setYMD(d, cSettings_->getYear(), 1, 1); TDEGlobal::locale()->calendar()->setYMD(d, cSettings_->getYear(), 1, 1);
for (int i=1; i<=KGlobal::locale()->calendar()->monthsInYear(d); i++) { for (int i=1; i<=TDEGlobal::locale()->calendar()->monthsInYear(d); i++) {
#if KDE_IS_VERSION(3,2,0) #if KDE_IS_VERSION(3,2,0)
month = KGlobal::locale()->calendar()->monthName(i, cSettings_->getYear(), false); month = TDEGlobal::locale()->calendar()->monthName(i, cSettings_->getYear(), false);
#else #else
month = KGlobal::locale()->monthName(i); month = TDEGlobal::locale()->monthName(i);
#endif #endif
image = cSettings_->getImage(i); image = cSettings_->getImage(i);
if (!image.isEmpty()) { if (!image.isEmpty()) {
@ -215,9 +215,9 @@ void CalWizard::slotPageSelected(const TQString&)
TQString year = TQString::number(cSettings_->getYear()); TQString year = TQString::number(cSettings_->getYear());
TQString extra; TQString extra;
if ((KGlobal::locale()->calendar()->month(TQDate::currentDate()) >= 6 && if ((TDEGlobal::locale()->calendar()->month(TQDate::currentDate()) >= 6 &&
KGlobal::locale()->calendar()->year(TQDate::currentDate()) == cSettings_->getYear()) || TDEGlobal::locale()->calendar()->year(TQDate::currentDate()) == cSettings_->getYear()) ||
KGlobal::locale()->calendar()->year(TQDate::currentDate()) > cSettings_->getYear()) TDEGlobal::locale()->calendar()->year(TQDate::currentDate()) > cSettings_->getYear())
extra = "<br><br><b>"+i18n("Please note that you are making a " extra = "<br><br><b>"+i18n("Please note that you are making a "
"calendar for<br>the current year or a year in the " "calendar for<br>the current year or a year in the "
"past.")+"</b>"; "past.")+"</b>";
@ -320,11 +320,11 @@ void CalWizard::slotPrintOnePage()
#if KDE_IS_VERSION(3,2,0) #if KDE_IS_VERSION(3,2,0)
wFinishLabel_->setText(i18n("Printing Calendar Page for %1 of %2") wFinishLabel_->setText(i18n("Printing Calendar Page for %1 of %2")
.arg(KGlobal::locale()->calendar()->monthName(month, cSettings_->getYear(), false)) .arg(TDEGlobal::locale()->calendar()->monthName(month, cSettings_->getYear(), false))
.arg(yearName)); .arg(yearName));
#else #else
wFinishLabel_->setText(i18n("Printing Calendar Page for %1 of %2") wFinishLabel_->setText(i18n("Printing Calendar Page for %1 of %2")
.arg(KGlobal::locale()->monthName(month)). .arg(TDEGlobal::locale()->monthName(month)).
.arg(yearName)); .arg(yearName));
#endif #endif

@ -86,9 +86,9 @@ void MonthWidget::drawContents(TQPainter *p)
{ {
#if KDE_IS_VERSION(3,2,0) #if KDE_IS_VERSION(3,2,0)
TQString name = KGlobal::locale()->calendar()->monthName(month_, CalSettings::instance()->getYear(), true); TQString name = TDEGlobal::locale()->calendar()->monthName(month_, CalSettings::instance()->getYear(), true);
#else #else
TQString name = KGlobal::locale()->monthName(month_, true); TQString name = TDEGlobal::locale()->monthName(month_, true);
#endif #endif
TQRect cr; TQRect cr;

@ -321,9 +321,9 @@ void CDArchiving::run()
{ {
m_HTMLInterfaceFolder = m_tmpFolder + "/HTMLInterface"; m_HTMLInterfaceFolder = m_tmpFolder + "/HTMLInterface";
TQString dir; TQString dir;
KGlobal::dirs()->addResourceType("kipi_autorun", TDEGlobal::dirs()->addResourceType("kipi_autorun",
KGlobal::dirs()->kde_default("data") + "kipi/data"); TDEGlobal::dirs()->kde_default("data") + "kipi/data");
dir = KGlobal::dirs()->findResourceDir("kipi_autorun", "index.htm"); dir = TDEGlobal::dirs()->findResourceDir("kipi_autorun", "index.htm");
m_HTMLInterfaceIndex = dir + "index.htm"; m_HTMLInterfaceIndex = dir + "index.htm";
d = new KIPICDArchivingPlugin::EventData; d = new KIPICDArchivingPlugin::EventData;
@ -396,7 +396,7 @@ void CDArchiving::invokeK3b()
{ {
if (m_cancelled) return; if (m_cancelled) return;
m_Proc = new KProcess(); m_Proc = new TDEProcess();
*m_Proc << m_K3bBinPathName << m_K3bParameters; *m_Proc << m_K3bBinPathName << m_K3bParameters;
*m_Proc << m_tmpFolder + "/KIPICDArchiving.xml"; *m_Proc << m_tmpFolder + "/KIPICDArchiving.xml";
@ -406,10 +406,10 @@ void CDArchiving::invokeK3b()
m_tmpFolder + "/KIPICDArchiving.xml"; m_tmpFolder + "/KIPICDArchiving.xml";
kdDebug(51000) << "K3b is started : " << K3bCommandLine.ascii() << endl; kdDebug(51000) << "K3b is started : " << K3bCommandLine.ascii() << endl;
connect(m_Proc, TQT_SIGNAL(processExited(KProcess *)), connect(m_Proc, TQT_SIGNAL(processExited(TDEProcess *)),
this, TQT_SLOT(slotK3bDone(KProcess*))); this, TQT_SLOT(slotK3bDone(TDEProcess*)));
if ( !m_Proc->start(KProcess::NotifyOnExit, KProcess::All ) ) if ( !m_Proc->start(TDEProcess::NotifyOnExit, TDEProcess::All ) )
{ {
KIPICDArchivingPlugin::EventData *d = new KIPICDArchivingPlugin::EventData; KIPICDArchivingPlugin::EventData *d = new KIPICDArchivingPlugin::EventData;
d->action = KIPICDArchivingPlugin::Error; d->action = KIPICDArchivingPlugin::Error;
@ -446,7 +446,7 @@ void CDArchiving::slotK3bStartBurningProcess(void)
///////////////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////////////
void CDArchiving::slotK3bDone(KProcess*) void CDArchiving::slotK3bDone(TDEProcess*)
{ {
kdDebug(51000) << "K3b is done !!! Removing temporary folder..." << endl; kdDebug(51000) << "K3b is done !!! Removing temporary folder..." << endl;
@ -516,16 +516,16 @@ bool CDArchiving::buildHTMLInterface (void)
// Build all Albums interface HTML. // Build all Albums interface HTML.
// Adding go home icon if there is more than // Adding go home icon if there is more than
KGlobal::dirs()->addResourceType("kipi_data", KGlobal::dirs()->kde_default("data") + "kipi"); TDEGlobal::dirs()->addResourceType("kipi_data", TDEGlobal::dirs()->kde_default("data") + "kipi");
TQString dir = KGlobal::dirs()->findResourceDir("kipi_data", "gohome.png"); TQString dir = TDEGlobal::dirs()->findResourceDir("kipi_data", "gohome.png");
dir = dir + "gohome.png"; dir = dir + "gohome.png";
KURL srcURL(dir); KURL srcURL(dir);
KURL destURL( MainTPath + "/gohome.png"); KURL destURL( MainTPath + "/gohome.png");
KIO::file_copy(srcURL, destURL, -1, true, false, false); KIO::file_copy(srcURL, destURL, -1, true, false, false);
// Adding up icon // Adding up icon
KGlobal::dirs()->addResourceType("kipi_data", KGlobal::dirs()->kde_default("data") + "kipi"); TDEGlobal::dirs()->addResourceType("kipi_data", TDEGlobal::dirs()->kde_default("data") + "kipi");
dir = KGlobal::dirs()->findResourceDir("kipi_data", "up.png"); dir = TDEGlobal::dirs()->findResourceDir("kipi_data", "up.png");
dir = dir + "up.png"; dir = dir + "up.png";
srcURL = dir; srcURL = dir;
destURL = MainTPath + TQString::fromLatin1("/up.png"); destURL = MainTPath + TQString::fromLatin1("/up.png");
@ -678,7 +678,7 @@ void CDArchiving::createHead(TQTextStream& stream)
stream << "<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\">" << endl; stream << "<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\">" << endl;
stream << "<meta name=\"Generator\" content=\"Albums HTML interface for CD archiving generated by " stream << "<meta name=\"Generator\" content=\"Albums HTML interface for CD archiving generated by "
<< m_hostName << " [" << m_hostURL << "]\">" << endl; << m_hostName << " [" << m_hostURL << "]\">" << endl;
stream << "<meta name=\"date\" content=\"" + KGlobal::locale()->formatDate(TQDate::currentDate()) stream << "<meta name=\"date\" content=\"" + TDEGlobal::locale()->formatDate(TQDate::currentDate())
+ "\">" << endl; + "\">" << endl;
stream << "<title>" << m_mainTitle << "</title>" << endl; stream << "<title>" << m_mainTitle << "</title>" << endl;
createCSSSection(stream); createCSSSection(stream);
@ -736,7 +736,7 @@ void CDArchiving::createBody(TQTextStream& stream,
int numOfImages = images.count(); int numOfImages = images.count();
const TQString imgGalleryDir = targetURL.directory(); const TQString imgGalleryDir = targetURL.directory();
const TQString today(KGlobal::locale()->formatDate(TQDate::currentDate())); const TQString today(TDEGlobal::locale()->formatDate(TQDate::currentDate()));
stream << "<body>\n" << endl; stream << "<body>\n" << endl;
@ -947,8 +947,8 @@ void CDArchiving::createBody(TQTextStream& stream,
stream << "</table>\n<hr>\n" << endl; stream << "</table>\n<hr>\n" << endl;
TQString Temp; TQString Temp;
KGlobal::dirs()->addResourceType("kipi_data", KGlobal::dirs()->kde_default("data") + "kipi"); TDEGlobal::dirs()->addResourceType("kipi_data", TDEGlobal::dirs()->kde_default("data") + "kipi");
TQString dir = KGlobal::dirs()->findResourceDir("kipi_data", "valid-html401.png"); TQString dir = TDEGlobal::dirs()->findResourceDir("kipi_data", "valid-html401.png");
dir = dir + "valid-html401.png"; dir = dir + "valid-html401.png";
KURL srcURL(dir); KURL srcURL(dir);
@ -974,7 +974,7 @@ void CDArchiving::createBody(TQTextStream& stream,
void CDArchiving::createBodyMainPage(TQTextStream& stream, KURL& url) void CDArchiving::createBodyMainPage(TQTextStream& stream, KURL& url)
{ {
TQString Temp; TQString Temp;
const TQString today(KGlobal::locale()->formatDate(TQDate::currentDate())); const TQString today(TDEGlobal::locale()->formatDate(TQDate::currentDate()));
Temp = m_mainTitle; Temp = m_mainTitle;
stream << "<body>\n<h1>" << Temp << "</h1><p>\n" << endl; stream << "<body>\n<h1>" << Temp << "</h1><p>\n" << endl;
@ -987,8 +987,8 @@ void CDArchiving::createBodyMainPage(TQTextStream& stream, KURL& url)
stream << "<hr>" << endl; stream << "<hr>" << endl;
KGlobal::dirs()->addResourceType("kipi_data", KGlobal::dirs()->kde_default("data") + "kipi"); TDEGlobal::dirs()->addResourceType("kipi_data", TDEGlobal::dirs()->kde_default("data") + "kipi");
TQString dir = KGlobal::dirs()->findResourceDir("kipi_data", "valid-html401.png"); TQString dir = TDEGlobal::dirs()->findResourceDir("kipi_data", "valid-html401.png");
dir = dir + "valid-html401.png"; dir = dir + "valid-html401.png";
KURL srcURL(dir); KURL srcURL(dir);
@ -1122,7 +1122,7 @@ bool CDArchiving::createPage(const TQString& imgGalleryDir,
<< m_hostName << " [" << m_hostURL << "]\">" << endl; << m_hostName << " [" << m_hostURL << "]\">" << endl;
stream << "<meta name=\"date\" content=\"" stream << "<meta name=\"date\" content=\""
<< KGlobal::locale()->formatDate(TQDate::currentDate()) << TDEGlobal::locale()->formatDate(TQDate::currentDate())
<< "\">" << endl; << "\">" << endl;
stream << "<title>" << m_mainTitle << " : "<< imgName/*imgURL.fileName()*/ <<"</title>" << endl; stream << "<title>" << m_mainTitle << " : "<< imgName/*imgURL.fileName()*/ <<"</title>" << endl;
@ -1239,7 +1239,7 @@ bool CDArchiving::createPage(const TQString& imgGalleryDir,
// Footer // Footer
TQString valid = i18n("Valid HTML 4.01."); TQString valid = i18n("Valid HTML 4.01.");
const TQString today(KGlobal::locale()->formatDate(TQDate::currentDate())); const TQString today(TDEGlobal::locale()->formatDate(TQDate::currentDate()));
stream << "<div align=\"center\"><hr><img src=\"../thumbs/valid-html401.png\" alt=\"" stream << "<div align=\"center\"><hr><img src=\"../thumbs/valid-html401.png\" alt=\""
<< valid << "\" height=\"31\" width=\"88\" title=\"" << valid << "\" />" << endl; << valid << "\" height=\"31\" width=\"88\" title=\"" << valid << "\" />" << endl;
@ -1296,8 +1296,8 @@ int CDArchiving::ResizeImage( const TQString Path, const TQString Directory, con
if ( ValRet == false ) // Cannot load the src image. if ( ValRet == false ) // Cannot load the src image.
{ {
KGlobal::dirs()->addResourceType("kipi_imagebroken", KGlobal::dirs()->kde_default("data") + "kipi/data"); TDEGlobal::dirs()->addResourceType("kipi_imagebroken", TDEGlobal::dirs()->kde_default("data") + "kipi/data");
TQString dir = KGlobal::dirs()->findResourceDir("kipi_imagebroken", "image_broken.png"); TQString dir = TDEGlobal::dirs()->findResourceDir("kipi_imagebroken", "image_broken.png");
dir = dir + "image_broken.png"; dir = dir + "image_broken.png";
kdDebug ( 51000 ) << "Loading " << Path.ascii() << " failed ! Using " << dir.ascii() kdDebug ( 51000 ) << "Loading " << Path.ascii() << " failed ! Using " << dir.ascii()
<< " instead..." << endl; << " instead..." << endl;

@ -51,7 +51,7 @@ extern "C"
#include <libkipi/imagecollection.h> #include <libkipi/imagecollection.h>
#include <libkipi/interface.h> #include <libkipi/interface.h>
class KProcess; class TDEProcess;
namespace KIPICDArchivingPlugin namespace KIPICDArchivingPlugin
{ {
@ -86,7 +86,7 @@ public:
public slots: public slots:
void slotK3bDone(KProcess*); void slotK3bDone(TDEProcess*);
void slotK3bStartBurningProcess(void); void slotK3bStartBurningProcess(void);
private: private:
@ -97,7 +97,7 @@ private:
KIPI::Interface *m_interface; KIPI::Interface *m_interface;
KProcess *m_Proc; TDEProcess *m_Proc;
KURL m_albumUrl; // Current album Url use in the thread. KURL m_albumUrl; // Current album Url use in the thread.
KURL::List m_albumUrlList; // Urls of Albums list from setup dialog. KURL::List m_albumUrlList; // Urls of Albums list from setup dialog.

@ -265,7 +265,7 @@ void CDArchivingDialog::setupLookPage(void)
TQStringList standardFonts; TQStringList standardFonts;
KFontChooser::getFontList(standardFonts, 0); KFontChooser::getFontList(standardFonts, 0);
m_fontName->insertStringList( standardFonts ); m_fontName->insertStringList( standardFonts );
m_fontName->setCurrentText( KGlobalSettings::generalFont().family()); m_fontName->setCurrentText( TDEGlobalSettings::generalFont().family());
TQWhatsThis::add( m_fontName, i18n("<p>Select here the font name used for the pages.") ); TQWhatsThis::add( m_fontName, i18n("<p>Select here the font name used for the pages.") );
m_labelFontName = new TQLabel( i18n("Fon&t name:"), page_setupLook ); m_labelFontName = new TQLabel( i18n("Fon&t name:"), page_setupLook );

@ -47,8 +47,8 @@ namespace KIPIPlugins
#if KDE_IS_VERSION(3,4,0) #if KDE_IS_VERSION(3,4,0)
// setProgramLogo is defined from kde 3.4.0 on // setProgramLogo is defined from kde 3.4.0 on
TQString directory; TQString directory;
KGlobal::dirs()->addResourceType("kipi_plugins_logo", KGlobal::dirs()->kde_default("data") + "kipi/data"); TDEGlobal::dirs()->addResourceType("kipi_plugins_logo", TDEGlobal::dirs()->kde_default("data") + "kipi/data");
directory = KGlobal::dirs()->findResourceDir("kipi_plugins_logo", "kipi-plugins_logo.png"); directory = TDEGlobal::dirs()->findResourceDir("kipi_plugins_logo", "kipi-plugins_logo.png");
// set the kipiplugins logo inside the about dialog // set the kipiplugins logo inside the about dialog
setProgramLogo(TQImage(directory + "kipi-plugins_logo.png")); setProgramLogo(TQImage(directory + "kipi-plugins_logo.png"));

@ -76,7 +76,7 @@ namespace KIPIFindDupplicateImagesPlugin
FindDuplicateImages::FindDuplicateImages( KIPI::Interface* interface, TQObject *parent) FindDuplicateImages::FindDuplicateImages( KIPI::Interface* interface, TQObject *parent)
: TQObject(parent), TQThread(), m_interface( interface ), : TQObject(parent), TQThread(), m_interface( interface ),
m_cacheDir(KGlobal::dirs()->saveLocation("cache", "kipi-findduplicate/")), m_cacheDir(TDEGlobal::dirs()->saveLocation("cache", "kipi-findduplicate/")),
m_compareOp( 0 ) m_compareOp( 0 )
{ {
KImageIO::registerFormats(); KImageIO::registerFormats();

@ -72,7 +72,7 @@ void Plugin_GalleryExport::setup(TQWidget* widget)
} }
// Add our directory in to the icon loader dirs. // Add our directory in to the icon loader dirs.
KGlobal::iconLoader()->addAppDir("kipiplugin_galleryexport"); TDEGlobal::iconLoader()->addAppDir("kipiplugin_galleryexport");
m_action_sync = new KAction(i18n("Remote Gallery Sync..."), m_action_sync = new KAction(i18n("Remote Gallery Sync..."),
0, 0,

@ -66,17 +66,17 @@ GPSBabelBinary::~GPSBabelBinary()
void GPSBabelBinary::checkSystem() void GPSBabelBinary::checkSystem()
{ {
KProcess process; TDEProcess process;
process.clearArguments(); process.clearArguments();
process << path() << "-V"; process << path() << "-V";
connect(&process, TQT_SIGNAL(receivedStdout(KProcess *, char*, int)), connect(&process, TQT_SIGNAL(receivedStdout(TDEProcess *, char*, int)),
this, TQT_SLOT(slotReadStdoutFromGPSBabel(KProcess*, char*, int))); this, TQT_SLOT(slotReadStdoutFromGPSBabel(TDEProcess*, char*, int)));
d->available = process.start(KProcess::Block, KProcess::Stdout); d->available = process.start(TDEProcess::Block, TDEProcess::Stdout);
} }
void GPSBabelBinary::slotReadStdoutFromGPSBabel(KProcess*, char* buffer, int buflen) void GPSBabelBinary::slotReadStdoutFromGPSBabel(TDEProcess*, char* buffer, int buflen)
{ {
// The gpsbabel output look like this : GPSBabel Version 1.2.5 // The gpsbabel output look like this : GPSBabel Version 1.2.5
TQString headerStarts("GPSBabel Version "); TQString headerStarts("GPSBabel Version ");

@ -28,7 +28,7 @@
#include <tqstring.h> #include <tqstring.h>
#include <tqobject.h> #include <tqobject.h>
class KProcess; class TDEProcess;
namespace KIPIGPSSyncPlugin namespace KIPIGPSSyncPlugin
{ {
@ -55,7 +55,7 @@ public:
private slots: private slots:
void slotReadStdoutFromGPSBabel(KProcess*, char*, int); void slotReadStdoutFromGPSBabel(TDEProcess*, char*, int);
private: private:

@ -298,7 +298,7 @@ void GPSSyncDialog::setImages( const KURL::List& images )
void GPSSyncDialog::slotLoadGPXFile() void GPSSyncDialog::slotLoadGPXFile()
{ {
KURL loadGPXFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), KURL loadGPXFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(),
i18n("%1|GPS Exchange Format").arg("*.gpx"), this, i18n("%1|GPS Exchange Format").arg("*.gpx"), this,
i18n("Select GPX File to Load") ); i18n("Select GPX File to Load") );
if( loadGPXFile.isEmpty() ) if( loadGPXFile.isEmpty() )

@ -140,7 +140,7 @@ Theme::~Theme() {
const Theme::List& Theme::getList() { const Theme::List& Theme::getList() {
if (sList.isEmpty()) { if (sList.isEmpty()) {
TQStringList internalNameList; TQStringList internalNameList;
TQStringList list=KGlobal::instance()->dirs()->findAllResources("data", "kipiplugin_htmlexport/themes/*/*.desktop"); TQStringList list=TDEGlobal::instance()->dirs()->findAllResources("data", "kipiplugin_htmlexport/themes/*/*.desktop");
TQStringList::Iterator it=list.begin(), end=list.end(); TQStringList::Iterator it=list.begin(), end=list.end();
for (;it!=end; ++it) { for (;it!=end; ++it) {
Theme* theme=new Theme; Theme* theme=new Theme;

@ -103,7 +103,7 @@ UploadDialog::UploadDialog(
TQWhatsThis::add( m_renameAlbumButton, i18n("Rename the selected photo album on the iPod.")); TQWhatsThis::add( m_renameAlbumButton, i18n("Rename the selected photo album on the iPod."));
TQLabel *ipod_icon = new TQLabel( buttons ); TQLabel *ipod_icon = new TQLabel( buttons );
ipod_icon->setPixmap( KGlobal::iconLoader()->loadIcon( "ipod", KIcon::Desktop, KIcon::SizeHuge ) ); ipod_icon->setPixmap( TDEGlobal::iconLoader()->loadIcon( "ipod", KIcon::Desktop, KIcon::SizeHuge ) );
m_ipodPreview = new TQLabel( buttons ); m_ipodPreview = new TQLabel( buttons );
m_ipodPreview->setFixedHeight( 80 ); m_ipodPreview->setFixedHeight( 80 );
@ -148,7 +148,7 @@ UploadDialog::UploadDialog(
TQWhatsThis::add( m_imagePreview, i18n( "The preview of the selected image in the list." ) ); TQWhatsThis::add( m_imagePreview, i18n( "The preview of the selected image in the list." ) );
TQLabel *hdd_icon = new TQLabel( urlBox ); TQLabel *hdd_icon = new TQLabel( urlBox );
hdd_icon->setPixmap( KGlobal::iconLoader()->loadIcon( "system", KIcon::Desktop, KIcon::SizeHuge ) ); hdd_icon->setPixmap( TDEGlobal::iconLoader()->loadIcon( "system", KIcon::Desktop, KIcon::SizeHuge ) );
uploadPaneLayout->addWidget( m_imagePreview ); uploadPaneLayout->addWidget( m_imagePreview );
uploadPaneLayout->addStretch( 1 ); uploadPaneLayout->addStretch( 1 );
@ -207,7 +207,7 @@ UploadDialog::getIpodAlbums()
Itdb_PhotoAlbum *ipodAlbum = (Itdb_PhotoAlbum *)it->data; Itdb_PhotoAlbum *ipodAlbum = (Itdb_PhotoAlbum *)it->data;
debug() << " found album: " << ipodAlbum->name << endl; debug() << " found album: " << ipodAlbum->name << endl;
last = new IpodAlbumItem( m_ipodAlbumList, last, ipodAlbum ); last = new IpodAlbumItem( m_ipodAlbumList, last, ipodAlbum );
last->setPixmap( 0, KGlobal::iconLoader()->loadIcon( "folder", KIcon::Toolbar, KIcon::SizeSmall ) ); last->setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "folder", KIcon::Toolbar, KIcon::SizeSmall ) );
getIpodAlbumPhotos( last, ipodAlbum ); getIpodAlbumPhotos( last, ipodAlbum );
} }
} }
@ -225,7 +225,7 @@ UploadDialog::getIpodAlbumPhotos( IpodAlbumItem *item, Itdb_PhotoAlbum *album )
gint photo_id = photo->id; gint photo_id = photo->id;
last = new IpodPhotoItem( item, last, photo ); last = new IpodPhotoItem( item, last, photo );
last->setText( 0, TQString::number( photo_id ) ); last->setText( 0, TQString::number( photo_id ) );
last->setPixmap( 0, KGlobal::iconLoader()->loadIcon( "image", KIcon::Toolbar, KIcon::SizeSmall ) ); last->setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "image", KIcon::Toolbar, KIcon::SizeSmall ) );
} }
} }
@ -469,7 +469,7 @@ UploadDialog::createIpodAlbum()
Itdb_PhotoAlbum *photoAlbum = itdb_photodb_photoalbum_create( m_itdb, TQFile::encodeName( newAlbum ), -1/*end*/ ); Itdb_PhotoAlbum *photoAlbum = itdb_photodb_photoalbum_create( m_itdb, TQFile::encodeName( newAlbum ), -1/*end*/ );
// add the new album to the list view // add the new album to the list view
IpodAlbumItem *i = new IpodAlbumItem( m_ipodAlbumList, last, photoAlbum ); IpodAlbumItem *i = new IpodAlbumItem( m_ipodAlbumList, last, photoAlbum );
i->setPixmap( 0, KGlobal::iconLoader()->loadIcon( "folder", KIcon::Toolbar, KIcon::SizeSmall ) ); i->setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "folder", KIcon::Toolbar, KIcon::SizeSmall ) );
m_ipodAlbumList->clearSelection(); m_ipodAlbumList->clearSelection();
m_ipodAlbumList->setSelected( i, true ); m_ipodAlbumList->setSelected( i, true );

@ -222,7 +222,7 @@ bool ImageGrayScale::image2GrayScaleJPEG(const TQString& src, const TQString& de
bool ImageGrayScale::image2GrayScaleImageMagick(const TQString& src, const TQString& dest, TQString& err) bool ImageGrayScale::image2GrayScaleImageMagick(const TQString& src, const TQString& dest, TQString& err)
{ {
KProcess process; TDEProcess process;
process.clearArguments(); process.clearArguments();
process << "convert"; process << "convert";
process << "-verbose"; process << "-verbose";
@ -234,10 +234,10 @@ bool ImageGrayScale::image2GrayScaleImageMagick(const TQString& src, const TQStr
for (TQValueList<TQCString>::iterator it = args.begin(); it != args.end(); ++it) for (TQValueList<TQCString>::iterator it = args.begin(); it != args.end(); ++it)
tqDebug("%s", (const char*)(*it)); tqDebug("%s", (const char*)(*it));
connect(&process, TQT_SIGNAL(receivedStderr(KProcess *, char*, int)), connect(&process, TQT_SIGNAL(receivedStderr(TDEProcess *, char*, int)),
this, TQT_SLOT(slotReadStderr(KProcess*, char*, int))); this, TQT_SLOT(slotReadStderr(TDEProcess*, char*, int)));
if (!process.start(KProcess::Block, KProcess::Stderr)) if (!process.start(TDEProcess::Block, TDEProcess::Stderr))
return false; return false;
if (!process.normalExit()) if (!process.normalExit())
@ -262,7 +262,7 @@ bool ImageGrayScale::image2GrayScaleImageMagick(const TQString& src, const TQStr
return false; return false;
} }
void ImageGrayScale::slotReadStderr(KProcess*, char* buffer, int buflen) void ImageGrayScale::slotReadStderr(TDEProcess*, char* buffer, int buflen)
{ {
m_stdErr.append(TQString::fromLocal8Bit(buffer, buflen)); m_stdErr.append(TQString::fromLocal8Bit(buffer, buflen));
} }

@ -30,7 +30,7 @@
#include <tqstring.h> #include <tqstring.h>
class KTempFile; class KTempFile;
class KProcess; class TDEProcess;
namespace KIPIJPEGLossLessPlugin namespace KIPIJPEGLossLessPlugin
{ {
@ -49,7 +49,7 @@ public:
private slots: private slots:
void slotReadStderr(KProcess*, char*, int); void slotReadStderr(TDEProcess*, char*, int);
private: private:

@ -157,7 +157,7 @@ bool ImageFlip::flipJPEG(const TQString& src, const TQString& dest, FlipAction a
bool ImageFlip::flipImageMagick(const TQString& src, const TQString& dest, FlipAction action, TQString& err) bool ImageFlip::flipImageMagick(const TQString& src, const TQString& dest, FlipAction action, TQString& err)
{ {
KProcess process; TDEProcess process;
process.clearArguments(); process.clearArguments();
process << "convert"; process << "convert";
process << "-verbose"; process << "-verbose";
@ -189,10 +189,10 @@ bool ImageFlip::flipImageMagick(const TQString& src, const TQString& dest, FlipA
for (TQValueList<TQCString>::iterator it = args.begin(); it != args.end(); ++it) for (TQValueList<TQCString>::iterator it = args.begin(); it != args.end(); ++it)
tqDebug("%s", (const char*)(*it)); tqDebug("%s", (const char*)(*it));
connect(&process, TQT_SIGNAL(receivedStderr(KProcess *, char*, int)), connect(&process, TQT_SIGNAL(receivedStderr(TDEProcess *, char*, int)),
this, TQT_SLOT(slotReadStderr(KProcess*, char*, int))); this, TQT_SLOT(slotReadStderr(TDEProcess*, char*, int)));
if (!process.start(KProcess::Block, KProcess::Stderr)) if (!process.start(TDEProcess::Block, TDEProcess::Stderr))
return false; return false;
if (!process.normalExit()) if (!process.normalExit())
@ -217,7 +217,7 @@ bool ImageFlip::flipImageMagick(const TQString& src, const TQString& dest, FlipA
return false; return false;
} }
void ImageFlip::slotReadStderr(KProcess*, char* buffer, int buflen) void ImageFlip::slotReadStderr(TDEProcess*, char* buffer, int buflen)
{ {
m_stdErr.append(TQString::fromLocal8Bit(buffer, buflen)); m_stdErr.append(TQString::fromLocal8Bit(buffer, buflen));
} }

@ -34,7 +34,7 @@
#include <tqstring.h> #include <tqstring.h>
class KTempFile; class KTempFile;
class KProcess; class TDEProcess;
namespace KIPIJPEGLossLessPlugin namespace KIPIJPEGLossLessPlugin
{ {
@ -53,7 +53,7 @@ public:
private slots: private slots:
void slotReadStderr(KProcess*, char*, int); void slotReadStderr(TDEProcess*, char*, int);
private: private:

@ -171,7 +171,7 @@ bool ImageRotate::rotateJPEG(const TQString& src, const TQString& dest, RotateAc
bool ImageRotate::rotateImageMagick(const TQString& src, const TQString& dest, bool ImageRotate::rotateImageMagick(const TQString& src, const TQString& dest,
RotateAction angle, TQString& err) RotateAction angle, TQString& err)
{ {
KProcess process; TDEProcess process;
process.clearArguments(); process.clearArguments();
process << "convert"; process << "convert";
process << "-verbose"; process << "-verbose";
@ -213,10 +213,10 @@ bool ImageRotate::rotateImageMagick(const TQString& src, const TQString& dest,
for (TQValueList<TQCString>::iterator it = args.begin(); it != args.end(); ++it) for (TQValueList<TQCString>::iterator it = args.begin(); it != args.end(); ++it)
tqDebug("%s", (const char*)(*it)); tqDebug("%s", (const char*)(*it));
connect(&process, TQT_SIGNAL(receivedStderr(KProcess *, char*, int)), connect(&process, TQT_SIGNAL(receivedStderr(TDEProcess *, char*, int)),
this, TQT_SLOT(slotReadStderr(KProcess*, char*, int))); this, TQT_SLOT(slotReadStderr(TDEProcess*, char*, int)));
if (!process.start(KProcess::Block, KProcess::Stderr)) if (!process.start(TDEProcess::Block, TDEProcess::Stderr))
return false; return false;
if (!process.normalExit()) if (!process.normalExit())
@ -241,7 +241,7 @@ bool ImageRotate::rotateImageMagick(const TQString& src, const TQString& dest,
return false; return false;
} }
void ImageRotate::slotReadStderr(KProcess*, char* buffer, int buflen) void ImageRotate::slotReadStderr(TDEProcess*, char* buffer, int buflen)
{ {
m_stdErr.append(TQString::fromLocal8Bit(buffer, buflen)); m_stdErr.append(TQString::fromLocal8Bit(buffer, buflen));
} }

@ -35,7 +35,7 @@
#include <tqstring.h> #include <tqstring.h>
class KTempFile; class KTempFile;
class KProcess; class TDEProcess;
namespace KIPIJPEGLossLessPlugin namespace KIPIJPEGLossLessPlugin
{ {
@ -54,7 +54,7 @@ public:
private slots: private slots:
void slotReadStderr(KProcess*, char*, int); void slotReadStderr(TDEProcess*, char*, int);
private: private:

@ -133,7 +133,7 @@ bool Utils::updateMetadataImageMagick(const TQString& src, TQString& err)
streamIptc.writeRawBytes(iptcData.data(), iptcData.size()); streamIptc.writeRawBytes(iptcData.data(), iptcData.size());
iptcFile->close(); iptcFile->close();
KProcess process; TDEProcess process;
process.clearArguments(); process.clearArguments();
process << "mogrify"; process << "mogrify";
process << "-verbose"; process << "-verbose";
@ -151,10 +151,10 @@ bool Utils::updateMetadataImageMagick(const TQString& src, TQString& err)
for (TQValueList<TQCString>::iterator it = args.begin(); it != args.end(); ++it) for (TQValueList<TQCString>::iterator it = args.begin(); it != args.end(); ++it)
tqDebug("%s", (const char*)(*it)); tqDebug("%s", (const char*)(*it));
connect(&process, TQT_SIGNAL(receivedStderr(KProcess *, char*, int)), connect(&process, TQT_SIGNAL(receivedStderr(TDEProcess *, char*, int)),
this, TQT_SLOT(slotReadStderr(KProcess*, char*, int))); this, TQT_SLOT(slotReadStderr(TDEProcess*, char*, int)));
if (!process.start(KProcess::Block, KProcess::Stderr)) if (!process.start(TDEProcess::Block, TDEProcess::Stderr))
return false; return false;
if (!process.normalExit()) if (!process.normalExit())
@ -179,7 +179,7 @@ bool Utils::updateMetadataImageMagick(const TQString& src, TQString& err)
return false; return false;
} }
void Utils::slotReadStderr(KProcess*, char* buffer, int buflen) void Utils::slotReadStderr(TDEProcess*, char* buffer, int buflen)
{ {
m_stdErr.append(TQString::fromLocal8Bit(buffer, buflen)); m_stdErr.append(TQString::fromLocal8Bit(buffer, buflen));
} }

@ -30,7 +30,7 @@
#include <tqobject.h> #include <tqobject.h>
#include <tqstring.h> #include <tqstring.h>
class KProcess; class TDEProcess;
namespace KIPIJPEGLossLessPlugin namespace KIPIJPEGLossLessPlugin
{ {
@ -71,7 +71,7 @@ public: // Static methods.
private slots: private slots:
void slotReadStderr(KProcess*, char*, int); void slotReadStderr(TDEProcess*, char*, int);
private: private:

@ -228,7 +228,7 @@ void Plugin_MetadataEdit::slotImportExif()
if ( !images.isValid() || images.images().isEmpty() ) if ( !images.isValid() || images.images().isEmpty() )
return; return;
KURL importEXIFFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), KURL importEXIFFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(),
TQString(), TQT_TQWIDGET(kapp->activeWindow()), TQString(), TQT_TQWIDGET(kapp->activeWindow()),
i18n("Select File to Import EXIF metadata") ); i18n("Select File to Import EXIF metadata") );
if( importEXIFFile.isEmpty() ) if( importEXIFFile.isEmpty() )
@ -374,7 +374,7 @@ void Plugin_MetadataEdit::slotImportIptc()
if ( !images.isValid() || images.images().isEmpty() ) if ( !images.isValid() || images.images().isEmpty() )
return; return;
KURL importIPTCFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), KURL importIPTCFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(),
TQString(), TQT_TQWIDGET(kapp->activeWindow()), TQString(), TQT_TQWIDGET(kapp->activeWindow()),
i18n("Select File to Import IPTC metadata") ); i18n("Select File to Import IPTC metadata") );
if( importIPTCFile.isEmpty() ) if( importIPTCFile.isEmpty() )

@ -306,7 +306,7 @@ void KImg2mpgData::slotMPEGFilenameDialog( void )
{ {
TQString temp; TQString temp;
temp = KFileDialog::getOpenFileName(KGlobalSettings::documentPath(), temp = KFileDialog::getOpenFileName(TDEGlobalSettings::documentPath(),
TQString( "*.mpg" ), TQString( "*.mpg" ),
this, this,
i18n("Select MPEG Output File") ); i18n("Select MPEG Output File") );
@ -323,7 +323,7 @@ void KImg2mpgData::slotAudioFilenameDialog( void )
{ {
TQString temp; TQString temp;
temp = KFileDialog::getOpenFileName(KGlobalSettings::documentPath(), temp = KFileDialog::getOpenFileName(TDEGlobalSettings::documentPath(),
TQString( "*.wav *.mp2 *.mp3 *.ogg" ), TQString( "*.wav *.mp2 *.mp3 *.ogg" ),
this, this,
i18n("Select Audio Input File") ); i18n("Select Audio Input File") );
@ -504,7 +504,7 @@ void KImg2mpgData::slotClose()
void KImg2mpgData::slotEncode( void ) void KImg2mpgData::slotEncode( void )
{ {
m_Proc = new KProcess; m_Proc = new TDEProcess;
TQColor BackGroundColor; TQColor BackGroundColor;
TQString HexColor; TQString HexColor;
TQString Temp; TQString Temp;
@ -697,14 +697,14 @@ void KImg2mpgData::slotEncode( void )
m_CommandLine = m_CommandLine + " \"" + FileName + "\" "; m_CommandLine = m_CommandLine + " \"" + FileName + "\" ";
} }
connect(m_Proc, TQT_SIGNAL(processExited(KProcess *)),this, connect(m_Proc, TQT_SIGNAL(processExited(TDEProcess *)),this,
TQT_SLOT(EncodeDone(KProcess*))); TQT_SLOT(EncodeDone(TDEProcess*)));
connect(m_Proc, TQT_SIGNAL(receivedStderr(KProcess *,char*,int)),this, connect(m_Proc, TQT_SIGNAL(receivedStderr(TDEProcess *,char*,int)),this,
TQT_SLOT(readStderr(KProcess*,char*,int))); TQT_SLOT(readStderr(TDEProcess*,char*,int)));
m_Img2mpgPidNum = -1; m_Img2mpgPidNum = -1;
bool result = m_Proc->start(KProcess::NotifyOnExit , KProcess::All); bool result = m_Proc->start(TDEProcess::NotifyOnExit , TDEProcess::All);
if(!result) if(!result)
{ {
@ -809,7 +809,7 @@ void KImg2mpgData::ShowNumberImages( int Number )
///////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////
void KImg2mpgData::readStderr(KProcess *, char *buffer, int buflen) void KImg2mpgData::readStderr(TDEProcess *, char *buffer, int buflen)
{ {
TQString NewString2; TQString NewString2;
int ImgNum; int ImgNum;
@ -898,7 +898,7 @@ void KImg2mpgData::readStderr(KProcess *, char *buffer, int buflen)
///////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////
void KImg2mpgData::EncodeDone(KProcess*) void KImg2mpgData::EncodeDone(TDEProcess*)
{ {
reset(); reset();
@ -1107,7 +1107,7 @@ void KImg2mpgData::readSettings()
m_AudioInputFileConfig = m_config->readPathEntry("AudioInputFile"); m_AudioInputFileConfig = m_config->readPathEntry("AudioInputFile");
m_AudioInputEDITFilename->setText(m_AudioInputFileConfig); m_AudioInputEDITFilename->setText(m_AudioInputFileConfig);
m_MPEGOutputFileConfig = m_config->readPathEntry("MPEGOutputFile", KGlobalSettings::documentPath() + "output.mpg"); m_MPEGOutputFileConfig = m_config->readPathEntry("MPEGOutputFile", TDEGlobalSettings::documentPath() + "output.mpg");
m_MPEGOutputEDITFilename->setText(m_MPEGOutputFileConfig); m_MPEGOutputEDITFilename->setText(m_MPEGOutputFileConfig);
m_IMBinFolderConfig = m_config->readPathEntry("ImageMagickBinFolder", "/usr/bin"); m_IMBinFolderConfig = m_config->readPathEntry("ImageMagickBinFolder", "/usr/bin");

@ -59,7 +59,7 @@ class TQWidget;
class TQPixmap; class TQPixmap;
class KConfig; class KConfig;
class KProcess; class TDEProcess;
class KLineEdit; class KLineEdit;
class KIconLoader; class KIconLoader;
class KColorButton; class KColorButton;
@ -114,8 +114,8 @@ public:
public slots: public slots:
void reset(); void reset();
void readStderr(KProcess *proc, char *buffer, int buflen); void readStderr(TDEProcess *proc, char *buffer, int buflen);
void EncodeDone(KProcess* ); void EncodeDone(TDEProcess* );
void slotMPEGFilenameDialog( void ); void slotMPEGFilenameDialog( void );
void slotAudioFilenameDialog( void ); void slotAudioFilenameDialog( void );
void slotImagesFilesButtonAdd( void ); void slotImagesFilesButtonAdd( void );
@ -165,7 +165,7 @@ private:
pid_t m_Img2mpgPidNum; pid_t m_Img2mpgPidNum;
KProcess* m_Proc; TDEProcess* m_Proc;
KIconLoader* m_Icons; KIconLoader* m_Icons;

@ -1298,8 +1298,8 @@ The program uses the 'images2mpg' bash script.</string>
</includes> </includes>
<Q_SLOTS> <Q_SLOTS>
<slot specifier="non virtual">reset()</slot> <slot specifier="non virtual">reset()</slot>
<slot specifier="non virtual">readStderr( KProcess * proc, char * buffer, int buflen )</slot> <slot specifier="non virtual">readStderr( TDEProcess * proc, char * buffer, int buflen )</slot>
<slot specifier="non virtual">EncodeDone( KProcess * )</slot> <slot specifier="non virtual">EncodeDone( TDEProcess * )</slot>
<slot specifier="non virtual">slotMPEGFilenameDialog( void )</slot> <slot specifier="non virtual">slotMPEGFilenameDialog( void )</slot>
<slot specifier="non virtual">slotAudioFilenameDialog( void )</slot> <slot specifier="non virtual">slotAudioFilenameDialog( void )</slot>
<slot specifier="non virtual">slotImagesFilesButtonUp( void )</slot> <slot specifier="non virtual">slotImagesFilesButtonUp( void )</slot>

@ -186,7 +186,7 @@ FrmPrintWizard::FrmPrintWizard(TQWidget *parent, const char *name )
loadSettings(); loadSettings();
m_Proc = new KProcess; m_Proc = new TDEProcess;
*m_Proc << "kjobviewer" << "--all"; *m_Proc << "kjobviewer" << "--all";
} }
@ -555,7 +555,7 @@ TQString FrmPrintWizard::captionFormatter(TPhoto *photo, const TQString& format)
// %l focal length // %l focal length
str.replace("%f", fi.fileName()); str.replace("%f", fi.fileName());
str.replace("%c", photo->exiv2Iface()->getExifComment()); str.replace("%c", photo->exiv2Iface()->getExifComment());
str.replace("%d", KGlobal::locale()->formatDateTime(photo->exiv2Iface()->getImageDateTime(), str.replace("%d", TDEGlobal::locale()->formatDateTime(photo->exiv2Iface()->getImageDateTime(),
false, false)); false, false));
str.replace("%t", photo->exiv2Iface()->getExifTagString("Exif.Photo.ExposureTime")); str.replace("%t", photo->exiv2Iface()->getExifTagString("Exif.Photo.ExposureTime"));
str.replace("%i", photo->exiv2Iface()->getExifTagString("Exif.Photo.ISOSpeedRatings")); str.replace("%i", photo->exiv2Iface()->getExifTagString("Exif.Photo.ISOSpeedRatings"));

@ -33,7 +33,7 @@
#include "frmprintwizardbase.h" #include "frmprintwizardbase.h"
class TQPushButton; class TQPushButton;
class KProcess; class TDEProcess;
namespace KIPIPrintWizardPlugin namespace KIPIPrintWizardPlugin
{ {
@ -75,7 +75,7 @@ private:
TQPtrList<TPhotoSize> m_photoSizes; TQPtrList<TPhotoSize> m_photoSizes;
PageSize m_pageSize; PageSize m_pageSize;
KProcess *m_Proc; TDEProcess *m_Proc;
TQString m_tempPath; TQString m_tempPath;
int m_currentPreviewPage; int m_currentPreviewPage;

@ -178,7 +178,7 @@ void ActionThread::run()
if (info.dateTime.isValid()) if (info.dateTime.isValid())
{ {
identify.append(i18n("Created: %1\n") identify.append(i18n("Created: %1\n")
.arg(KGlobal::locale()->formatDateTime(info.dateTime, true, true))); .arg(TDEGlobal::locale()->formatDateTime(info.dateTime, true, true)));
} }
if (info.aperture != -1.0) if (info.aperture != -1.0)

@ -86,32 +86,32 @@ RawDecodingIface::~RawDecodingIface()
TQByteArray RawDecodingIface::getICCProfilFromFile(KDcrawIface::RawDecodingSettings::OutputColorSpace colorSpace) TQByteArray RawDecodingIface::getICCProfilFromFile(KDcrawIface::RawDecodingSettings::OutputColorSpace colorSpace)
{ {
TQString filePath; TQString filePath;
KGlobal::dirs()->addResourceType("profiles", KGlobal::dirs()->kde_default("data") + TDEGlobal::dirs()->addResourceType("profiles", TDEGlobal::dirs()->kde_default("data") +
"kipiplugin_rawconverter/profiles"); "kipiplugin_rawconverter/profiles");
switch(colorSpace) switch(colorSpace)
{ {
case KDcrawIface::RawDecodingSettings::SRGB: case KDcrawIface::RawDecodingSettings::SRGB:
{ {
filePath = KGlobal::dirs()->findResourceDir("profiles", "srgb.icm"); filePath = TDEGlobal::dirs()->findResourceDir("profiles", "srgb.icm");
filePath.append("srgb.icm"); filePath.append("srgb.icm");
break; break;
} }
case KDcrawIface::RawDecodingSettings::ADOBERGB: case KDcrawIface::RawDecodingSettings::ADOBERGB:
{ {
filePath = KGlobal::dirs()->findResourceDir("profiles", "adobergb.icm"); filePath = TDEGlobal::dirs()->findResourceDir("profiles", "adobergb.icm");
filePath.append("adobergb.icm"); filePath.append("adobergb.icm");
break; break;
} }
case KDcrawIface::RawDecodingSettings::WIDEGAMMUT: case KDcrawIface::RawDecodingSettings::WIDEGAMMUT:
{ {
filePath = KGlobal::dirs()->findResourceDir("profiles", "widegamut.icm"); filePath = TDEGlobal::dirs()->findResourceDir("profiles", "widegamut.icm");
filePath.append("widegamut.icm"); filePath.append("widegamut.icm");
break; break;
} }
case KDcrawIface::RawDecodingSettings::PROPHOTO: case KDcrawIface::RawDecodingSettings::PROPHOTO:
{ {
filePath = KGlobal::dirs()->findResourceDir("profiles", "prophoto.icm"); filePath = TDEGlobal::dirs()->findResourceDir("profiles", "prophoto.icm");
filePath.append("prophoto.icm"); filePath.append("prophoto.icm");
break; break;
} }

@ -474,7 +474,7 @@ bool SendImages::invokeMailAgent(void)
if ( m_sendImagesDialog->m_mailAgentName->currentText() == "KMail" ) if ( m_sendImagesDialog->m_mailAgentName->currentText() == "KMail" )
{ {
m_mailAgentProc = new KProcess; m_mailAgentProc = new TDEProcess;
*m_mailAgentProc << "kmail"; *m_mailAgentProc << "kmail";
for ( KURL::List::Iterator it = filelist.begin() ; it != filelist.end() ; ++it ) for ( KURL::List::Iterator it = filelist.begin() ; it != filelist.end() ; ++it )
@ -498,7 +498,7 @@ bool SendImages::invokeMailAgent(void)
m_sendImagesDialog->m_mailAgentName->currentText() == "Sylpheed" || m_sendImagesDialog->m_mailAgentName->currentText() == "Sylpheed" ||
m_sendImagesDialog->m_mailAgentName->currentText() == "Sylpheed-Claws" ) m_sendImagesDialog->m_mailAgentName->currentText() == "Sylpheed-Claws" )
{ {
m_mailAgentProc = new KProcess; m_mailAgentProc = new TDEProcess;
if ( m_sendImagesDialog->m_mailAgentName->currentText() == "Claws Mail") if ( m_sendImagesDialog->m_mailAgentName->currentText() == "Claws Mail")
*m_mailAgentProc << "claws-mail"; *m_mailAgentProc << "claws-mail";
@ -525,7 +525,7 @@ bool SendImages::invokeMailAgent(void)
if ( m_sendImagesDialog->m_mailAgentName->currentText() == "Balsa" ) if ( m_sendImagesDialog->m_mailAgentName->currentText() == "Balsa" )
{ {
m_mailAgentProc = new KProcess; m_mailAgentProc = new TDEProcess;
*m_mailAgentProc << "balsa" << "-m" << "mailto:"; *m_mailAgentProc << "balsa" << "-m" << "mailto:";
for ( KURL::List::Iterator it = filelist.begin() ; it != filelist.end() ; ++it ) for ( KURL::List::Iterator it = filelist.begin() ; it != filelist.end() ; ++it )
@ -547,7 +547,7 @@ bool SendImages::invokeMailAgent(void)
if ( m_sendImagesDialog->m_mailAgentName->currentText() == "Evolution" ) if ( m_sendImagesDialog->m_mailAgentName->currentText() == "Evolution" )
{ {
m_mailAgentProc = new KProcess; m_mailAgentProc = new TDEProcess;
*m_mailAgentProc << "evolution"; *m_mailAgentProc << "evolution";
TQString Temp = "mailto:?subject="; TQString Temp = "mailto:?subject=";
@ -576,7 +576,7 @@ bool SendImages::invokeMailAgent(void)
m_sendImagesDialog->m_mailAgentName->currentText() == "Thunderbird" || m_sendImagesDialog->m_mailAgentName->currentText() == "Thunderbird" ||
m_sendImagesDialog->m_mailAgentName->currentText() == "GmailAgent") m_sendImagesDialog->m_mailAgentName->currentText() == "GmailAgent")
{ {
m_mailAgentProc = new KProcess; m_mailAgentProc = new TDEProcess;
m_thunderbirdUrl = m_sendImagesDialog->m_ThunderbirdBinPath->url(); m_thunderbirdUrl = m_sendImagesDialog->m_ThunderbirdBinPath->url();
@ -615,15 +615,15 @@ bool SendImages::invokeMailAgent(void)
if (!m_invokedBefore) if (!m_invokedBefore)
{ {
connect(m_mailAgentProc, TQT_SIGNAL(processExited(KProcess *)), connect(m_mailAgentProc, TQT_SIGNAL(processExited(TDEProcess *)),
this, TQT_SLOT(slotMozillaExited(KProcess*))); this, TQT_SLOT(slotMozillaExited(TDEProcess*)));
connect(m_mailAgentProc, TQT_SIGNAL(receivedStderr(KProcess *, char*, int)), connect(m_mailAgentProc, TQT_SIGNAL(receivedStderr(TDEProcess *, char*, int)),
this, TQT_SLOT(slotMozillaReadStderr(KProcess*, char*, int))); this, TQT_SLOT(slotMozillaReadStderr(TDEProcess*, char*, int)));
} }
tqDebug ("%s", Temp.ascii()); tqDebug ("%s", Temp.ascii());
if ( m_mailAgentProc->start(KProcess::NotifyOnExit , KProcess::All) == false ) if ( m_mailAgentProc->start(TDEProcess::NotifyOnExit , TDEProcess::All) == false )
KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()),
i18n("Cannot start '%1' program;\nplease " i18n("Cannot start '%1' program;\nplease "
"check your installation.") "check your installation.")
@ -856,18 +856,18 @@ bool SendImages::resizeImageProcess(const TQString &SourcePath, const TQString &
/** If mozilla, or thunderbird or any derivate isn't already running, start it now, /** If mozilla, or thunderbird or any derivate isn't already running, start it now,
wait 5 seconds and start SlotMozillaTimeout() */ wait 5 seconds and start SlotMozillaTimeout() */
void SendImages::slotMozillaExited(KProcess*) void SendImages::slotMozillaExited(TDEProcess*)
{ {
tqDebug("slotMozillaExited"); tqDebug("slotMozillaExited");
///Here would be the right point to clear the sendlist in order to avoid infinite resendings!! ///Here would be the right point to clear the sendlist in order to avoid infinite resendings!!
m_filesSendList.clear(); m_filesSendList.clear();
///Also disconnect SLOT ///Also disconnect SLOT
m_mailAgentProc->disconnect(TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(slotMozillaExited(KProcess*))); m_mailAgentProc->disconnect(TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotMozillaExited(TDEProcess*)));
tqDebug("Number of elements in m_filesSendList=%d, and in m_filesSendList_copy=%d)",(int)m_filesSendList.size(),(int)m_filesSendList_copy.size()); tqDebug("Number of elements in m_filesSendList=%d, and in m_filesSendList_copy=%d)",(int)m_filesSendList.size(),(int)m_filesSendList_copy.size());
if ( m_mozillaStdErr.find("No running window found") != -1 ) // No remote Mozilla | Netscape | if ( m_mozillaStdErr.find("No running window found") != -1 ) // No remote Mozilla | Netscape |
{ // Thunderbird env. loaded ! { // Thunderbird env. loaded !
m_mailAgentProc2 = new KProcess; // Init a new env. m_mailAgentProc2 = new TDEProcess; // Init a new env.
if ( m_sendImagesDialog->m_mailAgentName->currentText() == "Mozilla" ) if ( m_sendImagesDialog->m_mailAgentName->currentText() == "Mozilla" )
*m_mailAgentProc2 << "mozilla" << "-mail"; *m_mailAgentProc2 << "mozilla" << "-mail";
@ -909,7 +909,7 @@ void SendImages::slotMozillaTimeout(void)
} }
///Handles mozillas errors ///Handles mozillas errors
void SendImages::slotMozillaReadStderr(KProcess*, char *buffer, int buflen) void SendImages::slotMozillaReadStderr(TDEProcess*, char *buffer, int buflen)
{ {
m_mozillaStdErr = TQString::fromLocal8Bit(buffer, buflen); m_mozillaStdErr = TQString::fromLocal8Bit(buffer, buflen);
} }

@ -43,7 +43,7 @@ class TQFile;
class TQTimer; class TQTimer;
class TQCustomEvent; class TQCustomEvent;
class KProcess; class TDEProcess;
namespace KIPISendimagesPlugin namespace KIPISendimagesPlugin
{ {
@ -97,10 +97,10 @@ private slots:
///If mozilla, or thunderbird or any derivate isn't already running, ///If mozilla, or thunderbird or any derivate isn't already running,
///start it now, wait 5 seconds and start SlotMozillaTimeout() ///start it now, wait 5 seconds and start SlotMozillaTimeout()
void slotMozillaExited(KProcess* proc); void slotMozillaExited(TDEProcess* proc);
///Handles mozillas errors ///Handles mozillas errors
void slotMozillaReadStderr(KProcess* proc, char *buffer, int buflen); void slotMozillaReadStderr(TDEProcess* proc, char *buffer, int buflen);
private: private:
@ -160,9 +160,9 @@ private:
TQString m_imageFormat; TQString m_imageFormat;
TQString m_thunderbirdUrl; TQString m_thunderbirdUrl;
KProcess *m_mailAgentProc; TDEProcess *m_mailAgentProc;
KProcess *m_mailAgentProc2; TDEProcess *m_mailAgentProc2;
KProcess *m_mailAgentProc3; TDEProcess *m_mailAgentProc3;
/** List of images in the setup dialog.*/ /** List of images in the setup dialog.*/
KURL::List m_images; KURL::List m_images;

@ -134,7 +134,7 @@ void SVEDialog::readConfig()
setFrameWidth(config.readNumEntry("frameWidth", 1)); setFrameWidth(config.readNumEntry("frameWidth", 1));
setStagePadding(config.readNumEntry("stagePadding", 20)); setStagePadding(config.readNumEntry("stagePadding", 20));
setTitle(config.readEntry("title", TQString())); setTitle(config.readEntry("title", TQString()));
m_exportURL->setURL(config.readPathEntry("exporturl", KGlobalSettings::documentPath() + "simpleviewer")); m_exportURL->setURL(config.readPathEntry("exporturl", TDEGlobalSettings::documentPath() + "simpleviewer"));
setResizeExportImages(config.readBoolEntry("resizeExportImages", true)); setResizeExportImages(config.readBoolEntry("resizeExportImages", true));
setImagesExportSize(config.readNumEntry("imagesExportSize", 640)); setImagesExportSize(config.readNumEntry("imagesExportSize", 640));
setMaxImagesDimension(config.readNumEntry("maxImageDimension", 640)); setMaxImagesDimension(config.readNumEntry("maxImageDimension", 640));
@ -291,7 +291,7 @@ void SVEDialog::generalPage()
vgroupbox = new TQVGroupBox(i18n("Save Gallery To"), m_generalPage); vgroupbox = new TQVGroupBox(i18n("Save Gallery To"), m_generalPage);
mainLayout->addWidget(vgroupbox); mainLayout->addWidget(vgroupbox);
m_exportURL = new KURLRequester(KGlobalSettings::documentPath() + "simpleviewer", vgroupbox); m_exportURL = new KURLRequester(TDEGlobalSettings::documentPath() + "simpleviewer", vgroupbox);
m_exportURL->setMode(KFile::Directory | KFile::LocalOnly); m_exportURL->setMode(KFile::Directory | KFile::LocalOnly);
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------

@ -63,7 +63,7 @@ SlideShow::SlideShow(const FileList& fileList, const TQStringList& commentsList,
: TQWidget(0, 0, WStyle_StaysOnTop | WType_Popup | WX11BypassWM | WDestructiveClose) : TQWidget(0, 0, WStyle_StaysOnTop | WType_Popup | WX11BypassWM | WDestructiveClose)
{ {
#if KDE_IS_VERSION(3,2,0) #if KDE_IS_VERSION(3,2,0)
TQRect deskRect = KGlobalSettings::desktopGeometry(this); TQRect deskRect = TDEGlobalSettings::desktopGeometry(this);
m_deskX = deskRect.x(); m_deskX = deskRect.x();
m_deskY = deskRect.y(); m_deskY = deskRect.y();
m_deskWidth = deskRect.width(); m_deskWidth = deskRect.width();

@ -53,7 +53,7 @@ SlideShowGL::SlideShowGL(const TQValueList<TQPair<TQString, int> >& fileList,
WX11BypassWM | WDestructiveClose) WX11BypassWM | WDestructiveClose)
{ {
#if KDE_IS_VERSION(3,2,0) #if KDE_IS_VERSION(3,2,0)
TQRect deskRect = KGlobalSettings::desktopGeometry(this); TQRect deskRect = TDEGlobalSettings::desktopGeometry(this);
m_deskX = deskRect.x(); m_deskX = deskRect.x();
m_deskY = deskRect.y(); m_deskY = deskRect.y();
m_deskWidth = deskRect.width(); m_deskWidth = deskRect.width();

@ -143,7 +143,7 @@ namespace KIPISlideShowPlugin
WX11BypassWM | WDestructiveClose) WX11BypassWM | WDestructiveClose)
{ {
#if KDE_IS_VERSION(3,2,0) #if KDE_IS_VERSION(3,2,0)
TQRect deskRect = KGlobalSettings::desktopGeometry(this); TQRect deskRect = TDEGlobalSettings::desktopGeometry(this);
m_deskX = deskRect.x(); m_deskX = deskRect.x();
m_deskY = deskRect.y(); m_deskY = deskRect.y();
m_deskWidth = deskRect.width(); m_deskWidth = deskRect.width();

@ -72,7 +72,7 @@ void Plugin_Sync::setup(TQWidget* widget)
} }
// Add our directory in to the icon loader dirs. // Add our directory in to the icon loader dirs.
KGlobal::iconLoader()->addAppDir("kipiplugin_sync"); TDEGlobal::iconLoader()->addAppDir("kipiplugin_sync");
mpActionSync = new KAction(i18n("Synchronize..."), mpActionSync = new KAction(i18n("Synchronize..."),
0, 0,

Loading…
Cancel
Save