summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kipi-plugins/acquireimages/acquireimagedialog.cpp2
-rw-r--r--kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp10
-rw-r--r--kipi-plugins/batchprocessimages/imagepreview.cpp2
-rw-r--r--kipi-plugins/cdarchiving/plugin_cdarchiving.cpp2
-rw-r--r--kipi-plugins/findimages/plugin_findimages.cpp2
-rw-r--r--kipi-plugins/jpeglossless/plugin_jpeglossless.cpp2
-rw-r--r--kipi-plugins/sendimages/plugin_sendimages.cpp2
-rw-r--r--kipi-plugins/simpleviewerexport/simpleviewerexport.cpp2
-rw-r--r--kipi-plugins/wallpaper/plugin_wallpaper.cpp2
9 files changed, 13 insertions, 13 deletions
diff --git a/kipi-plugins/acquireimages/acquireimagedialog.cpp b/kipi-plugins/acquireimages/acquireimagedialog.cpp
index eff0872..0df7f35 100644
--- a/kipi-plugins/acquireimages/acquireimagedialog.cpp
+++ b/kipi-plugins/acquireimages/acquireimagedialog.cpp
@@ -95,7 +95,7 @@ namespace KIPIAcquireImagesPlugin
// Used by slotOK() method.
#undef NETACCESS_WIDGET
-#if KDE_VERSION >= 0x30200
+#if TDE_VERSION >= 0x30200
#define NETACCESS_WIDGET , this
#else
#define NETACCESS_WIDGET
diff --git a/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp b/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp
index cadcbf2..ee802cb 100644
--- a/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp
@@ -475,7 +475,7 @@ bool BatchProcessImagesDialog::startProcess(void)
KURL desturl(targetAlbum + "/" + item->nameDest());
-#if KDE_VERSION >= 0x30200
+#if TDE_VERSION >= 0x30200
if ( KIO::NetAccess::exists( desturl, false, TQT_TQWIDGET(kapp->activeWindow()) ) == true )
#else
if ( KIO::NetAccess::exists( desturl ) == true )
@@ -714,7 +714,7 @@ void BatchProcessImagesDialog::slotProcessDone(KProcess* proc)
{
KURL deleteImage(item->pathSrc());
-#if KDE_VERSION >= 0x30200
+#if TDE_VERSION >= 0x30200
if ( KIO::NetAccess::del( deleteImage, TQT_TQWIDGET(kapp->activeWindow()) ) == false )
#else
if ( KIO::NetAccess::del( deleteImage ) == false )
@@ -867,7 +867,7 @@ void BatchProcessImagesDialog::slotPreviewProcessDone(KProcess* proc)
KURL deletePreviewImage(m_tmpFolder + "/" + TQString::number(getpid()) + "preview.PNG");
-#if KDE_VERSION >= 0x30200
+#if TDE_VERSION >= 0x30200
KIO::NetAccess::del( deletePreviewImage, TQT_TQWIDGET(kapp->activeWindow()) );
#else
KIO::NetAccess::del( deletePreviewImage );
@@ -1028,7 +1028,7 @@ void BatchProcessImagesDialog::processAborted(bool removeFlag)
KURL deleteImage = m_destinationURL->url();
deleteImage.addPath(item->nameDest());
-#if KDE_VERSION >= 0x30200
+#if TDE_VERSION >= 0x30200
if ( KIO::NetAccess::exists( deleteImage, false, TQT_TQWIDGET(kapp->activeWindow()) ) == true )
KIO::NetAccess::del( deleteImage, TQT_TQWIDGET(kapp->activeWindow()) );
#else
@@ -1066,7 +1066,7 @@ TQString BatchProcessImagesDialog::RenameTargetImageFile(TQFileInfo *fi)
+ "." + fi->filePath().section('.', -1 );
}
while ( Enumerator < 100 &&
-#if KDE_VERSION >= 0x30200
+#if TDE_VERSION >= 0x30200
KIO::NetAccess::exists( NewDestUrl, true, TQT_TQWIDGET(kapp->activeWindow()) )
#else
KIO::NetAccess::exists( NewDestUrl )
diff --git a/kipi-plugins/batchprocessimages/imagepreview.cpp b/kipi-plugins/batchprocessimages/imagepreview.cpp
index 0e8f62c..d3f0aa1 100644
--- a/kipi-plugins/batchprocessimages/imagepreview.cpp
+++ b/kipi-plugins/batchprocessimages/imagepreview.cpp
@@ -308,7 +308,7 @@ void PixmapView::PreviewProcessDone(KProcess* proc)
verticalScrollBar()->setLineStep(1);
KURL deletePreviewImage( m_previewFileName );
-#if KDE_VERSION >= 0x30200
+#if TDE_VERSION >= 0x30200
KIO::NetAccess::del( deletePreviewImage, TQT_TQWIDGET(kapp->activeWindow()) );
#else
KIO::NetAccess::del( deletePreviewImage );
diff --git a/kipi-plugins/cdarchiving/plugin_cdarchiving.cpp b/kipi-plugins/cdarchiving/plugin_cdarchiving.cpp
index 04244ce..6db4963 100644
--- a/kipi-plugins/cdarchiving/plugin_cdarchiving.cpp
+++ b/kipi-plugins/cdarchiving/plugin_cdarchiving.cpp
@@ -313,7 +313,7 @@ void Plugin_CDArchiving::customEvent(TQCustomEvent *event)
{
m_current = 0;
-#if KDE_VERSION >= 0x30200
+#if TDE_VERSION >= 0x30200
m_progressDlg->setButtonCancel( KStdGuiItem::close() );
#else
m_progressDlg->setButtonCancelText( i18n("&Close") );
diff --git a/kipi-plugins/findimages/plugin_findimages.cpp b/kipi-plugins/findimages/plugin_findimages.cpp
index c7a38c2..30446c3 100644
--- a/kipi-plugins/findimages/plugin_findimages.cpp
+++ b/kipi-plugins/findimages/plugin_findimages.cpp
@@ -276,7 +276,7 @@ void Plugin_FindImages::customEvent(TQCustomEvent *event)
if( d->action == KIPIFindDupplicateImagesPlugin::Progress )
{
-#if KDE_VERSION >= 0x30200
+#if TDE_VERSION >= 0x30200
m_progressDlg->setButtonCancel( KStdGuiItem::close() );
#else
m_progressDlg->setButtonCancelText( i18n("&Close") );
diff --git a/kipi-plugins/jpeglossless/plugin_jpeglossless.cpp b/kipi-plugins/jpeglossless/plugin_jpeglossless.cpp
index 59ba4e0..3b35e6a 100644
--- a/kipi-plugins/jpeglossless/plugin_jpeglossless.cpp
+++ b/kipi-plugins/jpeglossless/plugin_jpeglossless.cpp
@@ -439,7 +439,7 @@ void Plugin_JPEGLossless::customEvent(TQCustomEvent *event)
if (m_failed)
{
-#if KDE_VERSION >= 0x30200
+#if TDE_VERSION >= 0x30200
m_progressDlg->setButtonCancel( KStdGuiItem::close() );
#else
m_progressDlg->setButtonCancelText( i18n("&Close") );
diff --git a/kipi-plugins/sendimages/plugin_sendimages.cpp b/kipi-plugins/sendimages/plugin_sendimages.cpp
index 8d00061..f69ed0d 100644
--- a/kipi-plugins/sendimages/plugin_sendimages.cpp
+++ b/kipi-plugins/sendimages/plugin_sendimages.cpp
@@ -255,7 +255,7 @@ void Plugin_SendImages::customEvent(TQCustomEvent *event)
return;
}
-#if KDE_VERSION >= 0x30200
+#if TDE_VERSION >= 0x30200
m_progressDlg->setButtonCancel( KStdGuiItem::close() );
#else
m_progressDlg->setButtonCancelText( i18n("&Close") );
diff --git a/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp b/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp
index 2a64ab6..047dc26 100644
--- a/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp
+++ b/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp
@@ -206,7 +206,7 @@ void SimpleViewerExport::startExport()
slotProcess();
-#if KDE_VERSION >= 0x30200
+#if TDE_VERSION >= 0x30200
m_progressDlg->setButtonCancel(KStdGuiItem::close());
#else
m_progressDlg->setButtonCancelText(i18n("&Close"));
diff --git a/kipi-plugins/wallpaper/plugin_wallpaper.cpp b/kipi-plugins/wallpaper/plugin_wallpaper.cpp
index 90efa9e..d5ac848 100644
--- a/kipi-plugins/wallpaper/plugin_wallpaper.cpp
+++ b/kipi-plugins/wallpaper/plugin_wallpaper.cpp
@@ -246,7 +246,7 @@ void Plugin_WallPaper::setWallpaper(int tqlayout)
path = KFileDialog::getSaveFileName(url.fileName(), TQString(), TQT_TQWIDGET(kapp->activeWindow()));
if (path.isNull()) return;
-#if KDE_VERSION > 0x30200
+#if TDE_VERSION > 0x30200
KIO::NetAccess::download(url, path, 0L);
#else
KIO::NetAccess::download(url, path);