Katana_mirror/kde-playground
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-playground.git synced 2025-02-24 02:42:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kamera: disable code that has to be ported

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2021-07-12 23:55:00 +03:00
parent 1994b3ee00
commit fc8d00eb0d
3 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
kamera/kcontrol/kamera.cpp
View file

@ -41,7 +41,6 @@
#include <KDebug> #include <KDebug>
#include <KActionCollection> #include <KActionCollection>
#include "kameraconfigdialog.h"
#include "kameradevice.h" #include "kameradevice.h"
K_PLUGIN_FACTORY(KKameraConfigFactory, registerPlugin<KKameraConfig>();) K_PLUGIN_FACTORY(KKameraConfigFactory, registerPlugin<KKameraConfig>();)

16
kamera/kcontrol/kameraconfigdialog.cpp
View file

@ -22,13 +22,13 @@
*/ */
#include <qlayout.h> #include <qlayout.h>
#include <qlabel.h> #include <qlabel.h>
#include <Q3GroupBox>
#include <qcheckbox.h> #include <qcheckbox.h>
#include <qradiobutton.h> #include <qradiobutton.h>
#include <qlineedit.h> #include <qlineedit.h>
#include <qcombobox.h> #include <qcombobox.h>
#include <qslider.h> #include <qslider.h>
#include <Q3ButtonGroup> #include <QGroupBox>
#include <QButtonGroup>
#include <kvbox.h> #include <kvbox.h>
#include <qtabwidget.h> #include <qtabwidget.h>
@ -122,6 +122,8 @@ void KameraConfigDialog::appendWidget(QWidget *parent, CameraWidget *widget)
break; break;
} }
#warning FIXME: GP_WIDGET_RANGE
#if 0
case GP_WIDGET_RANGE: { case GP_WIDGET_RANGE: {
float widget_low; float widget_low;
float widget_high; float widget_high;
@ -144,6 +146,7 @@ void KameraConfigDialog::appendWidget(QWidget *parent, CameraWidget *widget)
break; break;
} }
#endif
case GP_WIDGET_TOGGLE: { case GP_WIDGET_TOGGLE: {
gp_widget_get_value(widget, &widget_value_int); gp_widget_get_value(widget, &widget_value_int);
@ -158,8 +161,9 @@ void KameraConfigDialog::appendWidget(QWidget *parent, CameraWidget *widget)
break; break;
} }
case GP_WIDGET_RADIO: #warning FIXME: GP_WIDGET_RADIO
{ #if 0
case GP_WIDGET_RADIO: {
gp_widget_get_value(widget, &widget_value_string); gp_widget_get_value(widget, &widget_value_string);
int count = gp_widget_count_choices(widget); int count = gp_widget_count_choices(widget);
@ -190,6 +194,7 @@ void KameraConfigDialog::appendWidget(QWidget *parent, CameraWidget *widget)
break; break;
} }
#endif
case GP_WIDGET_MENU: { case GP_WIDGET_MENU: {
gp_widget_get_value(widget, &widget_value_string); gp_widget_get_value(widget, &widget_value_string);
@ -287,12 +292,15 @@ void KameraConfigDialog::updateWidgetValue(CameraWidget *widget)
break; break;
} }
#warning FIXME: GP_WIDGET_RADIO
#if 0
case GP_WIDGET_RADIO: { case GP_WIDGET_RADIO: {
Q3ButtonGroup *buttonGroup = static_cast<Q3VButtonGroup *>(m_wmap[widget]); Q3ButtonGroup *buttonGroup = static_cast<Q3VButtonGroup *>(m_wmap[widget]);
gp_widget_set_value(widget, (void *)buttonGroup->selected()->text().toLocal8Bit().data()); gp_widget_set_value(widget, (void *)buttonGroup->selected()->text().toLocal8Bit().data());
break; break;
} }
#endif
case GP_WIDGET_MENU: { case GP_WIDGET_MENU: {
QComboBox *comboBox = static_cast<QComboBox *>(m_wmap[widget]); QComboBox *comboBox = static_cast<QComboBox *>(m_wmap[widget]);
gp_widget_set_value(widget, (void *)comboBox->currentText().toLocal8Bit().data()); gp_widget_set_value(widget, (void *)comboBox->currentText().toLocal8Bit().data());

13
kamera/kcontrol/kameradevice.cpp
View file

@ -75,8 +75,9 @@ KCamera::~KCamera()
bool KCamera::initInformation() bool KCamera::initInformation()
{ {
if (m_model.isNull()) if (m_model.isNull()) {
return false; return false;
}
if (gp_abilities_list_new(&m_abilitylist) != GP_OK) { if (gp_abilities_list_new(&m_abilitylist) != GP_OK) {
emit error(i18n("Could not allocate memory for the abilities list.")); emit error(i18n("Could not allocate memory for the abilities list."));
@ -286,11 +287,11 @@ CameraAbilities KCamera::abilities()
KameraDeviceSelectDialog::KameraDeviceSelectDialog(QWidget *parent, KCamera *device) KameraDeviceSelectDialog::KameraDeviceSelectDialog(QWidget *parent, KCamera *device)
: KDialog(parent) : KDialog(parent)
{ {
setCaption( i18n("Select Camera Device") ); setCaption(i18n("Select Camera Device"));
setButtons( Ok | Cancel ); setButtons(Ok | Cancel);
setDefaultButton( Ok ); setDefaultButton(Ok);
setModal( true ); setModal(true);
showButtonSeparator( true ); showButtonSeparator(true);
m_device = device; m_device = device;
connect(m_device, SIGNAL(error(const QString &)), connect(m_device, SIGNAL(error(const QString &)),
SLOT(slot_error(const QString &))); SLOT(slot_error(const QString &)));