summaryrefslogtreecommitdiff
authorharlekin <harlekin>2004-03-02 20:29:03 (UTC)
committer harlekin <harlekin>2004-03-02 20:29:03 (UTC)
commit9631067183b4cafa2ea07d2202bf88f4d42c35e2 (patch) (side-by-side diff)
tree148a780ed518c978770d69ea93a08a3cb85d46b8
parent914b5cd04a59c8569c14d9afedd9eeb1796e2db7 (diff)
downloadopie-9631067183b4cafa2ea07d2202bf88f4d42c35e2.zip
opie-9631067183b4cafa2ea07d2202bf88f4d42c35e2.tar.gz
opie-9631067183b4cafa2ea07d2202bf88f4d42c35e2.tar.bz2
libopie1->libopie2, segfaulting
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/settings/light-and-power/light-and-power.pro4
-rw-r--r--core/settings/light-and-power/light.cpp5
-rw-r--r--core/settings/light-and-power/light.h2
-rw-r--r--core/settings/light-and-power/main.cpp2
-rw-r--r--core/settings/light-and-power/sensor.cpp31
-rw-r--r--core/settings/light-and-power/sensor.h2
6 files changed, 24 insertions, 22 deletions
diff --git a/core/settings/light-and-power/light-and-power.pro b/core/settings/light-and-power/light-and-power.pro
index 928976a..bc8ba4b 100644
--- a/core/settings/light-and-power/light-and-power.pro
+++ b/core/settings/light-and-power/light-and-power.pro
@@ -1,3 +1,3 @@
-CONFIG += qt warn_on release quick-app
+CONFIG += qt warn_on debug quick-app
HEADERS = light.h sensor.h calibration.h
SOURCES = light.cpp main.cpp sensor.cpp calibration.cpp
@@ -5,5 +5,5 @@ INTERFACES = lightsettingsbase.ui sensorbase.ui
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += ../$(OPIEDIR)/include
-LIBS += -lqpe -lopie
+LIBS += -lqpe -lopiecore2
TARGET = light-and-power
diff --git a/core/settings/light-and-power/light.cpp b/core/settings/light-and-power/light.cpp
index ce45836..09fb767 100644
--- a/core/settings/light-and-power/light.cpp
+++ b/core/settings/light-and-power/light.cpp
@@ -28,4 +28,7 @@
#include "light.h"
+#include "sensor.h"
+
+#include <opie2/odevice.h>
#include <qpe/config.h>
@@ -44,7 +47,5 @@
#include <qcombobox.h>
-#include <opie/odevice.h>
-#include "sensor.h"
using namespace Opie;
diff --git a/core/settings/light-and-power/light.h b/core/settings/light-and-power/light.h
index 2167817..9077a09 100644
--- a/core/settings/light-and-power/light.h
+++ b/core/settings/light-and-power/light.h
@@ -29,8 +29,8 @@
#define __LIGHT_H__
+#include "lightsettingsbase.h"
#include <qstringlist.h>
#include <qlistbox.h>
-#include "lightsettingsbase.h"
class QTimer;
diff --git a/core/settings/light-and-power/main.cpp b/core/settings/light-and-power/main.cpp
index cb43ce0..7a47b0b 100644
--- a/core/settings/light-and-power/main.cpp
+++ b/core/settings/light-and-power/main.cpp
@@ -21,5 +21,5 @@
#include "light.h"
-#include <opie/oapplicationfactory.h>
+#include <opie2/oapplicationfactory.h>
diff --git a/core/settings/light-and-power/sensor.cpp b/core/settings/light-and-power/sensor.cpp
index 013e655..53c3aed 100644
--- a/core/settings/light-and-power/sensor.cpp
+++ b/core/settings/light-and-power/sensor.cpp
@@ -17,5 +17,5 @@
  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU General
..}^=.=       =       ; Public License for more details.
-++=   -.     .`     .:
+++=   -.     .`     .:
 :     =  ...= . :.=- You should have received a copy of the GNU
 -.   .:....=;==+<; General Public License along with this file;
@@ -26,26 +26,27 @@
*/
+
+#include "calibration.h"
+#include "sensor.h"
+
+#include <opie2/odevice.h>
+
#include <qlayout.h>
#include <qslider.h>
#include <qspinbox.h>
-#include <opie/odevice.h>
-
using namespace Opie;
-#include "calibration.h"
-#include "sensor.h"
-
Sensor::Sensor ( QStringList &params, QWidget *parent, const char *name )
: SensorBase ( parent, name, true, WStyle_ContextHelp ), m_params ( params )
{
- int steps = 12;
+ int steps = 12;
int inter = 2;
-
+
int smin = 40;
int smax = 215;
int lmin = 1;
int lmax = 255;
-
+
switch ( params. count ( )) {
case 6: lmax = params [5]. toInt ( );
@@ -59,9 +60,9 @@ Sensor::Sensor ( QStringList &params, QWidget *parent, const char *name )
int xscale = ODevice::inst ( )-> lightSensorResolution ( );
int yscale = ODevice::inst ( )-> displayBrightnessResolution ( );
-
+
QVBoxLayout *lay = new QVBoxLayout ( frame );
lay-> setMargin ( 2 );
m_calib = new Calibration ( frame );
- lay-> add ( m_calib );
+ lay-> add ( m_calib );
m_calib-> setScale ( QSize ( xscale, yscale ));
@@ -70,14 +71,14 @@ Sensor::Sensor ( QStringList &params, QWidget *parent, const char *name )
m_calib-> setStartPoint ( QPoint ( smin * xscale / 256, lmax * yscale / 256 ));
m_calib-> setEndPoint ( QPoint ( smax * xscale / 256, lmin * yscale / 256 ));
-
+
interval-> setValue ( inter );
linesteps-> setValue ( steps );
-
+
connect ( interval, SIGNAL( valueChanged(int)), m_calib, SLOT( setInterval(int)));
connect ( linesteps, SIGNAL( valueChanged(int)), m_calib, SLOT( setLineSteps(int)));
-
+
connect ( m_calib, SIGNAL( startPointChanged(const QPoint&)), this, SLOT( pointDrag(const QPoint&)));
connect ( m_calib, SIGNAL( endPointChanged(const QPoint&)), this, SLOT( pointDrag(const QPoint&)));
-}
+}
void Sensor::accept ( )
diff --git a/core/settings/light-and-power/sensor.h b/core/settings/light-and-power/sensor.h
index b484519..092ac6c 100644
--- a/core/settings/light-and-power/sensor.h
+++ b/core/settings/light-and-power/sensor.h
@@ -53,3 +53,3 @@ private:
};
-#endif \ No newline at end of file
+#endif