Differential D23905 Diff 66022 kcontrol/kameradevice.cpp

Changeset View

Standalone View

kcontrol/kameradevice.cpp

Context not available.
300		300
301	setModal( true );	301		setModal( true );
302	m_device = device;	302		m_device = device;
303	connect(m_device, SIGNAL(error(QString)),	303		connect(m_device, qOverload<const QString&>(&KCamera::error),
304	SLOT(slot_error(QString)));	304		this, qOverload<const QString&>(&KameraDeviceSelectDialog::slot_error));
			Petross404AuthorUnsubmitted Not Done I didn't notice this earlier. Should I fix this? Petross404: I didn't notice this earlier. Should I fix this?
305	connect(m_device, SIGNAL(error(QString,QString)),	305
306	SLOT(slot_error(QString,QString)));	306		connect(m_device, qOverload<const QString&, const QString&>(&KCamera::error),
		307		this, qOverload<const QString&, const QString&>(&KameraDeviceSelectDialog::slot_error));
307		308
308	QWidget *page = new QWidget( this );	309		QWidget *page = new QWidget( this );
309		310
Context not available.
320	m_modelSel->setModel(m_model);	321		m_modelSel->setModel(m_model);
321		322
322	topLayout->addWidget( m_modelSel );	323		topLayout->addWidget( m_modelSel );
323	connect(m_modelSel, SIGNAL(activated(QModelIndex)),	324		connect(m_modelSel, &QListView::activated, this, &KameraDeviceSelectDialog::slot_setModel);
324	SLOT(slot_setModel(QModelIndex)));	325		connect(m_modelSel, &QListView::clicked, this, &KameraDeviceSelectDialog::slot_setModel);
325	connect(m_modelSel, SIGNAL(clicked(QModelIndex)),	326
326	SLOT(slot_setModel(QModelIndex)));
327	// make sure listview only as wide as it needs to be	327		// make sure listview only as wide as it needs to be
328	m_modelSel->setSizePolicy(QSizePolicy(QSizePolicy::Maximum,	328		m_modelSel->setSizePolicy(QSizePolicy(QSizePolicy::Maximum,
329	QSizePolicy::Preferred));	329		QSizePolicy::Preferred));
Context not available.
362		362
363	lay->addWidget(grid2);	363		lay->addWidget(grid2);
364	lay->addWidget( m_settingsStack );	364		lay->addWidget( m_settingsStack );
365	connect(m_serialRB, SIGNAL(toggled(bool)),	365		connect(m_serialRB, &QRadioButton::toggled, this, &KameraDeviceSelectDialog::changeCurrentIndex);
366	this, SLOT(changeCurrentIndex()) );	366		connect(m_USBRB, &QRadioButton::toggled, this, &KameraDeviceSelectDialog::changeCurrentIndex);
367	connect(m_USBRB, SIGNAL(toggled(bool)),	367
368	this, SLOT(changeCurrentIndex()) );
369	// none tab	368		// none tab
370	m_settingsStack->insertWidget(INDEX_NONE,	369		m_settingsStack->insertWidget(INDEX_NONE,
371	new QLabel(i18n("No port type selected."),	370		new QLabel(i18n("No port type selected."),
Context not available.
400	// to enableButtonOk(true) in slot_setModel.	399		// to enableButtonOk(true) in slot_setModel.
401	okButton->setEnabled(false);	400		okButton->setEnabled(false);
402	okButton->setShortcut(Qt::CTRL \| Qt::Key_Return);	401		okButton->setShortcut(Qt::CTRL \| Qt::Key_Return);
403	connect(okButton, SIGNAL(clicked(bool)), SLOT(accept()));	402		connect(okButton, &QPushButton::clicked, this, &KameraDeviceSelectDialog::accept);
404	connect(cancelButton, SIGNAL(clicked(bool)), SLOT(close()));	403		connect(cancelButton, &QPushButton::clicked, this, &KameraDeviceSelectDialog::close);
405	rightLayout->addWidget(m_OkCancelButtonBox);	404		rightLayout->addWidget(m_OkCancelButtonBox);
406		405
407	// query gphoto2 for existing serial ports	406		// query gphoto2 for existing serial ports
Context not available.