author | harlekin <harlekin> | 2004-03-02 20:29:03 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2004-03-02 20:29:03 (UTC) |
commit | 9631067183b4cafa2ea07d2202bf88f4d42c35e2 (patch) (unidiff) | |
tree | 148a780ed518c978770d69ea93a08a3cb85d46b8 /core | |
parent | 914b5cd04a59c8569c14d9afedd9eeb1796e2db7 (diff) | |
download | opie-9631067183b4cafa2ea07d2202bf88f4d42c35e2.zip opie-9631067183b4cafa2ea07d2202bf88f4d42c35e2.tar.gz opie-9631067183b4cafa2ea07d2202bf88f4d42c35e2.tar.bz2 |
libopie1->libopie2, segfaulting
-rw-r--r-- | core/settings/light-and-power/light-and-power.pro | 4 | ||||
-rw-r--r-- | core/settings/light-and-power/light.cpp | 5 | ||||
-rw-r--r-- | core/settings/light-and-power/light.h | 2 | ||||
-rw-r--r-- | core/settings/light-and-power/main.cpp | 2 | ||||
-rw-r--r-- | core/settings/light-and-power/sensor.cpp | 11 | ||||
-rw-r--r-- | core/settings/light-and-power/sensor.h | 0 |
6 files changed, 13 insertions, 11 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,10 +1,10 @@ | |||
1 | CONFIG += qt warn_on release quick-app | 1 | CONFIG += qt warn_on debug quick-app |
2 | HEADERS = light.h sensor.h calibration.h | 2 | HEADERS = light.h sensor.h calibration.h |
3 | SOURCES = light.cpp main.cpp sensor.cpp calibration.cpp | 3 | SOURCES = light.cpp main.cpp sensor.cpp calibration.cpp |
4 | INTERFACES= lightsettingsbase.ui sensorbase.ui | 4 | INTERFACES= lightsettingsbase.ui sensorbase.ui |
5 | INCLUDEPATH += $(OPIEDIR)/include | 5 | INCLUDEPATH += $(OPIEDIR)/include |
6 | DEPENDPATH+= ../$(OPIEDIR)/include | 6 | DEPENDPATH+= ../$(OPIEDIR)/include |
7 | LIBS += -lqpe -lopie | 7 | LIBS += -lqpe -lopiecore2 |
8 | 8 | ||
9 | TARGET = light-and-power | 9 | TARGET = light-and-power |
10 | 10 | ||
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 | |||
@@ -27,6 +27,9 @@ | |||
27 | */ | 27 | */ |
28 | 28 | ||
29 | #include "light.h" | 29 | #include "light.h" |
30 | #include "sensor.h" | ||
31 | |||
32 | #include <opie2/odevice.h> | ||
30 | 33 | ||
31 | #include <qpe/config.h> | 34 | #include <qpe/config.h> |
32 | #include <qpe/power.h> | 35 | #include <qpe/power.h> |
@@ -43,9 +46,7 @@ | |||
43 | #include <qgroupbox.h> | 46 | #include <qgroupbox.h> |
44 | #include <qcombobox.h> | 47 | #include <qcombobox.h> |
45 | 48 | ||
46 | #include <opie/odevice.h> | ||
47 | 49 | ||
48 | #include "sensor.h" | ||
49 | 50 | ||
50 | using namespace Opie; | 51 | using namespace Opie; |
51 | 52 | ||
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 | |||
@@ -28,10 +28,10 @@ | |||
28 | #ifndef __LIGHT_H__ | 28 | #ifndef __LIGHT_H__ |
29 | #define __LIGHT_H__ | 29 | #define __LIGHT_H__ |
30 | 30 | ||
31 | #include "lightsettingsbase.h" | ||
31 | 32 | ||
32 | #include <qstringlist.h> | 33 | #include <qstringlist.h> |
33 | #include <qlistbox.h> | 34 | #include <qlistbox.h> |
34 | #include "lightsettingsbase.h" | ||
35 | 35 | ||
36 | class QTimer; | 36 | class QTimer; |
37 | 37 | ||
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 | |||
@@ -20,7 +20,7 @@ | |||
20 | 20 | ||
21 | #include "light.h" | 21 | #include "light.h" |
22 | 22 | ||
23 | #include <opie/oapplicationfactory.h> | 23 | #include <opie2/oapplicationfactory.h> |
24 | 24 | ||
25 | 25 | ||
26 | OPIE_EXPORT_APP( OApplicationFactory<LightSettings> ) | 26 | OPIE_EXPORT_APP( OApplicationFactory<LightSettings> ) |
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 | |||
@@ -25,17 +25,18 @@ | |||
25 | Boston, MA 02111-1307, USA. | 25 | Boston, MA 02111-1307, USA. |
26 | 26 | ||
27 | */ | 27 | */ |
28 | |||
29 | #include "calibration.h" | ||
30 | #include "sensor.h" | ||
31 | |||
32 | #include <opie2/odevice.h> | ||
33 | |||
28 | #include <qlayout.h> | 34 | #include <qlayout.h> |
29 | #include <qslider.h> | 35 | #include <qslider.h> |
30 | #include <qspinbox.h> | 36 | #include <qspinbox.h> |
31 | 37 | ||
32 | #include <opie/odevice.h> | ||
33 | |||
34 | using namespace Opie; | 38 | using namespace Opie; |
35 | 39 | ||
36 | #include "calibration.h" | ||
37 | #include "sensor.h" | ||
38 | |||
39 | Sensor::Sensor ( QStringList ¶ms, QWidget *parent, const char *name ) | 40 | Sensor::Sensor ( QStringList ¶ms, QWidget *parent, const char *name ) |
40 | : SensorBase ( parent, name, true, WStyle_ContextHelp ), m_params ( params ) | 41 | : SensorBase ( parent, name, true, WStyle_ContextHelp ), m_params ( params ) |
41 | { | 42 | { |
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 | |||