summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:30:37 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:30:37 -0600
commit00c3041bcca175069e36271b72188965ad1ffcf5 (patch)
treeac654751aa6d89f7da1faf4af1db1121164250b5
parentcee209f8b3fe41533e21171f62ca32c552c2d2b3 (diff)
downloadkipi-plugins-00c3041bcca175069e36271b72188965ad1ffcf5.tar.gz
kipi-plugins-00c3041bcca175069e36271b72188965ad1ffcf5.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
-rw-r--r--ChangeLog14
-rw-r--r--kipi-plugins/ChangeLog14
-rw-r--r--kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp42
-rw-r--r--kipi-plugins/batchprocessimages/batchprocessimagesdialog.h20
-rw-r--r--kipi-plugins/batchprocessimages/borderimagesdialog.cpp2
-rw-r--r--kipi-plugins/batchprocessimages/borderimagesdialog.h2
-rw-r--r--kipi-plugins/batchprocessimages/colorimagesdialog.cpp2
-rw-r--r--kipi-plugins/batchprocessimages/colorimagesdialog.h2
-rw-r--r--kipi-plugins/batchprocessimages/convertimagesdialog.cpp2
-rw-r--r--kipi-plugins/batchprocessimages/convertimagesdialog.h2
-rw-r--r--kipi-plugins/batchprocessimages/effectimagesdialog.cpp2
-rw-r--r--kipi-plugins/batchprocessimages/effectimagesdialog.h2
-rw-r--r--kipi-plugins/batchprocessimages/filterimagesdialog.cpp2
-rw-r--r--kipi-plugins/batchprocessimages/filterimagesdialog.h2
-rw-r--r--kipi-plugins/batchprocessimages/imagepreview.cpp24
-rw-r--r--kipi-plugins/batchprocessimages/imagepreview.h8
-rw-r--r--kipi-plugins/batchprocessimages/recompressimagesdialog.cpp2
-rw-r--r--kipi-plugins/batchprocessimages/recompressimagesdialog.h2
-rw-r--r--kipi-plugins/batchprocessimages/resizeimagesdialog.cpp2
-rw-r--r--kipi-plugins/batchprocessimages/resizeimagesdialog.h2
-rw-r--r--kipi-plugins/calendar/calformatter.cpp14
-rw-r--r--kipi-plugins/calendar/calpainter.cpp28
-rw-r--r--kipi-plugins/calendar/calselect.cpp22
-rw-r--r--kipi-plugins/calendar/calsettings.cpp2
-rw-r--r--kipi-plugins/calendar/calwidget.cpp4
-rw-r--r--kipi-plugins/calendar/calwizard.cpp18
-rw-r--r--kipi-plugins/calendar/monthwidget.cpp4
-rw-r--r--kipi-plugins/cdarchiving/cdarchiving.cpp46
-rw-r--r--kipi-plugins/cdarchiving/cdarchiving.h6
-rw-r--r--kipi-plugins/cdarchiving/cdarchivingdialog.cpp2
-rw-r--r--kipi-plugins/common/libkipiplugins/kpaboutdata.cpp4
-rw-r--r--kipi-plugins/findimages/finddupplicateimages.cpp2
-rw-r--r--kipi-plugins/galleryexport/plugin_galleryexport.cpp2
-rw-r--r--kipi-plugins/gpssync/gpsbabelbinary.cpp10
-rw-r--r--kipi-plugins/gpssync/gpsbabelbinary.h4
-rw-r--r--kipi-plugins/gpssync/gpssyncdialog.cpp2
-rw-r--r--kipi-plugins/htmlexport/theme.cpp2
-rw-r--r--kipi-plugins/ipodexport/ipodexportdialog.cpp10
-rw-r--r--kipi-plugins/jpeglossless/convert2grayscale.cpp10
-rw-r--r--kipi-plugins/jpeglossless/convert2grayscale.h4
-rw-r--r--kipi-plugins/jpeglossless/imageflip.cpp10
-rw-r--r--kipi-plugins/jpeglossless/imageflip.h4
-rw-r--r--kipi-plugins/jpeglossless/imagerotate.cpp10
-rw-r--r--kipi-plugins/jpeglossless/imagerotate.h4
-rw-r--r--kipi-plugins/jpeglossless/utils.cpp10
-rw-r--r--kipi-plugins/jpeglossless/utils.h4
-rw-r--r--kipi-plugins/metadataedit/plugin_metadataedit.cpp4
-rw-r--r--kipi-plugins/mpegencoder/kimg2mpg.cpp22
-rw-r--r--kipi-plugins/mpegencoder/kimg2mpg.h8
-rw-r--r--kipi-plugins/mpegencoder/kimg2mpgbase.ui4
-rw-r--r--kipi-plugins/printwizard/frmprintwizard.cpp4
-rw-r--r--kipi-plugins/printwizard/frmprintwizard.h4
-rw-r--r--kipi-plugins/rawconverter/actionthread.cpp2
-rw-r--r--kipi-plugins/rawconverter/rawdecodingiface.cpp10
-rw-r--r--kipi-plugins/sendimages/sendimages.cpp28
-rw-r--r--kipi-plugins/sendimages/sendimages.h12
-rw-r--r--kipi-plugins/simpleviewerexport/svedialog.cpp4
-rw-r--r--kipi-plugins/slideshow/slideshow.cpp2
-rw-r--r--kipi-plugins/slideshow/slideshowgl.cpp2
-rw-r--r--kipi-plugins/slideshow/slideshowkb.cpp2
-rw-r--r--kipi-plugins/sync/plugin_sync.cpp2
61 files changed, 249 insertions, 249 deletions
diff --git a/ChangeLog b/ChangeLog
index 72c3f24..c57a935 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2005,7 +2005,7 @@ V 0.1.5-rc2 - 2008-02-01
Kipi-plugins from KDE3 branch : Batch Process : restore metadata
properlly with JPEG file during conversion.
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.
BUG: 152210
@@ -2022,7 +2022,7 @@ V 0.1.5-rc2 - 2008-02-01
kipi-plugins/batchprocessimages/convertimagesdialog.cpp,
kipi-plugins/batchprocessimages/convertimagesdialog.h,
kipi-plugins/batchprocessimages/imagepreview.cpp:
- Do not test is KProcess is out imediatly.
+ Do not test is TDEProcess is out imediatly.
BUG: 151578
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
properlly with JPEG file during conversion.
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.
BUG: 152210
@@ -2692,7 +2692,7 @@ V 0.1.5-rc1 - 2007-12-29
kipi-plugins/batchprocessimages/convertimagesdialog.cpp,
kipi-plugins/batchprocessimages/convertimagesdialog.h,
kipi-plugins/batchprocessimages/imagepreview.cpp:
- Do not test is KProcess is out imediatly.
+ Do not test is TDEProcess is out imediatly.
BUG: 151578
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 from KDE3 branch : Bugfix with ImageMagick
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
@@ -10191,7 +10191,7 @@ v 0.1.3-beta1 - 2006-11-29
rawconverter/singledialog.cpp:
kipi-plugins from trunk : Raw Converter : full cancelable (when
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
digiKam RAW image loader
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
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
diff --git a/kipi-plugins/ChangeLog b/kipi-plugins/ChangeLog
index 19a9512..b6d14a9 100644
--- a/kipi-plugins/ChangeLog
+++ b/kipi-plugins/ChangeLog
@@ -2131,7 +2131,7 @@ V 0.1.5-rc2 - 2008-02-01
Kipi-plugins from KDE3 branch : Batch Process : restore metadata
properlly with JPEG file during conversion.
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.
BUG: 152210
@@ -2148,7 +2148,7 @@ V 0.1.5-rc2 - 2008-02-01
kipi-plugins/batchprocessimages/convertimagesdialog.cpp,
kipi-plugins/batchprocessimages/convertimagesdialog.h,
kipi-plugins/batchprocessimages/imagepreview.cpp:
- Do not test is KProcess is out imediatly.
+ Do not test is TDEProcess is out imediatly.
BUG: 151578
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
properlly with JPEG file during conversion.
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.
BUG: 152210
@@ -2818,7 +2818,7 @@ V 0.1.5-rc1 - 2007-12-29
kipi-plugins/batchprocessimages/convertimagesdialog.cpp,
kipi-plugins/batchprocessimages/convertimagesdialog.h,
kipi-plugins/batchprocessimages/imagepreview.cpp:
- Do not test is KProcess is out imediatly.
+ Do not test is TDEProcess is out imediatly.
BUG: 151578
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 from KDE3 branch : Bugfix with ImageMagick
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
@@ -10317,7 +10317,7 @@ v 0.1.3-beta1 - 2006-11-29
rawconverter/singledialog.cpp:
kipi-plugins from trunk : Raw Converter : full cancelable (when
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
digiKam RAW image loader
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
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
diff --git a/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp b/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp
index d71fbed..23afe13 100644
--- a/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp
@@ -590,21 +590,21 @@ bool BatchProcessImagesDialog::startProcess(void)
}
m_commandLine = TQString();
- m_ProcessusProc = new KProcess;
+ m_ProcessusProc = new TDEProcess;
m_commandLine.append(makeProcess(m_ProcessusProc, item, targetAlbum));
item->changeOutputMess(m_commandLine + "\n\n");
- connect(m_ProcessusProc, TQT_SIGNAL(processExited(KProcess *)),
- this, TQT_SLOT(slotProcessDone(KProcess*)));
+ connect(m_ProcessusProc, TQT_SIGNAL(processExited(TDEProcess *)),
+ this, TQT_SLOT(slotProcessDone(TDEProcess*)));
- connect(m_ProcessusProc, TQT_SIGNAL(receivedStdout(KProcess *, char*, int)),
- this, TQT_SLOT(slotReadStd(KProcess*, char*, int)));
+ connect(m_ProcessusProc, TQT_SIGNAL(receivedStdout(TDEProcess *, char*, int)),
+ this, TQT_SLOT(slotReadStd(TDEProcess*, char*, int)));
- connect(m_ProcessusProc, TQT_SIGNAL(receivedStderr(KProcess *, char*, int)),
- this, TQT_SLOT(slotReadStd(KProcess*, char*, int)));
+ connect(m_ProcessusProc, TQT_SIGNAL(receivedStderr(TDEProcess *, 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)
{
KMessageBox::error(this, i18n("Cannot start 'convert' program from 'ImageMagick' package;\n"
@@ -615,13 +615,13 @@ bool BatchProcessImagesDialog::startProcess(void)
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() );
item->changeOutputMess( TQString::fromLocal8Bit(buffer, buflen) );
}
-void BatchProcessImagesDialog::slotProcessDone(KProcess* proc)
+void BatchProcessImagesDialog::slotProcessDone(TDEProcess* proc)
{
if ( m_convertStatus == PROCESS_DONE )
{
@@ -802,23 +802,23 @@ void BatchProcessImagesDialog::slotPreview(void)
this, TQT_SLOT(slotPreviewStop()));
m_previewOutput = "";
- m_PreviewProc = new KProcess;
+ m_PreviewProc = new TDEProcess;
m_previewOutput.append(makeProcess(m_PreviewProc, item, TQString(), true));
*m_PreviewProc << m_tmpFolder + "/" + TQString::number(getpid()) + "preview.PNG";
m_previewOutput.append( " " + m_tmpFolder + "/" + TQString::number(getpid()) + "preview.PNG\n\n");
- connect(m_PreviewProc, TQT_SIGNAL(processExited(KProcess *)),
- this, TQT_SLOT(slotPreviewProcessDone(KProcess*)));
+ connect(m_PreviewProc, TQT_SIGNAL(processExited(TDEProcess *)),
+ this, TQT_SLOT(slotPreviewProcessDone(TDEProcess*)));
- connect(m_PreviewProc, TQT_SIGNAL(receivedStdout(KProcess *, char*, int)),
- this, TQT_SLOT(slotPreviewReadStd(KProcess*, char*, int)));
+ connect(m_PreviewProc, TQT_SIGNAL(receivedStdout(TDEProcess *, char*, int)),
+ this, TQT_SLOT(slotPreviewReadStd(TDEProcess*, char*, int)));
- connect(m_PreviewProc, TQT_SIGNAL(receivedStderr(KProcess *, char*, int)),
- this, TQT_SLOT(slotPreviewReadStd(KProcess*, char*, int)));
+ connect(m_PreviewProc, TQT_SIGNAL(receivedStderr(TDEProcess *, 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)
{
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) );
}
-void BatchProcessImagesDialog::slotPreviewProcessDone(KProcess* proc)
+void BatchProcessImagesDialog::slotPreviewProcessDone(TDEProcess* proc)
{
if (!m_PreviewProc->normalExit())
{
@@ -1078,7 +1078,7 @@ TQString BatchProcessImagesDialog::RenameTargetImageFile(TQFileInfo *fi)
return (NewDestUrl.path());
}
-TQString BatchProcessImagesDialog::extractArguments(KProcess *proc)
+TQString BatchProcessImagesDialog::extractArguments(TDEProcess *proc)
{
TQString retArguments;
TQValueList<TQCString> argumentsList = proc->args();
diff --git a/kipi-plugins/batchprocessimages/batchprocessimagesdialog.h b/kipi-plugins/batchprocessimages/batchprocessimagesdialog.h
index 3ff3511..5ddf675 100644
--- a/kipi-plugins/batchprocessimages/batchprocessimagesdialog.h
+++ b/kipi-plugins/batchprocessimages/batchprocessimagesdialog.h
@@ -64,7 +64,7 @@ class TQListViewItemIterator;
class TQListViewItem;
class TQGroupBox;
-class KProcess;
+class TDEProcess;
class KConfig;
class KProgress;
class KURL;
@@ -98,12 +98,12 @@ private slots:
void slotOk( void );
void slotProcessStart(void);
- void slotProcessDone(KProcess* proc);
- void slotReadStd(KProcess* proc, char *buffer, int buflen);
+ void slotProcessDone(TDEProcess* proc);
+ void slotReadStd(TDEProcess* proc, char *buffer, int buflen);
void slotPreview(void);
- void slotPreviewProcessDone(KProcess* proc);
- void slotPreviewReadStd(KProcess* proc, char *buffer, int buflen);
+ void slotPreviewProcessDone(TDEProcess* proc);
+ void slotPreviewReadStd(TDEProcess* proc, char *buffer, int buflen);
void slotPreviewStop( void );
void slotListDoubleClicked(TQListViewItem *itemClicked);
@@ -161,8 +161,8 @@ private slots:
int m_progressStatus;
int m_nbItem;
- KProcess *m_ProcessusProc;
- KProcess *m_PreviewProc;
+ TDEProcess *m_ProcessusProc;
+ TDEProcess *m_PreviewProc;
TQListViewItemIterator *m_listFile2Process_iterator;
@@ -192,10 +192,10 @@ private slots:
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).
- TQString extractArguments(KProcess *proc);
+ TQString extractArguments(TDEProcess *proc);
// --------------------------------------------------------------------------------------------------------
// 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.
// If 'albumDest' = 0L ==> preview process.
- virtual TQString makeProcess(KProcess* /*proc*/, BatchProcessImagesItem */*item*/,
+ virtual TQString makeProcess(TDEProcess* /*proc*/, BatchProcessImagesItem */*item*/,
const TQString& /*albumDest*/ = TQString(),
bool /*previewMode*/ = false)
{ return TQString(); };
diff --git a/kipi-plugins/batchprocessimages/borderimagesdialog.cpp b/kipi-plugins/batchprocessimages/borderimagesdialog.cpp
index 1aac24a..c6e1b3c 100644
--- a/kipi-plugins/batchprocessimages/borderimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/borderimagesdialog.cpp
@@ -248,7 +248,7 @@ void BorderImagesDialog::saveSettings(void)
delete m_config;
}
-TQString BorderImagesDialog::makeProcess(KProcess* proc, BatchProcessImagesItem *item,
+TQString BorderImagesDialog::makeProcess(TDEProcess* proc, BatchProcessImagesItem *item,
const TQString& albumDest, bool previewMode)
{
*proc << "convert";
diff --git a/kipi-plugins/batchprocessimages/borderimagesdialog.h b/kipi-plugins/batchprocessimages/borderimagesdialog.h
index b846b63..51c8b15 100644
--- a/kipi-plugins/batchprocessimages/borderimagesdialog.h
+++ b/kipi-plugins/batchprocessimages/borderimagesdialog.h
@@ -64,7 +64,7 @@ Q_OBJECT
int m_bevelWidth;
TQColor m_frameColor;
- TQString makeProcess(KProcess* proc, BatchProcessImagesItem *item,
+ TQString makeProcess(TDEProcess* proc, BatchProcessImagesItem *item,
const TQString& albumDest, bool previewMode);
void readSettings(void);
diff --git a/kipi-plugins/batchprocessimages/colorimagesdialog.cpp b/kipi-plugins/batchprocessimages/colorimagesdialog.cpp
index bca812a..392172c 100644
--- a/kipi-plugins/batchprocessimages/colorimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/colorimagesdialog.cpp
@@ -237,7 +237,7 @@ void ColorImagesDialog::saveSettings(void)
delete m_config;
}
-TQString ColorImagesDialog::makeProcess(KProcess* proc, BatchProcessImagesItem *item,
+TQString ColorImagesDialog::makeProcess(TDEProcess* proc, BatchProcessImagesItem *item,
const TQString& albumDest, bool previewMode)
{
*proc << "convert";
diff --git a/kipi-plugins/batchprocessimages/colorimagesdialog.h b/kipi-plugins/batchprocessimages/colorimagesdialog.h
index 9c24689..fe5a7fa 100644
--- a/kipi-plugins/batchprocessimages/colorimagesdialog.h
+++ b/kipi-plugins/batchprocessimages/colorimagesdialog.h
@@ -57,7 +57,7 @@ Q_OBJECT
int m_segmentCluster;
int m_segmentSmooth;
- TQString makeProcess(KProcess* proc, BatchProcessImagesItem *item,
+ TQString makeProcess(TDEProcess* proc, BatchProcessImagesItem *item,
const TQString& albumDest, bool previewMode);
void readSettings(void);
diff --git a/kipi-plugins/batchprocessimages/convertimagesdialog.cpp b/kipi-plugins/batchprocessimages/convertimagesdialog.cpp
index 1e7d15e..7382023 100644
--- a/kipi-plugins/batchprocessimages/convertimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/convertimagesdialog.cpp
@@ -243,7 +243,7 @@ void ConvertImagesDialog::saveSettings(void)
delete m_config;
}
-TQString ConvertImagesDialog::makeProcess(KProcess* proc, BatchProcessImagesItem *item,
+TQString ConvertImagesDialog::makeProcess(TDEProcess* proc, BatchProcessImagesItem *item,
const TQString& albumDest, bool previewMode)
{
*proc << "convert";
diff --git a/kipi-plugins/batchprocessimages/convertimagesdialog.h b/kipi-plugins/batchprocessimages/convertimagesdialog.h
index b3d0128..8ce6f3c 100644
--- a/kipi-plugins/batchprocessimages/convertimagesdialog.h
+++ b/kipi-plugins/batchprocessimages/convertimagesdialog.h
@@ -57,7 +57,7 @@ Q_OBJECT
TQString m_TIFFCompressionAlgo;
TQString m_TGACompressionAlgo;
- TQString makeProcess(KProcess* proc, BatchProcessImagesItem *item,
+ TQString makeProcess(TDEProcess* proc, BatchProcessImagesItem *item,
const TQString& albumDest, bool previewMode);
void processDone();
diff --git a/kipi-plugins/batchprocessimages/effectimagesdialog.cpp b/kipi-plugins/batchprocessimages/effectimagesdialog.cpp
index 98cbd8d..97f391f 100644
--- a/kipi-plugins/batchprocessimages/effectimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/effectimagesdialog.cpp
@@ -322,7 +322,7 @@ void EffectImagesDialog::saveSettings(void)
delete m_config;
}
-TQString EffectImagesDialog::makeProcess(KProcess* proc, BatchProcessImagesItem *item,
+TQString EffectImagesDialog::makeProcess(TDEProcess* proc, BatchProcessImagesItem *item,
const TQString& albumDest, bool previewMode)
{
*proc << "convert";
diff --git a/kipi-plugins/batchprocessimages/effectimagesdialog.h b/kipi-plugins/batchprocessimages/effectimagesdialog.h
index 8f3fd14..3efa3cb 100644
--- a/kipi-plugins/batchprocessimages/effectimagesdialog.h
+++ b/kipi-plugins/batchprocessimages/effectimagesdialog.h
@@ -68,7 +68,7 @@ Q_OBJECT
int m_waveAmplitude;
int m_waveLength;
- TQString makeProcess(KProcess* proc, BatchProcessImagesItem *item,
+ TQString makeProcess(TDEProcess* proc, BatchProcessImagesItem *item,
const TQString& albumDest, bool previewMode);
void readSettings(void);
diff --git a/kipi-plugins/batchprocessimages/filterimagesdialog.cpp b/kipi-plugins/batchprocessimages/filterimagesdialog.cpp
index ca5ecfc..fbcb3d3 100644
--- a/kipi-plugins/batchprocessimages/filterimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/filterimagesdialog.cpp
@@ -269,7 +269,7 @@ void FilterImagesDialog::saveSettings(void)
delete m_config;
}
-TQString FilterImagesDialog::makeProcess(KProcess* proc, BatchProcessImagesItem *item,
+TQString FilterImagesDialog::makeProcess(TDEProcess* proc, BatchProcessImagesItem *item,
const TQString& albumDest, bool previewMode)
{
*proc << "convert";
diff --git a/kipi-plugins/batchprocessimages/filterimagesdialog.h b/kipi-plugins/batchprocessimages/filterimagesdialog.h
index cb7b9ce..9d8b2db 100644
--- a/kipi-plugins/batchprocessimages/filterimagesdialog.h
+++ b/kipi-plugins/batchprocessimages/filterimagesdialog.h
@@ -63,7 +63,7 @@ Q_OBJECT
int m_unsharpenPercent;
int m_unsharpenThreshold;
- TQString makeProcess(KProcess* proc, BatchProcessImagesItem *item,
+ TQString makeProcess(TDEProcess* proc, BatchProcessImagesItem *item,
const TQString& albumDest, bool previewMode);
void readSettings(void);
diff --git a/kipi-plugins/batchprocessimages/imagepreview.cpp b/kipi-plugins/batchprocessimages/imagepreview.cpp
index 964c0de..1cfcca9 100644
--- a/kipi-plugins/batchprocessimages/imagepreview.cpp
+++ b/kipi-plugins/batchprocessimages/imagepreview.cpp
@@ -205,9 +205,9 @@ PixmapView::PixmapView(bool cropAction, TQWidget *parent, const char *name)
horizontalScrollBar()->setPageStep( 1 );
verticalScrollBar()->setLineStep( 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");
- m_handCursor = new TQCursor( KGlobal::dirs()->findResourceDir("kipi_handcursor", "handcursor.png")
+ m_handCursor = new TQCursor( TDEGlobal::dirs()->findResourceDir("kipi_handcursor", "handcursor.png")
+ "handcursor.png" );
}
@@ -253,7 +253,7 @@ void PixmapView::PreviewCal(const TQString &ImagePath, const TQString &/*tmpPath
p.end();
m_previewOutput ="convert";
- m_PreviewProc = new KProcess;
+ m_PreviewProc = new TDEProcess;
*m_PreviewProc << "convert";
*m_PreviewProc << "-verbose";
@@ -267,16 +267,16 @@ void PixmapView::PreviewCal(const TQString &ImagePath, const TQString &/*tmpPath
*m_PreviewProc << m_previewFileName;
m_previewOutput.append( " -verbose " + ImagePath + " " + m_previewFileName + "\n\n");
- connect(m_PreviewProc, TQT_SIGNAL(processExited(KProcess *)),
- this, TQT_SLOT(PreviewProcessDone(KProcess*)));
+ connect(m_PreviewProc, TQT_SIGNAL(processExited(TDEProcess *)),
+ this, TQT_SLOT(PreviewProcessDone(TDEProcess*)));
- connect(m_PreviewProc, TQT_SIGNAL(receivedStdout(KProcess *, char*, int)),
- this, TQT_SLOT(slotPreviewReadStd(KProcess*, char*, int)));
+ connect(m_PreviewProc, TQT_SIGNAL(receivedStdout(TDEProcess *, char*, int)),
+ this, TQT_SLOT(slotPreviewReadStd(TDEProcess*, char*, int)));
- connect(m_PreviewProc, TQT_SIGNAL(receivedStderr(KProcess *, char*, int)),
- this, TQT_SLOT(slotPreviewReadStd(KProcess*, char*, int)));
+ connect(m_PreviewProc, TQT_SIGNAL(receivedStderr(TDEProcess *, 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)
{
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) );
}
-void PixmapView::PreviewProcessDone(KProcess* proc)
+void PixmapView::PreviewProcessDone(TDEProcess* proc)
{
int ValRet = proc->exitStatus();
kdDebug (51000) << "Convert exit (" << ValRet << ")" << endl;
diff --git a/kipi-plugins/batchprocessimages/imagepreview.h b/kipi-plugins/batchprocessimages/imagepreview.h
index 8d03528..0a6a824 100644
--- a/kipi-plugins/batchprocessimages/imagepreview.h
+++ b/kipi-plugins/batchprocessimages/imagepreview.h
@@ -43,7 +43,7 @@ class TQLCDNumber;
class TQSlider;
class TQPushButton;
-class KProcess;
+class TDEProcess;
namespace KIPIBatchProcessImagesPlugin
{
@@ -65,8 +65,8 @@ public:
private slots:
- void slotPreviewReadStd(KProcess* proc, char *buffer, int buflen);
- void PreviewProcessDone(KProcess* proc);
+ void slotPreviewReadStd(TDEProcess* proc, char *buffer, int buflen);
+ void PreviewProcessDone(TDEProcess* proc);
void contentsWheelEvent( TQWheelEvent * e );
void contentsMousePressEvent ( TQMouseEvent * e );
void contentsMouseReleaseEvent ( TQMouseEvent * e );
@@ -87,7 +87,7 @@ protected:
int m_xpos;
int m_ypos;
- KProcess *m_PreviewProc;
+ TDEProcess *m_PreviewProc;
TQString m_previewOutput;
TQString m_previewFileName;
diff --git a/kipi-plugins/batchprocessimages/recompressimagesdialog.cpp b/kipi-plugins/batchprocessimages/recompressimagesdialog.cpp
index ab1d959..f228a80 100644
--- a/kipi-plugins/batchprocessimages/recompressimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/recompressimagesdialog.cpp
@@ -174,7 +174,7 @@ void RecompressImagesDialog::saveSettings(void)
delete m_config;
}
-TQString RecompressImagesDialog::makeProcess(KProcess* proc, BatchProcessImagesItem *item,
+TQString RecompressImagesDialog::makeProcess(TDEProcess* proc, BatchProcessImagesItem *item,
const TQString& albumDest, bool previewMode)
{
*proc << "convert";
diff --git a/kipi-plugins/batchprocessimages/recompressimagesdialog.h b/kipi-plugins/batchprocessimages/recompressimagesdialog.h
index 3eca8f1..e313297 100644
--- a/kipi-plugins/batchprocessimages/recompressimagesdialog.h
+++ b/kipi-plugins/batchprocessimages/recompressimagesdialog.h
@@ -56,7 +56,7 @@ Q_OBJECT
TQString m_TIFFCompressionAlgo;
TQString m_TGACompressionAlgo;
- TQString makeProcess(KProcess* proc, BatchProcessImagesItem *item,
+ TQString makeProcess(TDEProcess* proc, BatchProcessImagesItem *item,
const TQString& albumDest, bool previewMode);
void readSettings(void);
diff --git a/kipi-plugins/batchprocessimages/resizeimagesdialog.cpp b/kipi-plugins/batchprocessimages/resizeimagesdialog.cpp
index 3de652c..605efe2 100644
--- a/kipi-plugins/batchprocessimages/resizeimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/resizeimagesdialog.cpp
@@ -294,7 +294,7 @@ void ResizeImagesDialog::saveSettings(void)
delete m_config;
}
-TQString ResizeImagesDialog::makeProcess(KProcess* proc, BatchProcessImagesItem *item,
+TQString ResizeImagesDialog::makeProcess(TDEProcess* proc, BatchProcessImagesItem *item,
const TQString& albumDest, bool )
{
TQImage img;
diff --git a/kipi-plugins/batchprocessimages/resizeimagesdialog.h b/kipi-plugins/batchprocessimages/resizeimagesdialog.h
index b639f58..899fa73 100644
--- a/kipi-plugins/batchprocessimages/resizeimagesdialog.h
+++ b/kipi-plugins/batchprocessimages/resizeimagesdialog.h
@@ -73,7 +73,7 @@ Q_OBJECT
int m_fixedHeight;
int m_quality;
- TQString makeProcess(KProcess* proc, BatchProcessImagesItem *item,
+ TQString makeProcess(TDEProcess* proc, BatchProcessImagesItem *item,
const TQString& albumDest, bool previewMode);
void readSettings(void);
diff --git a/kipi-plugins/calendar/calformatter.cpp b/kipi-plugins/calendar/calformatter.cpp
index f0f8f4c..8acc8d8 100644
--- a/kipi-plugins/calendar/calformatter.cpp
+++ b/kipi-plugins/calendar/calformatter.cpp
@@ -99,8 +99,8 @@ void CalFormatter::init(int year, const TQString & ohFile, const TQString & fhFi
calendar = new KCal::CalendarLocal("UTC");
if (calendar->load(ohFile)) {
TQDate dtFirst, dtLast;
- KGlobal::locale()->calendar()->setYMD(dtFirst, year_, 1, 1);
- KGlobal::locale()->calendar()->setYMD(dtLast, year_ + 1, 1, 1);
+ TDEGlobal::locale()->calendar()->setYMD(dtFirst, year_, 1, 1);
+ TDEGlobal::locale()->calendar()->setYMD(dtLast, year_ + 1, 1, 1);
dtLast = dtLast.addDays(-1);
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)
{
TQDate dt;
- KGlobal::locale()->calendar()->setYMD(dt, year_, month, day);
- return (dt.dayOfWeek() == KGlobal::locale()->calendar()->weekDayOfPray());
+ TDEGlobal::locale()->calendar()->setYMD(dt, year_, month, day);
+ 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)
{
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));
}
@@ -177,7 +177,7 @@ bool KIPICalendarPlugin::CalFormatter::isSpecial(int month, int day)
TQColor KIPICalendarPlugin::CalFormatter::getDayColor(int month, int day)
{
TQDate dt;
- KGlobal::locale()->calendar()->setYMD(dt, year_, month, day);
+ TDEGlobal::locale()->calendar()->setYMD(dt, year_, month, day);
if (isPrayDay(month, day))
return TQt::red;
@@ -199,7 +199,7 @@ TQColor KIPICalendarPlugin::CalFormatter::getDayColor(int month, int day)
TQString KIPICalendarPlugin::CalFormatter::getDayDescr(int month, int day)
{
TQDate dt;
- KGlobal::locale()->calendar()->setYMD(dt, year_, month, day);
+ TDEGlobal::locale()->calendar()->setYMD(dt, year_, month, day);
TQString ret;
diff --git a/kipi-plugins/calendar/calpainter.cpp b/kipi-plugins/calendar/calpainter.cpp
index d527eaf..7e791a8 100644
--- a/kipi-plugins/calendar/calpainter.cpp
+++ b/kipi-plugins/calendar/calpainter.cpp
@@ -88,19 +88,19 @@ void CalPainter::paint(bool useDeviceMetrics)
// --------------------------------------------------
int days[42];
- int startDayOffset = KGlobal::locale()->weekStartDay();
+ int startDayOffset = TDEGlobal::locale()->weekStartDay();
for (int i=0; i<42; i++)
days[i] = -1;
TQDate d;
- KGlobal::locale()->calendar()->setYMD(d, year_, month_, 1);
+ TDEGlobal::locale()->calendar()->setYMD(d, year_, month_, 1);
int s = d.dayOfWeek();
if (s+7-startDayOffset >= 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;
}
@@ -217,10 +217,10 @@ void CalPainter::paint(bool useDeviceMetrics)
TQString::number(year_));
#if KDE_IS_VERSION(3,2,0)
painter->drawText(rCalHeader, TQt::AlignRight|TQt::AlignVCenter,
- KGlobal::locale()->calendar()->monthName(month_, year_));
+ TDEGlobal::locale()->calendar()->monthName(month_, year_));
#else
painter->drawText(rCalHeader, TQt::AlignRight|TQt::AlignVCenter,
- KGlobal::locale()->monthName(month_));
+ TDEGlobal::locale()->monthName(month_));
#endif
painter->restore();
@@ -251,10 +251,10 @@ void CalPainter::paint(bool useDeviceMetrics)
rsmall.setHeight(r.height() - 2);
#if KDE_IS_VERSION(3,2,0)
painter->drawText(rsmall, TQt::AlignRight|TQt::AlignBottom,
- KGlobal::locale()->calendar()->weekDayName(dayname, true));
+ TDEGlobal::locale()->calendar()->weekDayName(dayname, true));
#else
painter->drawText(rsmall, TQt::AlignRight|TQt::AlignBottom,
- KGlobal::locale()->weekDayName(dayname, true));
+ TDEGlobal::locale()->weekDayName(dayname, true));
#endif
}
@@ -315,19 +315,19 @@ CalBlockPainter::CalBlockPainter(TQObject *parent, int year, int month,
// --------------------------------------------------
int days[42];
- int startDayOffset = KGlobal::locale()->weekStartDay();
+ int startDayOffset = TDEGlobal::locale()->weekStartDay();
for (int i=0; i<42; i++)
days[i] = -1;
TQDate d;
- KGlobal::locale()->calendar()->setYMD(d, year, month, 1);
+ TDEGlobal::locale()->calendar()->setYMD(d, year, month, 1);
int s = d.dayOfWeek();
if (s+7-startDayOffset >= 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;
}
@@ -443,10 +443,10 @@ CalBlockPainter::CalBlockPainter(TQObject *parent, int year, int month,
TQString::number(year));
#if KDE_IS_VERSION(3,2,0)
painter->drawText(rCalHeader, TQt::AlignRight|TQt::AlignVCenter,
- KGlobal::locale()->calendar()->monthName(month, year));
+ TDEGlobal::locale()->calendar()->monthName(month, year));
#else
painter->drawText(rCalHeader, TQt::AlignRight|TQt::AlignVCenter,
- KGlobal::locale()->monthName(month));
+ TDEGlobal::locale()->monthName(month));
#endif
painter->restore();
@@ -477,10 +477,10 @@ CalBlockPainter::CalBlockPainter(TQObject *parent, int year, int month,
rsmall.setHeight(r.height() - 2);
#if KDE_IS_VERSION(3,2,0)
painter->drawText(rsmall, TQt::AlignRight|TQt::AlignBottom,
- KGlobal::locale()->calendar()->weekDayName(dayname, true));
+ TDEGlobal::locale()->calendar()->weekDayName(dayname, true));
#else
painter->drawText(rsmall, TQt::AlignRight|TQt::AlignBottom,
- KGlobal::locale()->weekDayName(dayname, true));
+ TDEGlobal::locale()->weekDayName(dayname, true));
#endif
}
diff --git a/kipi-plugins/calendar/calselect.cpp b/kipi-plugins/calendar/calselect.cpp
index 08e9dee..2277853 100644
--- a/kipi-plugins/calendar/calselect.cpp
+++ b/kipi-plugins/calendar/calselect.cpp
@@ -71,10 +71,10 @@ void CalSelect::setupView( KIPI::Interface* interface )
yearBox->layout()->addItem(new TQSpacerItem(5,5,
TQSizePolicy::Expanding,
TQSizePolicy::Minimum));
- yearSpin_ = new TQSpinBox(KGlobal::locale()->calendar()->minValidYear(),
- KGlobal::locale()->calendar()->maxValidYear(),
+ yearSpin_ = new TQSpinBox(TDEGlobal::locale()->calendar()->minValidYear(),
+ TDEGlobal::locale()->calendar()->maxValidYear(),
1,yearBox);
- yearSpin_->setValue(KGlobal::locale()->calendar()->year(TQDate::currentDate()));
+ yearSpin_->setValue(TDEGlobal::locale()->calendar()->year(TQDate::currentDate()));
slotYearChanged(yearSpin_->value());
connect(yearSpin_, TQT_SIGNAL(valueChanged(int)),
@@ -98,8 +98,8 @@ void CalSelect::setupView( KIPI::Interface* interface )
urlList = images.images();
TQDate d;
- KGlobal::locale()->calendar()->setYMD(d, yearSpin_->value(), 1, 1);
- unsigned int months = KGlobal::locale()->calendar()->monthsInYear(d);
+ TDEGlobal::locale()->calendar()->setYMD(d, yearSpin_->value(), 1, 1);
+ 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)
int inRow = (months / 2) + ((months % 2) != 0);
MonthWidget *w;
@@ -135,20 +135,20 @@ void CalSelect::slotYearChanged(int year)
{
int i, months;
TQDate d, oldD;
- KGlobal::locale()->calendar()->setYMD(d, year, 1, 1);
- KGlobal::locale()->calendar()->setYMD(oldD, CalSettings::instance()->getYear(), 1, 1);
- months = KGlobal::locale()->calendar()->monthsInYear(d);
+ TDEGlobal::locale()->calendar()->setYMD(d, year, 1, 1);
+ TDEGlobal::locale()->calendar()->setYMD(oldD, CalSettings::instance()->getYear(), 1, 1);
+ 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
- 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();
// 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);
// 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));
}
for (i=0; (i<months) && (i<(int)mwVector_->count()); i++) {
diff --git a/kipi-plugins/calendar/calsettings.cpp b/kipi-plugins/calendar/calsettings.cpp
index 2c5f112..ce9c657 100644
--- a/kipi-plugins/calendar/calsettings.cpp
+++ b/kipi-plugins/calendar/calsettings.cpp
@@ -37,7 +37,7 @@ CalSettings* CalSettings::instance_ = 0;
CalSettings::CalSettings()
{
instance_ = this;
- year_ = KGlobal::locale()->calendar()->minValidYear() + 1;
+ year_ = TDEGlobal::locale()->calendar()->minValidYear() + 1;
}
CalSettings::~CalSettings()
diff --git a/kipi-plugins/calendar/calwidget.cpp b/kipi-plugins/calendar/calwidget.cpp
index 9f40e39..f32e8e7 100644
--- a/kipi-plugins/calendar/calwidget.cpp
+++ b/kipi-plugins/calendar/calwidget.cpp
@@ -78,8 +78,8 @@ void CalWidget::recreate()
if (!calPainter_)
calPainter_ = new CalPainter(TQT_TQPAINTDEVICE(pix_));
- calPainter_->setYearMonth(KGlobal::locale()->calendar()->year(TQDate::currentDate()),
- KGlobal::locale()->calendar()->month(TQDate::currentDate()));
+ calPainter_->setYearMonth(TDEGlobal::locale()->calendar()->year(TQDate::currentDate()),
+ TDEGlobal::locale()->calendar()->month(TQDate::currentDate()));
calPainter_->paint();
update();
}
diff --git a/kipi-plugins/calendar/calwizard.cpp b/kipi-plugins/calendar/calwizard.cpp
index 51d69d5..647552e 100644
--- a/kipi-plugins/calendar/calwizard.cpp
+++ b/kipi-plugins/calendar/calwizard.cpp
@@ -196,12 +196,12 @@ void CalWizard::slotPageSelected(const TQString&)
TQString month;
TQStringList printList;
TQDate d;
- KGlobal::locale()->calendar()->setYMD(d, cSettings_->getYear(), 1, 1);
- for (int i=1; i<=KGlobal::locale()->calendar()->monthsInYear(d); i++) {
+ TDEGlobal::locale()->calendar()->setYMD(d, cSettings_->getYear(), 1, 1);
+ for (int i=1; i<=TDEGlobal::locale()->calendar()->monthsInYear(d); i++) {
#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
- month = KGlobal::locale()->monthName(i);
+ month = TDEGlobal::locale()->monthName(i);
#endif
image = cSettings_->getImage(i);
if (!image.isEmpty()) {
@@ -215,9 +215,9 @@ void CalWizard::slotPageSelected(const TQString&)
TQString year = TQString::number(cSettings_->getYear());
TQString extra;
- if ((KGlobal::locale()->calendar()->month(TQDate::currentDate()) >= 6 &&
- KGlobal::locale()->calendar()->year(TQDate::currentDate()) == cSettings_->getYear()) ||
- KGlobal::locale()->calendar()->year(TQDate::currentDate()) > cSettings_->getYear())
+ if ((TDEGlobal::locale()->calendar()->month(TQDate::currentDate()) >= 6 &&
+ TDEGlobal::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 "
"calendar for<br>the current year or a year in the "
"past.")+"</b>";
@@ -320,11 +320,11 @@ void CalWizard::slotPrintOnePage()
#if KDE_IS_VERSION(3,2,0)
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));
#else
wFinishLabel_->setText(i18n("Printing Calendar Page for %1 of %2")
- .arg(KGlobal::locale()->monthName(month)).
+ .arg(TDEGlobal::locale()->monthName(month)).
.arg(yearName));
#endif
diff --git a/kipi-plugins/calendar/monthwidget.cpp b/kipi-plugins/calendar/monthwidget.cpp
index ccf173f..447c747 100644
--- a/kipi-plugins/calendar/monthwidget.cpp
+++ b/kipi-plugins/calendar/monthwidget.cpp
@@ -86,9 +86,9 @@ void MonthWidget::drawContents(TQPainter *p)
{
#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
- TQString name = KGlobal::locale()->monthName(month_, true);
+ TQString name = TDEGlobal::locale()->monthName(month_, true);
#endif
TQRect cr;
diff --git a/kipi-plugins/cdarchiving/cdarchiving.cpp b/kipi-plugins/cdarchiving/cdarchiving.cpp
index b7c9ffc..3962373 100644
--- a/kipi-plugins/cdarchiving/cdarchiving.cpp
+++ b/kipi-plugins/cdarchiving/cdarchiving.cpp
@@ -321,9 +321,9 @@ void CDArchiving::run()
{
m_HTMLInterfaceFolder = m_tmpFolder + "/HTMLInterface";
TQString dir;
- KGlobal::dirs()->addResourceType("kipi_autorun",
- KGlobal::dirs()->kde_default("data") + "kipi/data");
- dir = KGlobal::dirs()->findResourceDir("kipi_autorun", "index.htm");
+ TDEGlobal::dirs()->addResourceType("kipi_autorun",
+ TDEGlobal::dirs()->kde_default("data") + "kipi/data");
+ dir = TDEGlobal::dirs()->findResourceDir("kipi_autorun", "index.htm");
m_HTMLInterfaceIndex = dir + "index.htm";
d = new KIPICDArchivingPlugin::EventData;
@@ -396,7 +396,7 @@ void CDArchiving::invokeK3b()
{
if (m_cancelled) return;
- m_Proc = new KProcess();
+ m_Proc = new TDEProcess();
*m_Proc << m_K3bBinPathName << m_K3bParameters;
*m_Proc << m_tmpFolder + "/KIPICDArchiving.xml";
@@ -406,10 +406,10 @@ void CDArchiving::invokeK3b()
m_tmpFolder + "/KIPICDArchiving.xml";
kdDebug(51000) << "K3b is started : " << K3bCommandLine.ascii() << endl;
- connect(m_Proc, TQT_SIGNAL(processExited(KProcess *)),
- this, TQT_SLOT(slotK3bDone(KProcess*)));
+ connect(m_Proc, TQT_SIGNAL(processExited(TDEProcess *)),
+ 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;
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;
@@ -516,16 +516,16 @@ bool CDArchiving::buildHTMLInterface (void)
// Build all Albums interface HTML.
// Adding go home icon if there is more than
- KGlobal::dirs()->addResourceType("kipi_data", KGlobal::dirs()->kde_default("data") + "kipi");
- TQString dir = KGlobal::dirs()->findResourceDir("kipi_data", "gohome.png");
+ TDEGlobal::dirs()->addResourceType("kipi_data", TDEGlobal::dirs()->kde_default("data") + "kipi");
+ TQString dir = TDEGlobal::dirs()->findResourceDir("kipi_data", "gohome.png");
dir = dir + "gohome.png";
KURL srcURL(dir);
KURL destURL( MainTPath + "/gohome.png");
KIO::file_copy(srcURL, destURL, -1, true, false, false);
// Adding up icon
- KGlobal::dirs()->addResourceType("kipi_data", KGlobal::dirs()->kde_default("data") + "kipi");
- dir = KGlobal::dirs()->findResourceDir("kipi_data", "up.png");
+ TDEGlobal::dirs()->addResourceType("kipi_data", TDEGlobal::dirs()->kde_default("data") + "kipi");
+ dir = TDEGlobal::dirs()->findResourceDir("kipi_data", "up.png");
dir = dir + "up.png";
srcURL = dir;
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 name=\"Generator\" content=\"Albums HTML interface for CD archiving generated by "
<< 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;
stream << "<title>" << m_mainTitle << "</title>" << endl;
createCSSSection(stream);
@@ -736,7 +736,7 @@ void CDArchiving::createBody(TQTextStream& stream,
int numOfImages = images.count();
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;
@@ -947,8 +947,8 @@ void CDArchiving::createBody(TQTextStream& stream,
stream << "</table>\n<hr>\n" << endl;
TQString Temp;
- KGlobal::dirs()->addResourceType("kipi_data", KGlobal::dirs()->kde_default("data") + "kipi");
- TQString dir = KGlobal::dirs()->findResourceDir("kipi_data", "valid-html401.png");
+ TDEGlobal::dirs()->addResourceType("kipi_data", TDEGlobal::dirs()->kde_default("data") + "kipi");
+ TQString dir = TDEGlobal::dirs()->findResourceDir("kipi_data", "valid-html401.png");
dir = dir + "valid-html401.png";
KURL srcURL(dir);
@@ -974,7 +974,7 @@ void CDArchiving::createBody(TQTextStream& stream,
void CDArchiving::createBodyMainPage(TQTextStream& stream, KURL& url)
{
TQString Temp;
- const TQString today(KGlobal::locale()->formatDate(TQDate::currentDate()));
+ const TQString today(TDEGlobal::locale()->formatDate(TQDate::currentDate()));
Temp = m_mainTitle;
stream << "<body>\n<h1>" << Temp << "</h1><p>\n" << endl;
@@ -987,8 +987,8 @@ void CDArchiving::createBodyMainPage(TQTextStream& stream, KURL& url)
stream << "<hr>" << endl;
- KGlobal::dirs()->addResourceType("kipi_data", KGlobal::dirs()->kde_default("data") + "kipi");
- TQString dir = KGlobal::dirs()->findResourceDir("kipi_data", "valid-html401.png");
+ TDEGlobal::dirs()->addResourceType("kipi_data", TDEGlobal::dirs()->kde_default("data") + "kipi");
+ TQString dir = TDEGlobal::dirs()->findResourceDir("kipi_data", "valid-html401.png");
dir = dir + "valid-html401.png";
KURL srcURL(dir);
@@ -1122,7 +1122,7 @@ bool CDArchiving::createPage(const TQString& imgGalleryDir,
<< m_hostName << " [" << m_hostURL << "]\">" << endl;
stream << "<meta name=\"date\" content=\""
- << KGlobal::locale()->formatDate(TQDate::currentDate())
+ << TDEGlobal::locale()->formatDate(TQDate::currentDate())
<< "\">" << endl;
stream << "<title>" << m_mainTitle << " : "<< imgName/*imgURL.fileName()*/ <<"</title>" << endl;
@@ -1239,7 +1239,7 @@ bool CDArchiving::createPage(const TQString& imgGalleryDir,
// Footer
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=\""
<< 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.
{
- KGlobal::dirs()->addResourceType("kipi_imagebroken", KGlobal::dirs()->kde_default("data") + "kipi/data");
- TQString dir = KGlobal::dirs()->findResourceDir("kipi_imagebroken", "image_broken.png");
+ TDEGlobal::dirs()->addResourceType("kipi_imagebroken", TDEGlobal::dirs()->kde_default("data") + "kipi/data");
+ TQString dir = TDEGlobal::dirs()->findResourceDir("kipi_imagebroken", "image_broken.png");
dir = dir + "image_broken.png";
kdDebug ( 51000 ) << "Loading " << Path.ascii() << " failed ! Using " << dir.ascii()
<< " instead..." << endl;
diff --git a/kipi-plugins/cdarchiving/cdarchiving.h b/kipi-plugins/cdarchiving/cdarchiving.h
index 62eee46..bf25f91 100644
--- a/kipi-plugins/cdarchiving/cdarchiving.h
+++ b/kipi-plugins/cdarchiving/cdarchiving.h
@@ -51,7 +51,7 @@ extern "C"
#include <libkipi/imagecollection.h>
#include <libkipi/interface.h>
-class KProcess;
+class TDEProcess;
namespace KIPICDArchivingPlugin
{
@@ -86,7 +86,7 @@ public:
public slots:
- void slotK3bDone(KProcess*);
+ void slotK3bDone(TDEProcess*);
void slotK3bStartBurningProcess(void);
private:
@@ -97,7 +97,7 @@ private:
KIPI::Interface *m_interface;
- KProcess *m_Proc;
+ TDEProcess *m_Proc;
KURL m_albumUrl; // Current album Url use in the thread.
KURL::List m_albumUrlList; // Urls of Albums list from setup dialog.
diff --git a/kipi-plugins/cdarchiving/cdarchivingdialog.cpp b/kipi-plugins/cdarchiving/cdarchivingdialog.cpp
index 88de1dd..6f5b4bc 100644
--- a/kipi-plugins/cdarchiving/cdarchivingdialog.cpp
+++ b/kipi-plugins/cdarchiving/cdarchivingdialog.cpp
@@ -265,7 +265,7 @@ void CDArchivingDialog::setupLookPage(void)
TQStringList standardFonts;
KFontChooser::getFontList(standardFonts, 0);
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.") );
m_labelFontName = new TQLabel( i18n("Fon&t name:"), page_setupLook );
diff --git a/kipi-plugins/common/libkipiplugins/kpaboutdata.cpp b/kipi-plugins/common/libkipiplugins/kpaboutdata.cpp
index f8bccf9..f2a4176 100644
--- a/kipi-plugins/common/libkipiplugins/kpaboutdata.cpp
+++ b/kipi-plugins/common/libkipiplugins/kpaboutdata.cpp
@@ -47,8 +47,8 @@ namespace KIPIPlugins
#if KDE_IS_VERSION(3,4,0)
// setProgramLogo is defined from kde 3.4.0 on
TQString directory;
- KGlobal::dirs()->addResourceType("kipi_plugins_logo", KGlobal::dirs()->kde_default("data") + "kipi/data");
- directory = KGlobal::dirs()->findResourceDir("kipi_plugins_logo", "kipi-plugins_logo.png");
+ TDEGlobal::dirs()->addResourceType("kipi_plugins_logo", TDEGlobal::dirs()->kde_default("data") + "kipi/data");
+ directory = TDEGlobal::dirs()->findResourceDir("kipi_plugins_logo", "kipi-plugins_logo.png");
// set the kipiplugins logo inside the about dialog
setProgramLogo(TQImage(directory + "kipi-plugins_logo.png"));
diff --git a/kipi-plugins/findimages/finddupplicateimages.cpp b/kipi-plugins/findimages/finddupplicateimages.cpp
index ec51a60..4a1c8a2 100644
--- a/kipi-plugins/findimages/finddupplicateimages.cpp
+++ b/kipi-plugins/findimages/finddupplicateimages.cpp
@@ -76,7 +76,7 @@ namespace KIPIFindDupplicateImagesPlugin
FindDuplicateImages::FindDuplicateImages( KIPI::Interface* interface, TQObject *parent)
: 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 )
{
KImageIO::registerFormats();
diff --git a/kipi-plugins/galleryexport/plugin_galleryexport.cpp b/kipi-plugins/galleryexport/plugin_galleryexport.cpp
index 60e2e58..1bacc9d 100644
--- a/kipi-plugins/galleryexport/plugin_galleryexport.cpp
+++ b/kipi-plugins/galleryexport/plugin_galleryexport.cpp
@@ -72,7 +72,7 @@ void Plugin_GalleryExport::setup(TQWidget* widget)
}
// 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..."),
0,
diff --git a/kipi-plugins/gpssync/gpsbabelbinary.cpp b/kipi-plugins/gpssync/gpsbabelbinary.cpp
index c0b9c1a..f7d01a5 100644
--- a/kipi-plugins/gpssync/gpsbabelbinary.cpp
+++ b/kipi-plugins/gpssync/gpsbabelbinary.cpp
@@ -66,17 +66,17 @@ GPSBabelBinary::~GPSBabelBinary()
void GPSBabelBinary::checkSystem()
{
- KProcess process;
+ TDEProcess process;
process.clearArguments();
process << path() << "-V";
- connect(&process, TQT_SIGNAL(receivedStdout(KProcess *, char*, int)),
- this, TQT_SLOT(slotReadStdoutFromGPSBabel(KProcess*, char*, int)));
+ connect(&process, TQT_SIGNAL(receivedStdout(TDEProcess *, 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
TQString headerStarts("GPSBabel Version ");
diff --git a/kipi-plugins/gpssync/gpsbabelbinary.h b/kipi-plugins/gpssync/gpsbabelbinary.h
index 574c799..4be8ef6 100644
--- a/kipi-plugins/gpssync/gpsbabelbinary.h
+++ b/kipi-plugins/gpssync/gpsbabelbinary.h
@@ -28,7 +28,7 @@
#include <tqstring.h>
#include <tqobject.h>
-class KProcess;
+class TDEProcess;
namespace KIPIGPSSyncPlugin
{
@@ -55,7 +55,7 @@ public:
private slots:
- void slotReadStdoutFromGPSBabel(KProcess*, char*, int);
+ void slotReadStdoutFromGPSBabel(TDEProcess*, char*, int);
private:
diff --git a/kipi-plugins/gpssync/gpssyncdialog.cpp b/kipi-plugins/gpssync/gpssyncdialog.cpp
index e251efb..7d86706 100644
--- a/kipi-plugins/gpssync/gpssyncdialog.cpp
+++ b/kipi-plugins/gpssync/gpssyncdialog.cpp
@@ -298,7 +298,7 @@ void GPSSyncDialog::setImages( const KURL::List& images )
void GPSSyncDialog::slotLoadGPXFile()
{
- KURL loadGPXFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(),
+ KURL loadGPXFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(),
i18n("%1|GPS Exchange Format").arg("*.gpx"), this,
i18n("Select GPX File to Load") );
if( loadGPXFile.isEmpty() )
diff --git a/kipi-plugins/htmlexport/theme.cpp b/kipi-plugins/htmlexport/theme.cpp
index 02531a8..10a1bf0 100644
--- a/kipi-plugins/htmlexport/theme.cpp
+++ b/kipi-plugins/htmlexport/theme.cpp
@@ -140,7 +140,7 @@ Theme::~Theme() {
const Theme::List& Theme::getList() {
if (sList.isEmpty()) {
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();
for (;it!=end; ++it) {
Theme* theme=new Theme;
diff --git a/kipi-plugins/ipodexport/ipodexportdialog.cpp b/kipi-plugins/ipodexport/ipodexportdialog.cpp
index 54f34f2..b65dd57 100644
--- a/kipi-plugins/ipodexport/ipodexportdialog.cpp
+++ b/kipi-plugins/ipodexport/ipodexportdialog.cpp
@@ -103,7 +103,7 @@ UploadDialog::UploadDialog(
TQWhatsThis::add( m_renameAlbumButton, i18n("Rename the selected photo album on the iPod."));
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->setFixedHeight( 80 );
@@ -148,7 +148,7 @@ UploadDialog::UploadDialog(
TQWhatsThis::add( m_imagePreview, i18n( "The preview of the selected image in the list." ) );
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->addStretch( 1 );
@@ -207,7 +207,7 @@ UploadDialog::getIpodAlbums()
Itdb_PhotoAlbum *ipodAlbum = (Itdb_PhotoAlbum *)it->data;
debug() << " found album: " << ipodAlbum->name << endl;
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 );
}
}
@@ -225,7 +225,7 @@ UploadDialog::getIpodAlbumPhotos( IpodAlbumItem *item, Itdb_PhotoAlbum *album )
gint photo_id = photo->id;
last = new IpodPhotoItem( item, last, photo );
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*/ );
// add the new album to the list view
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->setSelected( i, true );
diff --git a/kipi-plugins/jpeglossless/convert2grayscale.cpp b/kipi-plugins/jpeglossless/convert2grayscale.cpp
index fb8692d..adac001 100644
--- a/kipi-plugins/jpeglossless/convert2grayscale.cpp
+++ b/kipi-plugins/jpeglossless/convert2grayscale.cpp
@@ -222,7 +222,7 @@ bool ImageGrayScale::image2GrayScaleJPEG(const TQString& src, const TQString& de
bool ImageGrayScale::image2GrayScaleImageMagick(const TQString& src, const TQString& dest, TQString& err)
{
- KProcess process;
+ TDEProcess process;
process.clearArguments();
process << "convert";
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)
tqDebug("%s", (const char*)(*it));
- connect(&process, TQT_SIGNAL(receivedStderr(KProcess *, char*, int)),
- this, TQT_SLOT(slotReadStderr(KProcess*, char*, int)));
+ connect(&process, TQT_SIGNAL(receivedStderr(TDEProcess *, 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;
if (!process.normalExit())
@@ -262,7 +262,7 @@ bool ImageGrayScale::image2GrayScaleImageMagick(const TQString& src, const TQStr
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));
}
diff --git a/kipi-plugins/jpeglossless/convert2grayscale.h b/kipi-plugins/jpeglossless/convert2grayscale.h
index 7f6003b..2242299 100644
--- a/kipi-plugins/jpeglossless/convert2grayscale.h
+++ b/kipi-plugins/jpeglossless/convert2grayscale.h
@@ -30,7 +30,7 @@
#include <tqstring.h>
class KTempFile;
-class KProcess;
+class TDEProcess;
namespace KIPIJPEGLossLessPlugin
{
@@ -49,7 +49,7 @@ public:
private slots:
- void slotReadStderr(KProcess*, char*, int);
+ void slotReadStderr(TDEProcess*, char*, int);
private:
diff --git a/kipi-plugins/jpeglossless/imageflip.cpp b/kipi-plugins/jpeglossless/imageflip.cpp
index c6e9c1c..d9975c6 100644
--- a/kipi-plugins/jpeglossless/imageflip.cpp
+++ b/kipi-plugins/jpeglossless/imageflip.cpp
@@ -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)
{
- KProcess process;
+ TDEProcess process;
process.clearArguments();
process << "convert";
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)
tqDebug("%s", (const char*)(*it));
- connect(&process, TQT_SIGNAL(receivedStderr(KProcess *, char*, int)),
- this, TQT_SLOT(slotReadStderr(KProcess*, char*, int)));
+ connect(&process, TQT_SIGNAL(receivedStderr(TDEProcess *, 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;
if (!process.normalExit())
@@ -217,7 +217,7 @@ bool ImageFlip::flipImageMagick(const TQString& src, const TQString& dest, FlipA
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));
}
diff --git a/kipi-plugins/jpeglossless/imageflip.h b/kipi-plugins/jpeglossless/imageflip.h
index e16b590..0d8cf6e 100644
--- a/kipi-plugins/jpeglossless/imageflip.h
+++ b/kipi-plugins/jpeglossless/imageflip.h
@@ -34,7 +34,7 @@
#include <tqstring.h>
class KTempFile;
-class KProcess;
+class TDEProcess;
namespace KIPIJPEGLossLessPlugin
{
@@ -53,7 +53,7 @@ public:
private slots:
- void slotReadStderr(KProcess*, char*, int);
+ void slotReadStderr(TDEProcess*, char*, int);
private:
diff --git a/kipi-plugins/jpeglossless/imagerotate.cpp b/kipi-plugins/jpeglossless/imagerotate.cpp
index 56dd8a8..b5f821f 100644
--- a/kipi-plugins/jpeglossless/imagerotate.cpp
+++ b/kipi-plugins/jpeglossless/imagerotate.cpp
@@ -171,7 +171,7 @@ bool ImageRotate::rotateJPEG(const TQString& src, const TQString& dest, RotateAc
bool ImageRotate::rotateImageMagick(const TQString& src, const TQString& dest,
RotateAction angle, TQString& err)
{
- KProcess process;
+ TDEProcess process;
process.clearArguments();
process << "convert";
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)
tqDebug("%s", (const char*)(*it));
- connect(&process, TQT_SIGNAL(receivedStderr(KProcess *, char*, int)),
- this, TQT_SLOT(slotReadStderr(KProcess*, char*, int)));
+ connect(&process, TQT_SIGNAL(receivedStderr(TDEProcess *, 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;
if (!process.normalExit())
@@ -241,7 +241,7 @@ bool ImageRotate::rotateImageMagick(const TQString& src, const TQString& dest,
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));
}
diff --git a/kipi-plugins/jpeglossless/imagerotate.h b/kipi-plugins/jpeglossless/imagerotate.h
index cbbec11..d20b882 100644
--- a/kipi-plugins/jpeglossless/imagerotate.h
+++ b/kipi-plugins/jpeglossless/imagerotate.h
@@ -35,7 +35,7 @@
#include <tqstring.h>
class KTempFile;
-class KProcess;
+class TDEProcess;
namespace KIPIJPEGLossLessPlugin
{
@@ -54,7 +54,7 @@ public:
private slots:
- void slotReadStderr(KProcess*, char*, int);
+ void slotReadStderr(TDEProcess*, char*, int);
private:
diff --git a/kipi-plugins/jpeglossless/utils.cpp b/kipi-plugins/jpeglossless/utils.cpp
index db605b7..180f9da 100644
--- a/kipi-plugins/jpeglossless/utils.cpp
+++ b/kipi-plugins/jpeglossless/utils.cpp
@@ -133,7 +133,7 @@ bool Utils::updateMetadataImageMagick(const TQString& src, TQString& err)
streamIptc.writeRawBytes(iptcData.data(), iptcData.size());
iptcFile->close();
- KProcess process;
+ TDEProcess process;
process.clearArguments();
process << "mogrify";
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)
tqDebug("%s", (const char*)(*it));
- connect(&process, TQT_SIGNAL(receivedStderr(KProcess *, char*, int)),
- this, TQT_SLOT(slotReadStderr(KProcess*, char*, int)));
+ connect(&process, TQT_SIGNAL(receivedStderr(TDEProcess *, 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;
if (!process.normalExit())
@@ -179,7 +179,7 @@ bool Utils::updateMetadataImageMagick(const TQString& src, TQString& err)
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));
}
diff --git a/kipi-plugins/jpeglossless/utils.h b/kipi-plugins/jpeglossless/utils.h
index 0b9571a..4ed7c45 100644
--- a/kipi-plugins/jpeglossless/utils.h
+++ b/kipi-plugins/jpeglossless/utils.h
@@ -30,7 +30,7 @@
#include <tqobject.h>
#include <tqstring.h>
-class KProcess;
+class TDEProcess;
namespace KIPIJPEGLossLessPlugin
{
@@ -71,7 +71,7 @@ public: // Static methods.
private slots:
- void slotReadStderr(KProcess*, char*, int);
+ void slotReadStderr(TDEProcess*, char*, int);
private:
diff --git a/kipi-plugins/metadataedit/plugin_metadataedit.cpp b/kipi-plugins/metadataedit/plugin_metadataedit.cpp
index b6c9a58..7705261 100644
--- a/kipi-plugins/metadataedit/plugin_metadataedit.cpp
+++ b/kipi-plugins/metadataedit/plugin_metadataedit.cpp
@@ -228,7 +228,7 @@ void Plugin_MetadataEdit::slotImportExif()
if ( !images.isValid() || images.images().isEmpty() )
return;
- KURL importEXIFFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(),
+ KURL importEXIFFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(),
TQString(), TQT_TQWIDGET(kapp->activeWindow()),
i18n("Select File to Import EXIF metadata") );
if( importEXIFFile.isEmpty() )
@@ -374,7 +374,7 @@ void Plugin_MetadataEdit::slotImportIptc()
if ( !images.isValid() || images.images().isEmpty() )
return;
- KURL importIPTCFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(),
+ KURL importIPTCFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(),
TQString(), TQT_TQWIDGET(kapp->activeWindow()),
i18n("Select File to Import IPTC metadata") );
if( importIPTCFile.isEmpty() )
diff --git a/kipi-plugins/mpegencoder/kimg2mpg.cpp b/kipi-plugins/mpegencoder/kimg2mpg.cpp
index c6934d9..0c2c89a 100644
--- a/kipi-plugins/mpegencoder/kimg2mpg.cpp
+++ b/kipi-plugins/mpegencoder/kimg2mpg.cpp
@@ -306,7 +306,7 @@ void KImg2mpgData::slotMPEGFilenameDialog( void )
{
TQString temp;
- temp = KFileDialog::getOpenFileName(KGlobalSettings::documentPath(),
+ temp = KFileDialog::getOpenFileName(TDEGlobalSettings::documentPath(),
TQString( "*.mpg" ),
this,
i18n("Select MPEG Output File") );
@@ -323,7 +323,7 @@ void KImg2mpgData::slotAudioFilenameDialog( void )
{
TQString temp;
- temp = KFileDialog::getOpenFileName(KGlobalSettings::documentPath(),
+ temp = KFileDialog::getOpenFileName(TDEGlobalSettings::documentPath(),
TQString( "*.wav *.mp2 *.mp3 *.ogg" ),
this,
i18n("Select Audio Input File") );
@@ -504,7 +504,7 @@ void KImg2mpgData::slotClose()
void KImg2mpgData::slotEncode( void )
{
- m_Proc = new KProcess;
+ m_Proc = new TDEProcess;
TQColor BackGroundColor;
TQString HexColor;
TQString Temp;
@@ -697,14 +697,14 @@ void KImg2mpgData::slotEncode( void )
m_CommandLine = m_CommandLine + " \"" + FileName + "\" ";
}
- connect(m_Proc, TQT_SIGNAL(processExited(KProcess *)),this,
- TQT_SLOT(EncodeDone(KProcess*)));
+ connect(m_Proc, TQT_SIGNAL(processExited(TDEProcess *)),this,
+ TQT_SLOT(EncodeDone(TDEProcess*)));
- connect(m_Proc, TQT_SIGNAL(receivedStderr(KProcess *,char*,int)),this,
- TQT_SLOT(readStderr(KProcess*,char*,int)));
+ connect(m_Proc, TQT_SIGNAL(receivedStderr(TDEProcess *,char*,int)),this,
+ TQT_SLOT(readStderr(TDEProcess*,char*,int)));
m_Img2mpgPidNum = -1;
- bool result = m_Proc->start(KProcess::NotifyOnExit , KProcess::All);
+ bool result = m_Proc->start(TDEProcess::NotifyOnExit , TDEProcess::All);
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;
int ImgNum;
@@ -898,7 +898,7 @@ void KImg2mpgData::readStderr(KProcess *, char *buffer, int buflen)
/////////////////////////////////////////////////////////////////////////////////////////////
-void KImg2mpgData::EncodeDone(KProcess*)
+void KImg2mpgData::EncodeDone(TDEProcess*)
{
reset();
@@ -1107,7 +1107,7 @@ void KImg2mpgData::readSettings()
m_AudioInputFileConfig = m_config->readPathEntry("AudioInputFile");
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_IMBinFolderConfig = m_config->readPathEntry("ImageMagickBinFolder", "/usr/bin");
diff --git a/kipi-plugins/mpegencoder/kimg2mpg.h b/kipi-plugins/mpegencoder/kimg2mpg.h
index 4402e5c..b9134ac 100644
--- a/kipi-plugins/mpegencoder/kimg2mpg.h
+++ b/kipi-plugins/mpegencoder/kimg2mpg.h
@@ -59,7 +59,7 @@ class TQWidget;
class TQPixmap;
class KConfig;
-class KProcess;
+class TDEProcess;
class KLineEdit;
class KIconLoader;
class KColorButton;
@@ -114,8 +114,8 @@ public:
public slots:
void reset();
- void readStderr(KProcess *proc, char *buffer, int buflen);
- void EncodeDone(KProcess* );
+ void readStderr(TDEProcess *proc, char *buffer, int buflen);
+ void EncodeDone(TDEProcess* );
void slotMPEGFilenameDialog( void );
void slotAudioFilenameDialog( void );
void slotImagesFilesButtonAdd( void );
@@ -165,7 +165,7 @@ private:
pid_t m_Img2mpgPidNum;
- KProcess* m_Proc;
+ TDEProcess* m_Proc;
KIconLoader* m_Icons;
diff --git a/kipi-plugins/mpegencoder/kimg2mpgbase.ui b/kipi-plugins/mpegencoder/kimg2mpgbase.ui
index 4405cf2..cd4563d 100644
--- a/kipi-plugins/mpegencoder/kimg2mpgbase.ui
+++ b/kipi-plugins/mpegencoder/kimg2mpgbase.ui
@@ -1298,8 +1298,8 @@ The program uses the 'images2mpg' bash script.</string>
</includes>
<Q_SLOTS>
<slot specifier="non virtual">reset()</slot>
- <slot specifier="non virtual">readStderr( KProcess * proc, char * buffer, int buflen )</slot>
- <slot specifier="non virtual">EncodeDone( KProcess * )</slot>
+ <slot specifier="non virtual">readStderr( TDEProcess * proc, char * buffer, int buflen )</slot>
+ <slot specifier="non virtual">EncodeDone( TDEProcess * )</slot>
<slot specifier="non virtual">slotMPEGFilenameDialog( void )</slot>
<slot specifier="non virtual">slotAudioFilenameDialog( void )</slot>
<slot specifier="non virtual">slotImagesFilesButtonUp( void )</slot>
diff --git a/kipi-plugins/printwizard/frmprintwizard.cpp b/kipi-plugins/printwizard/frmprintwizard.cpp
index 5328ca8..94db6e6 100644
--- a/kipi-plugins/printwizard/frmprintwizard.cpp
+++ b/kipi-plugins/printwizard/frmprintwizard.cpp
@@ -186,7 +186,7 @@ FrmPrintWizard::FrmPrintWizard(TQWidget *parent, const char *name )
loadSettings();
- m_Proc = new KProcess;
+ m_Proc = new TDEProcess;
*m_Proc << "kjobviewer" << "--all";
}
@@ -555,7 +555,7 @@ TQString FrmPrintWizard::captionFormatter(TPhoto *photo, const TQString& format)
// %l focal length
str.replace("%f", fi.fileName());
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));
str.replace("%t", photo->exiv2Iface()->getExifTagString("Exif.Photo.ExposureTime"));
str.replace("%i", photo->exiv2Iface()->getExifTagString("Exif.Photo.ISOSpeedRatings"));
diff --git a/kipi-plugins/printwizard/frmprintwizard.h b/kipi-plugins/printwizard/frmprintwizard.h
index b555afc..9b01ae0 100644
--- a/kipi-plugins/printwizard/frmprintwizard.h
+++ b/kipi-plugins/printwizard/frmprintwizard.h
@@ -33,7 +33,7 @@
#include "frmprintwizardbase.h"
class TQPushButton;
-class KProcess;
+class TDEProcess;
namespace KIPIPrintWizardPlugin
{
@@ -75,7 +75,7 @@ private:
TQPtrList<TPhotoSize> m_photoSizes;
PageSize m_pageSize;
- KProcess *m_Proc;
+ TDEProcess *m_Proc;
TQString m_tempPath;
int m_currentPreviewPage;
diff --git a/kipi-plugins/rawconverter/actionthread.cpp b/kipi-plugins/rawconverter/actionthread.cpp
index d17fa7d..f1fd62d 100644
--- a/kipi-plugins/rawconverter/actionthread.cpp
+++ b/kipi-plugins/rawconverter/actionthread.cpp
@@ -178,7 +178,7 @@ void ActionThread::run()
if (info.dateTime.isValid())
{
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)
diff --git a/kipi-plugins/rawconverter/rawdecodingiface.cpp b/kipi-plugins/rawconverter/rawdecodingiface.cpp
index 3c67d38..3451824 100644
--- a/kipi-plugins/rawconverter/rawdecodingiface.cpp
+++ b/kipi-plugins/rawconverter/rawdecodingiface.cpp
@@ -86,32 +86,32 @@ RawDecodingIface::~RawDecodingIface()
TQByteArray RawDecodingIface::getICCProfilFromFile(KDcrawIface::RawDecodingSettings::OutputColorSpace colorSpace)
{
TQString filePath;
- KGlobal::dirs()->addResourceType("profiles", KGlobal::dirs()->kde_default("data") +
+ TDEGlobal::dirs()->addResourceType("profiles", TDEGlobal::dirs()->kde_default("data") +
"kipiplugin_rawconverter/profiles");
switch(colorSpace)
{
case KDcrawIface::RawDecodingSettings::SRGB:
{
- filePath = KGlobal::dirs()->findResourceDir("profiles", "srgb.icm");
+ filePath = TDEGlobal::dirs()->findResourceDir("profiles", "srgb.icm");
filePath.append("srgb.icm");
break;
}
case KDcrawIface::RawDecodingSettings::ADOBERGB:
{
- filePath = KGlobal::dirs()->findResourceDir("profiles", "adobergb.icm");
+ filePath = TDEGlobal::dirs()->findResourceDir("profiles", "adobergb.icm");
filePath.append("adobergb.icm");
break;
}
case KDcrawIface::RawDecodingSettings::WIDEGAMMUT:
{
- filePath = KGlobal::dirs()->findResourceDir("profiles", "widegamut.icm");
+ filePath = TDEGlobal::dirs()->findResourceDir("profiles", "widegamut.icm");
filePath.append("widegamut.icm");
break;
}
case KDcrawIface::RawDecodingSettings::PROPHOTO:
{
- filePath = KGlobal::dirs()->findResourceDir("profiles", "prophoto.icm");
+ filePath = TDEGlobal::dirs()->findResourceDir("profiles", "prophoto.icm");
filePath.append("prophoto.icm");
break;
}
diff --git a/kipi-plugins/sendimages/sendimages.cpp b/kipi-plugins/sendimages/sendimages.cpp
index 338eb34..bd3896c 100644
--- a/kipi-plugins/sendimages/sendimages.cpp
+++ b/kipi-plugins/sendimages/sendimages.cpp
@@ -474,7 +474,7 @@ bool SendImages::invokeMailAgent(void)
if ( m_sendImagesDialog->m_mailAgentName->currentText() == "KMail" )
{
- m_mailAgentProc = new KProcess;
+ m_mailAgentProc = new TDEProcess;
*m_mailAgentProc << "kmail";
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-Claws" )
{
- m_mailAgentProc = new KProcess;
+ m_mailAgentProc = new TDEProcess;
if ( m_sendImagesDialog->m_mailAgentName->currentText() == "Claws Mail")
*m_mailAgentProc << "claws-mail";
@@ -525,7 +525,7 @@ bool SendImages::invokeMailAgent(void)
if ( m_sendImagesDialog->m_mailAgentName->currentText() == "Balsa" )
{
- m_mailAgentProc = new KProcess;
+ m_mailAgentProc = new TDEProcess;
*m_mailAgentProc << "balsa" << "-m" << "mailto:";
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" )
{
- m_mailAgentProc = new KProcess;
+ m_mailAgentProc = new TDEProcess;
*m_mailAgentProc << "evolution";
TQString Temp = "mailto:?subject=";
@@ -576,7 +576,7 @@ bool SendImages::invokeMailAgent(void)
m_sendImagesDialog->m_mailAgentName->currentText() == "Thunderbird" ||
m_sendImagesDialog->m_mailAgentName->currentText() == "GmailAgent")
{
- m_mailAgentProc = new KProcess;
+ m_mailAgentProc = new TDEProcess;
m_thunderbirdUrl = m_sendImagesDialog->m_ThunderbirdBinPath->url();
@@ -615,15 +615,15 @@ bool SendImages::invokeMailAgent(void)
if (!m_invokedBefore)
{
- connect(m_mailAgentProc, TQT_SIGNAL(processExited(KProcess *)),
- this, TQT_SLOT(slotMozillaExited(KProcess*)));
+ connect(m_mailAgentProc, TQT_SIGNAL(processExited(TDEProcess *)),
+ this, TQT_SLOT(slotMozillaExited(TDEProcess*)));
- connect(m_mailAgentProc, TQT_SIGNAL(receivedStderr(KProcess *, char*, int)),
- this, TQT_SLOT(slotMozillaReadStderr(KProcess*, char*, int)));
+ connect(m_mailAgentProc, TQT_SIGNAL(receivedStderr(TDEProcess *, char*, int)),
+ this, TQT_SLOT(slotMozillaReadStderr(TDEProcess*, char*, int)));
}
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()),
i18n("Cannot start '%1' program;\nplease "
"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,
wait 5 seconds and start SlotMozillaTimeout() */
-void SendImages::slotMozillaExited(KProcess*)
+void SendImages::slotMozillaExited(TDEProcess*)
{
tqDebug("slotMozillaExited");
///Here would be the right point to clear the sendlist in order to avoid infinite resendings!!
m_filesSendList.clear();
///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());
if ( m_mozillaStdErr.find("No running window found") != -1 ) // No remote Mozilla | Netscape |
{ // 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" )
*m_mailAgentProc2 << "mozilla" << "-mail";
@@ -909,7 +909,7 @@ void SendImages::slotMozillaTimeout(void)
}
///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);
}
diff --git a/kipi-plugins/sendimages/sendimages.h b/kipi-plugins/sendimages/sendimages.h
index d8186a3..45826bd 100644
--- a/kipi-plugins/sendimages/sendimages.h
+++ b/kipi-plugins/sendimages/sendimages.h
@@ -43,7 +43,7 @@ class TQFile;
class TQTimer;
class TQCustomEvent;
-class KProcess;
+class TDEProcess;
namespace KIPISendimagesPlugin
{
@@ -97,10 +97,10 @@ private slots:
///If mozilla, or thunderbird or any derivate isn't already running,
///start it now, wait 5 seconds and start SlotMozillaTimeout()
- void slotMozillaExited(KProcess* proc);
+ void slotMozillaExited(TDEProcess* proc);
///Handles mozillas errors
- void slotMozillaReadStderr(KProcess* proc, char *buffer, int buflen);
+ void slotMozillaReadStderr(TDEProcess* proc, char *buffer, int buflen);
private:
@@ -160,9 +160,9 @@ private:
TQString m_imageFormat;
TQString m_thunderbirdUrl;
- KProcess *m_mailAgentProc;
- KProcess *m_mailAgentProc2;
- KProcess *m_mailAgentProc3;
+ TDEProcess *m_mailAgentProc;
+ TDEProcess *m_mailAgentProc2;
+ TDEProcess *m_mailAgentProc3;
/** List of images in the setup dialog.*/
KURL::List m_images;
diff --git a/kipi-plugins/simpleviewerexport/svedialog.cpp b/kipi-plugins/simpleviewerexport/svedialog.cpp
index 95f4ce9..d23e42b 100644
--- a/kipi-plugins/simpleviewerexport/svedialog.cpp
+++ b/kipi-plugins/simpleviewerexport/svedialog.cpp
@@ -134,7 +134,7 @@ void SVEDialog::readConfig()
setFrameWidth(config.readNumEntry("frameWidth", 1));
setStagePadding(config.readNumEntry("stagePadding", 20));
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));
setImagesExportSize(config.readNumEntry("imagesExportSize", 640));
setMaxImagesDimension(config.readNumEntry("maxImageDimension", 640));
@@ -291,7 +291,7 @@ void SVEDialog::generalPage()
vgroupbox = new TQVGroupBox(i18n("Save Gallery To"), m_generalPage);
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);
// ------------------------------------------------------------------------
diff --git a/kipi-plugins/slideshow/slideshow.cpp b/kipi-plugins/slideshow/slideshow.cpp
index e079ca7..2860081 100644
--- a/kipi-plugins/slideshow/slideshow.cpp
+++ b/kipi-plugins/slideshow/slideshow.cpp
@@ -63,7 +63,7 @@ SlideShow::SlideShow(const FileList& fileList, const TQStringList& commentsList,
: TQWidget(0, 0, WStyle_StaysOnTop | WType_Popup | WX11BypassWM | WDestructiveClose)
{
#if KDE_IS_VERSION(3,2,0)
- TQRect deskRect = KGlobalSettings::desktopGeometry(this);
+ TQRect deskRect = TDEGlobalSettings::desktopGeometry(this);
m_deskX = deskRect.x();
m_deskY = deskRect.y();
m_deskWidth = deskRect.width();
diff --git a/kipi-plugins/slideshow/slideshowgl.cpp b/kipi-plugins/slideshow/slideshowgl.cpp
index 3d1f775..51fc366 100644
--- a/kipi-plugins/slideshow/slideshowgl.cpp
+++ b/kipi-plugins/slideshow/slideshowgl.cpp
@@ -53,7 +53,7 @@ SlideShowGL::SlideShowGL(const TQValueList<TQPair<TQString, int> >& fileList,
WX11BypassWM | WDestructiveClose)
{
#if KDE_IS_VERSION(3,2,0)
- TQRect deskRect = KGlobalSettings::desktopGeometry(this);
+ TQRect deskRect = TDEGlobalSettings::desktopGeometry(this);
m_deskX = deskRect.x();
m_deskY = deskRect.y();
m_deskWidth = deskRect.width();
diff --git a/kipi-plugins/slideshow/slideshowkb.cpp b/kipi-plugins/slideshow/slideshowkb.cpp
index c8b1ddf..1be1c86 100644
--- a/kipi-plugins/slideshow/slideshowkb.cpp
+++ b/kipi-plugins/slideshow/slideshowkb.cpp
@@ -143,7 +143,7 @@ namespace KIPISlideShowPlugin
WX11BypassWM | WDestructiveClose)
{
#if KDE_IS_VERSION(3,2,0)
- TQRect deskRect = KGlobalSettings::desktopGeometry(this);
+ TQRect deskRect = TDEGlobalSettings::desktopGeometry(this);
m_deskX = deskRect.x();
m_deskY = deskRect.y();
m_deskWidth = deskRect.width();
diff --git a/kipi-plugins/sync/plugin_sync.cpp b/kipi-plugins/sync/plugin_sync.cpp
index cf28e1e..dee5a5c 100644
--- a/kipi-plugins/sync/plugin_sync.cpp
+++ b/kipi-plugins/sync/plugin_sync.cpp
@@ -72,7 +72,7 @@ void Plugin_Sync::setup(TQWidget* widget)
}
// Add our directory in to the icon loader dirs.
- KGlobal::iconLoader()->addAppDir("kipiplugin_sync");
+ TDEGlobal::iconLoader()->addAppDir("kipiplugin_sync");
mpActionSync = new KAction(i18n("Synchronize..."),
0,