TDE
/
kipi-plugins
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kipi-plugins
0
0
Fork 0
Code Issues Releases Wiki Activity

Remove use of TDE_VERSION

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/34/head
Michele Calgaro 4 days ago
parent 27799a684b
commit 88ba49ec4f
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
9 changed files with 4 additions and 74 deletions
Show Stats Download Patch File Download Diff File

16
kipi-plugins/acquireimages/acquireimagedialog.cpp
Unescape Escape View File

@ -70,7 +70,6 @@ extern "C"
#include <tdeio/netaccess.h>
#include <kimageio.h>
#include <tdetempfile.h>
#include <tdeversion.h>
#include <kdebug.h>
#include <tdefiletreeview.h>
#include <tdeapplication.h>
@ -92,15 +91,6 @@ extern "C"
namespace KIPIAcquireImagesPlugin
{
// Used by slotOK() method.
#undef NETACCESS_WIDGET
#if TDE_VERSION >= 0x30200
#define NETACCESS_WIDGET , this
#else
#define NETACCESS_WIDGET
#endif
AcquireImageDialog::AcquireImageDialog( KIPI::Interface* interface, TQWidget *parent, const TQImage &img)
: KDialogBase( IconList, i18n("Save Target Image Options"), Help|Ok|Cancel,
Ok, parent, "AcquireImageDialog", true, false ), m_interface( interface )
@ -428,14 +418,14 @@ void AcquireImageDialog::slotOk()
TQString ext = extension(imageFormat);
url.setFileName(fileName + ext);
if (TDEIO::NetAccess::exists(url, false NETACCESS_WIDGET))
if (TDEIO::NetAccess::exists(url, false, this))
{
for (int idx = 1; idx < 100 ; ++idx)
{
url.setFileName(TQString("%1_%2%3").arg(fileName).arg(idx).arg(ext));
kdDebug(51001) << "File already exist. Try to fixed target Url to: " << url.prettyURL() << endl;
if (!TDEIO::NetAccess::exists(url, false NETACCESS_WIDGET))
if (!TDEIO::NetAccess::exists(url, false, this))
break;
}
}
@ -478,7 +468,7 @@ void AcquireImageDialog::slotOk()
// Upload the image if necessary
if ( !url.isLocalFile())
{
if (!TDEIO::NetAccess::upload(imagePath, url NETACCESS_WIDGET))
if (!TDEIO::NetAccess::upload(imagePath, url, this))
{
KMessageBox::error(this, i18n("Could not upload image to \"%1\".").arg(url.prettyURL()));
return;

22
kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp
Unescape Escape View File

@ -76,7 +76,6 @@ extern "C"
#include <tdeio/previewjob.h>
#include <kbuttonbox.h>
#include <tdediroperator.h>
#include <tdeversion.h>
#include <kurlrequester.h>
#include <klineedit.h>
@ -475,11 +474,7 @@ bool BatchProcessImagesDialog::startProcess(void)
KURL desturl(targetAlbum + "/" + item->nameDest());
#if TDE_VERSION >= 0x30200
if ( TDEIO::NetAccess::exists( desturl, false, tdeApp->activeWindow() ) == true )
#else
if ( TDEIO::NetAccess::exists( desturl ) == true )
#endif
{
switch (overwriteMode())
{
@ -714,11 +709,7 @@ void BatchProcessImagesDialog::slotProcessDone(TDEProcess* proc)
{
KURL deleteImage(item->pathSrc());
#if TDE_VERSION >= 0x30200
if ( TDEIO::NetAccess::del( deleteImage, tdeApp->activeWindow() ) == false )
#else
if ( TDEIO::NetAccess::del( deleteImage ) == false )
#endif
{
item->changeResult(i18n("Warning:"));
item->changeError(i18n("cannot remove original image file."));
@ -867,11 +858,7 @@ void BatchProcessImagesDialog::slotPreviewProcessDone(TDEProcess* proc)
KURL deletePreviewImage(m_tmpFolder + "/" + TQString::number(getpid()) + "preview.PNG");
#if TDE_VERSION >= 0x30200
TDEIO::NetAccess::del( deletePreviewImage, tdeApp->activeWindow() );
#else
TDEIO::NetAccess::del( deletePreviewImage );
#endif
}
else
{
@ -1028,13 +1015,8 @@ void BatchProcessImagesDialog::processAborted(bool removeFlag)
KURL deleteImage = m_destinationURL->url();
deleteImage.addPath(item->nameDest());
#if TDE_VERSION >= 0x30200
if ( TDEIO::NetAccess::exists( deleteImage, false, tdeApp->activeWindow() ) == true )
TDEIO::NetAccess::del( deleteImage, tdeApp->activeWindow() );
#else
if ( TDEIO::NetAccess::exists( deleteImage ) == true )
TDEIO::NetAccess::del( deleteImage );
#endif
}
endProcess();
@ -1066,11 +1048,7 @@ TQString BatchProcessImagesDialog::RenameTargetImageFile(TQFileInfo *fi)
+ "." + fi->filePath().section('.', -1 );
}
while ( Enumerator < 100 &&
#if TDE_VERSION >= 0x30200
TDEIO::NetAccess::exists( NewDestUrl, true, tdeApp->activeWindow() )
#else
TDEIO::NetAccess::exists( NewDestUrl )
#endif
== true );
if (Enumerator == 100) return TQString();

6
kipi-plugins/batchprocessimages/imagepreview.cpp
Unescape Escape View File

@ -63,7 +63,6 @@ extern "C"
#include <khelpmenu.h>
#include <kiconloader.h>
#include <tdepopupmenu.h>
#include <tdeversion.h>
// Local includes
@ -307,12 +306,7 @@ void PixmapView::PreviewProcessDone(TDEProcess* proc)
horizontalScrollBar()->setLineStep(1);
verticalScrollBar()->setLineStep(1);
KURL deletePreviewImage( m_previewFileName );
#if TDE_VERSION >= 0x30200
TDEIO::NetAccess::del( deletePreviewImage, tdeApp->activeWindow() );
#else
TDEIO::NetAccess::del( deletePreviewImage );
#endif
}
else
{

7
kipi-plugins/cdarchiving/plugin_cdarchiving.cpp
Unescape Escape View File

@ -26,7 +26,6 @@
#include <tdeapplication.h>
#include <tdeconfig.h>
#include <kdebug.h>
#include <tdeversion.h>
#include <kgenericfactory.h>
#include <tdeinstance.h>
#include <klibloader.h>
@ -312,13 +311,7 @@ void Plugin_CDArchiving::customEvent(TQCustomEvent *event)
if ( d->action == KIPICDArchivingPlugin::BuildK3bProject )
{
m_current = 0;
#if TDE_VERSION >= 0x30200
m_progressDlg->setButtonCancel( KStdGuiItem::close() );
#else
m_progressDlg->setButtonCancelText( i18n("&Close") );
#endif
disconnect(m_progressDlg, TQ_SIGNAL(cancelClicked()),
this, TQ_SLOT(slotCancel()));

5
kipi-plugins/findimages/plugin_findimages.cpp
Unescape Escape View File

@ -35,7 +35,6 @@
#include <kdebug.h>
#include <tdemessagebox.h>
#include <tdeapplication.h>
#include <tdeversion.h>
// Lib KIPI includes.
@ -276,11 +275,7 @@ void Plugin_FindImages::customEvent(TQCustomEvent *event)
if( d->action == KIPIFindDupplicateImagesPlugin::Progress )
{
#if TDE_VERSION >= 0x30200
m_progressDlg->setButtonCancel( KStdGuiItem::close() );
#else
m_progressDlg->setButtonCancelText( i18n("&Close") );
#endif
disconnect(m_progressDlg, TQ_SIGNAL(cancelClicked()),
this, TQ_SLOT(slotCancel()));

5
kipi-plugins/jpeglossless/plugin_jpeglossless.cpp
Unescape Escape View File

@ -439,12 +439,7 @@ void Plugin_JPEGLossless::customEvent(TQCustomEvent *event)
if (m_failed)
{
#if TDE_VERSION >= 0x30200
m_progressDlg->setButtonCancel( KStdGuiItem::close() );
#else
m_progressDlg->setButtonCancelText( i18n("&Close") );
#endif
disconnect(m_progressDlg, TQ_SIGNAL(cancelClicked()),
this, TQ_SLOT(slotCancel()));
}

6
kipi-plugins/sendimages/plugin_sendimages.cpp
Unescape Escape View File

@ -43,7 +43,6 @@ extern "C"
#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <kimageio.h>
#include <tdeversion.h>
// LibKipi includes.
@ -255,12 +254,7 @@ void Plugin_SendImages::customEvent(TQCustomEvent *event)
return;
}
#if TDE_VERSION >= 0x30200
m_progressDlg->setButtonCancel( KStdGuiItem::close() );
#else
m_progressDlg->setButtonCancelText( i18n("&Close") );
#endif
disconnect(m_progressDlg, TQ_SIGNAL(cancelClicked()),
this, TQ_SLOT(slotCancel()));

6
kipi-plugins/simpleviewerexport/simpleviewerexport.cpp
Unescape Escape View File

@ -206,11 +206,7 @@ void SimpleViewerExport::startExport()
slotProcess();
#if TDE_VERSION >= 0x30200
m_progressDlg->setButtonCancel(KStdGuiItem::close());
#else
m_progressDlg->setButtonCancelText(i18n("&Close"));
#endif
m_progressDlg->setButtonCancel(KStdGuiItem::close());
}

5
kipi-plugins/wallpaper/plugin_wallpaper.cpp
Unescape Escape View File

@ -35,7 +35,6 @@
#include <tdeapplication.h>
#include <tdemessagebox.h>
#include <ktextbrowser.h>
#include <tdeversion.h>
#include <tdefiledialog.h>
#include <tdeio/netaccess.h>
@ -241,11 +240,7 @@ void Plugin_WallPaper::setWallpaper(int layout)
path = KFileDialog::getSaveFileName(url.fileName(), TQString(), tdeApp->activeWindow());
if (path.isNull()) return;
#if TDE_VERSION > 0x30200
TDEIO::NetAccess::download(url, path, 0L);
#else
TDEIO::NetAccess::download(url, path);
#endif
}
TQString cmd = TQString("dcop kdesktop KBackgroundIface setWallpaper '%1' %2")

Write Preview
Loading…
Cancel
Save