libopie1->libopie2, segfaulting

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 @@
-        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
         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
@@ -27,6 +27,9 @@
 */
 
 #include "light.h"
+#include "sensor.h"
+
+#include <opie2/odevice.h>
 
 #include <qpe/config.h>
 #include <qpe/power.h>
@@ -43,9 +46,7 @@
 #include <qgroupbox.h>
 #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
@@ -28,10 +28,10 @@
 #ifndef __LIGHT_H__
 #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
@@ -20,7 +20,7 @@
 
 #include "light.h"
 
-#include <opie/oapplicationfactory.h>
+#include <opie2/oapplicationfactory.h>
 
 
 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 @@
                              Boston, MA 02111-1307, USA.
 
 */
+
+#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 )
 {
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