diff options
Diffstat (limited to 'kamera/kcontrol/kameradevice.cpp')
| -rw-r--r-- | kamera/kcontrol/kameradevice.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kamera/kcontrol/kameradevice.cpp b/kamera/kcontrol/kameradevice.cpp index 9ce6deae..6182eec4 100644 --- a/kamera/kcontrol/kameradevice.cpp +++ b/kamera/kcontrol/kameradevice.cpp @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <tqlayout.h> +#include <layout.h> #include <tqwidgetstack.h> #include <tqvbuttongroup.h> #include <tqvgroupbox.h> @@ -86,7 +86,7 @@ bool KCamera::initInformation() int index = gp_abilities_list_lookup_model(m_abilitylist, m_model.local8Bit().data()); if(index < 0) { emit error(i18n("Description of abilities for camera %1 is not available." - " Configuration options may be incorrect.").tqarg(m_model)); + " Configuration options may be incorrect.").arg(m_model)); return false; } gp_abilities_list_get_abilities(m_abilitylist, index, &m_abilities); @@ -282,7 +282,7 @@ KameraDeviceSelectDialog::KameraDeviceSelectDialog(TQWidget *parent, KCamera *de TQWidget *page = new TQWidget( this ); setMainWidget(page); - // a tqlayout with vertical boxes + // a layout with vertical boxes TQHBoxLayout *topLayout = new TQHBoxLayout(page, 0, KDialog::spacingHint()); // the models list @@ -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); @@ -432,7 +432,7 @@ void KameraDeviceSelectDialog::slot_setModel(TQListViewItem *item) int index = gp_abilities_list_lookup_model(m_device->m_abilitylist, model.local8Bit().data()); if(index < 0) { slot_error(i18n("Description of abilities for camera %1 is not available." - " Configuration options may be incorrect.").tqarg(model)); + " Configuration options may be incorrect.").arg(model)); } int result = gp_abilities_list_get_abilities(m_device->m_abilitylist, index, &abilities); if (result == GP_OK) { @@ -452,7 +452,7 @@ void KameraDeviceSelectDialog::slot_setModel(TQListViewItem *item) setPortType(INDEX_USB); } else { slot_error(i18n("Description of abilities for camera %1 is not available." - " Configuration options may be incorrect.").tqarg(model)); + " Configuration options may be incorrect.").arg(model)); } } |