[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/krita/core/builder
From:       Adrian Page <adrian () pagenet ! plus ! com>
Date:       2004-08-06 18:01:54
Message-ID: 20040806180154.9FBAF99A8 () office ! kde ! org
[Download RAW message or body]

CVS commit by page: 

KOffice HEAD requires KDE 3.2 minimum.


  M +3 -11     kis_image_magick_converter.cc   1.21


--- koffice/krita/core/builder/kis_image_magick_converter.cc  #1.20:1.21
@@ -267,10 +267,7 @@ KisImageBuilder_Result KisImageMagickCon
                 return KisImageBuilder_RESULT_NO_URI;
 
-#if KDE_IS_VERSION( 3, 1, 90 )
-        if (!KIO::NetAccess::exists(uri, false, qApp -> mainWidget()))
-#else
-        if (!KIO::NetAccess::exists(uri, false))
-#endif
+        if (!KIO::NetAccess::exists(uri, false, qApp -> mainWidget())) {
                 return KisImageBuilder_RESULT_NOT_EXIST;
+        }
 
 #if 1
@@ -279,10 +276,5 @@ KisImageBuilder_Result KisImageMagickCon
         QString tmpFile;
 
-#if KDE_IS_VERSION( 3, 1, 90 )
-        if (KIO::NetAccess::download(uri, tmpFile, qApp -> mainWidget()))
-#else
-        if (KIO::NetAccess::download(uri, tmpFile))
-#endif
-        {
+        if (KIO::NetAccess::download(uri, tmpFile, qApp -> mainWidget())) {
                 result = decode(tmpFile, false);
                 KIO::NetAccess::removeTempFile(tmpFile);


[prev in list] [next in list] [prev in thread] [next in thread]