From 45f529de247fc4b3662f6b474abe03fe904306ec Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:31:39 -0600 Subject: Rename old tq methods that no longer need a unique name --- kamera/kcontrol/kamera.cpp | 2 +- kamera/kcontrol/kameradevice.cpp | 4 ++-- kamera/kioslave/kamera.cpp | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'kamera') diff --git a/kamera/kcontrol/kamera.cpp b/kamera/kcontrol/kamera.cpp index fe4739de..cb3200f4 100644 --- a/kamera/kcontrol/kamera.cpp +++ b/kamera/kcontrol/kamera.cpp @@ -113,7 +113,7 @@ void KKameraConfig::displayGPSuccessDialogue(void) connect(m_deviceSel, TQT_SIGNAL(selectionChanged(TQIconViewItem *)), TQT_SLOT(slot_deviceSelected(TQIconViewItem *))); - m_deviceSel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); + m_deviceSel->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); // create actions KAction *act; diff --git a/kamera/kcontrol/kameradevice.cpp b/kamera/kcontrol/kameradevice.cpp index 9ce6deae..60521d1e 100644 --- a/kamera/kcontrol/kameradevice.cpp +++ b/kamera/kcontrol/kameradevice.cpp @@ -293,7 +293,7 @@ KameraDeviceSelectDialog::KameraDeviceSelectDialog(TQWidget *parent, KCamera *de connect(m_modelSel, TQT_SIGNAL(selectionChanged(TQListViewItem *)), TQT_SLOT(slot_setModel(TQListViewItem *))); // make sure listview only as wide as it needs to be - m_modelSel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Maximum, + m_modelSel->setSizePolicy(TQSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Preferred)); TQVBoxLayout *rightLayout = new TQVBoxLayout(0L, 0, KDialog::spacingHint()); @@ -347,7 +347,7 @@ KameraDeviceSelectDialog::KameraDeviceSelectDialog(TQWidget *parent, KCamera *de for (int i = 0; i < gphoto_ports; i++) { if (gp_port_info_list_get_info(list, i, &info) >= 0) { if (strncmp(info.path, "serial:", 7) == 0) - m_serialPortCombo->insertItem(TQString::tqfromLatin1(info.path).mid(7)); + m_serialPortCombo->insertItem(TQString::fromLatin1(info.path).mid(7)); } } gp_port_info_list_free(list); diff --git a/kamera/kioslave/kamera.cpp b/kamera/kioslave/kamera.cpp index 7e8c9387..7234f039 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 frontendCameratqStatus(GPContext *context, const char *format, va_list args, void *data); + static void frontendCameraStatus(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 @@ -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, frontendCameratqStatus, this); + gp_context_set_status_func(m_context, frontendCameraStatus, 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::tqfromLatin1(info.file.type); + atom.m_str = TQString::fromLatin1(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 frontendCameratqStatus(GPContext * /*context*/, const char *format, va_list args, void *data) +static void frontendCameraStatus(GPContext * /*context*/, const char *format, va_list args, void *data) { KameraProtocol *object = (KameraProtocol*)data; char *status; -- cgit v1.2.3