diff options
Diffstat (limited to 'kamera/kioslave/kamera.cpp')
| -rw-r--r-- | kamera/kioslave/kamera.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/kamera/kioslave/kamera.cpp b/kamera/kioslave/kamera.cpp index 5aefd632..05917e3c 100644 --- a/kamera/kioslave/kamera.cpp +++ b/kamera/kioslave/kamera.cpp @@ -55,7 +55,7 @@ extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); - static void frontendCameraStatus(GPContext *context, const char *format, va_list args, void *data); + static void frontendCameratqStatus(GPContext *context, const char *format, va_list args, void *data); static unsigned int frontendProgressStart( GPContext *context, float totalsize, const char *format, va_list args, void *data @@ -242,7 +242,7 @@ void KameraProtocol::get(const KURL &url) #undef GPHOTO_TEXT_FILE // emit info message - infoMessage( i18n("Retrieving data from camera <b>%1</b>").arg(url.user()) ); + infoMessage( i18n("Retrieving data from camera <b>%1</b>").tqarg(url.user()) ); // Note: There's no need to re-read directory for each get() anymore gp_file_new(&m_file); @@ -574,7 +574,7 @@ void KameraProtocol::listDir(const KURL &url) gp_list_free (list); /* Avoid duplicated entry for usb: and usb:001,042 entries. */ - if (ports.contains("usb:") && names[ports["usb:"]]!="usb:") + if (ports.tqcontains("usb:") && names[ports["usb:"]]!="usb:") ports.remove("usb:"); for (it = groupList.begin(); it != groupList.end(); it++) { @@ -606,7 +606,7 @@ void KameraProtocol::listDir(const KURL &url) xurl.setProtocol("camera"); xurl.setUser(*it); /* Avoid setting usb:xxx,yyy. */ - if (m_cfgPath.contains("usb:")>0) { + if (m_cfgPath.tqcontains("usb:")>0) { names[*it] = "usb:"; xurl.setHost("usb:"); } else { @@ -795,7 +795,7 @@ void KameraProtocol::setHost(const TQString& host, int port, const TQString& use } // register gphoto2 callback functions - gp_context_set_status_func(m_context, frontendCameraStatus, this); + gp_context_set_status_func(m_context, frontendCameratqStatus, this); gp_context_set_progress_funcs(m_context, frontendProgressStart, frontendProgressUpdate, NULL, this); // gp_camera_set_message_func(m_camera, ..., this) @@ -881,7 +881,7 @@ void KameraProtocol::translateFileToUDS(UDSEntry &udsEntry, const CameraFileInfo if (info.file.fields & GP_FILE_INFO_TYPE) { atom.m_uds = UDS_MIME_TYPE; - atom.m_str = TQString::fromLatin1(info.file.type); + atom.m_str = TQString::tqfromLatin1(info.file.type); udsEntry.append(atom); } @@ -890,7 +890,7 @@ void KameraProtocol::translateFileToUDS(UDSEntry &udsEntry, const CameraFileInfo atom.m_long = 0; atom.m_long |= (info.file.permissions & GP_FILE_PERM_READ) ? (S_IRUSR | S_IRGRP | S_IROTH) : 0; // we cannot represent individual FP_FILE_PERM_DELETE permission in the Unix access scheme - // since the parent directory's write permission defines that + // since the tqparent directory's write permission defines that udsEntry.append(atom); } else { // basic permissions, in case the camera doesn't provide permissions info @@ -1028,7 +1028,7 @@ unsigned int frontendProgressStart( } // this callback function is activated on every status message from gphoto2 -static void frontendCameraStatus(GPContext * /*context*/, const char *format, va_list args, void *data) +static void frontendCameratqStatus(GPContext * /*context*/, const char *format, va_list args, void *data) { KameraProtocol *object = (KameraProtocol*)data; char *status; |