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

List:       kde-commits
Subject:    kdegraphics/kamera/kioslave
From:       Benjamin Meyer <benjamin () csh ! rit ! edu>
Date:       2004-12-20 16:34:17
Message-ID: 20041220163417.DD6241CF38 () office ! kde ! org
[Download RAW message or body]

CVS commit by bmeyer: 

KDE_NO_COMPAT fixes


  M +9 -9      kamera.cpp   1.40


--- kdegraphics/kamera/kioslave/kamera.cpp  #1.39:1.40
@@ -229,5 +229,5 @@ void KameraProtocol::get(const KURL &url
         // fetch the data
         m_fileSize = 0;
-        gpr = gp_camera_file_get(m_camera, \
tocstr(fix_foldername(url.directory(false))), tocstr(url.filename()), fileType, \
m_file, m_context); +        gpr = gp_camera_file_get(m_camera, \
tocstr(fix_foldername(url.directory(false))), tocstr(url.fileName()), fileType, \
m_file, m_context);  if (    (gpr == GP_ERROR_NOT_SUPPORTED) &&
                 (fileType == GP_FILE_TYPE_PREVIEW)
@@ -236,5 +236,5 @@ void KameraProtocol::get(const KURL &url
                 // will either not be used, or still valid.
                 fileType = GP_FILE_TYPE_NORMAL;
-                gpr = gp_camera_file_get(m_camera, \
tocstr(fix_foldername(url.directory(false))), tocstr(url.filename()), fileType, \
m_file, m_context); +                gpr = gp_camera_file_get(m_camera, \
tocstr(fix_foldername(url.directory(false))), tocstr(url.fileName()), fileType, \
m_file, m_context);  }
         switch(gpr) {
@@ -245,5 +245,5 @@ void KameraProtocol::get(const KURL &url
                         gp_file_free(m_file);
                         m_file = NULL;
-                        error(KIO::ERR_DOES_NOT_EXIST, url.filename());
+                        error(KIO::ERR_DOES_NOT_EXIST, url.fileName());
                         closeCamera();
                         return ;
@@ -355,5 +355,5 @@ void KameraProtocol::statRegular(const K
                 gpr = gp_camera_get_about(m_camera,  &xx, m_context);   \
                 if (gpr != GP_OK) {                                     \
-                        error(KIO::ERR_DOES_NOT_EXIST, url.filename()); \
+                        error(KIO::ERR_DOES_NOT_EXIST, url.fileName()); \
                         return;                                         \
                 }                                                       \
@@ -372,5 +372,5 @@ void KameraProtocol::statRegular(const K
         for(int i = 0; i < gp_list_count(dirList); i++) {
                 gp_list_get_name(dirList, i, &name);
-                if (url.filename().compare(name) == 0) {
+                if (url.fileName().compare(name) == 0) {
                         gp_list_free(dirList);
                         UDSEntry entry;
@@ -405,9 +405,9 @@ void KameraProtocol::del(const KURL &url
 
         if(!openCamera()) {
-                error(KIO::ERR_CANNOT_DELETE, url.filename());
+                error(KIO::ERR_CANNOT_DELETE, url.fileName());
                 return;
         }
         if (!cameraSupportsDel()) {
-                error(KIO::ERR_CANNOT_DELETE, url.filename());
+                error(KIO::ERR_CANNOT_DELETE, url.fileName());
                 return;
         }
@@ -417,8 +417,8 @@ void KameraProtocol::del(const KURL &url
                 int ret;
 
-                ret = gp_camera_file_delete(m_camera, \
tocstr(fix_foldername(url.directory(false))), tocstr(url.filename()), m_context); +   \
ret = gp_camera_file_delete(m_camera, tocstr(fix_foldername(url.directory(false))), \
tocstr(url.fileName()), m_context);  
                 if(ret != GP_OK) {
-                        error(KIO::ERR_CANNOT_DELETE, url.filename());
+                        error(KIO::ERR_CANNOT_DELETE, url.fileName());
                 } else {
                         finished();


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