diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:59:00 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:59:00 -0600 |
| commit | ec1fddcd0d6663ad273af85357f04abbc5689468 (patch) | |
| tree | 6cb946ab8b4771868c6eee8d1aa5213d6ec246e2 /kamera/kioslave | |
| parent | c2637a0da6d9a1c8626ca39f8451ab3b7cda487a (diff) | |
| download | tdegraphics-ec1fddcd0d6663ad273af85357f04abbc5689468.tar.gz tdegraphics-ec1fddcd0d6663ad273af85357f04abbc5689468.zip | |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit c2637a0da6d9a1c8626ca39f8451ab3b7cda487a.
Diffstat (limited to 'kamera/kioslave')
| -rw-r--r-- | kamera/kioslave/kamera.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kamera/kioslave/kamera.cpp b/kamera/kioslave/kamera.cpp index b70e9241..7e8c9387 100644 --- a/kamera/kioslave/kamera.cpp +++ b/kamera/kioslave/kamera.cpp @@ -30,7 +30,7 @@ #include <errno.h> #include <tqfile.h> -#include <textstream.h> +#include <tqtextstream.h> #include <kdebug.h> #include <kinstance.h> @@ -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); @@ -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); } @@ -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; |