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,11 +1,11 @@
-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
 
 include ( $(OPIEDIR)/include.pro )
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
@@ -26,8 +26,11 @@
 
 */
 
 #include "light.h"
+#include "sensor.h"
+
+#include <opie2/odevice.h>
 
 #include <qpe/config.h>
 #include <qpe/power.h>
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
@@ -42,11 +45,9 @@
 #include <qpushbutton.h>
 #include <qgroupbox.h>
 #include <qcombobox.h>
 
-#include <opie/odevice.h>
 
-#include "sensor.h"
 
 using namespace Opie;
 
 LightSettings::LightSettings( QWidget* parent,  const char* name, WFlags )
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
@@ -27,12 +27,12 @@
 */
 #ifndef __LIGHT_H__
 #define __LIGHT_H__
 
+#include "lightsettingsbase.h"
 
 #include <qstringlist.h>
 #include <qlistbox.h>
-#include "lightsettingsbase.h"
 
 class QTimer;
 
 class LightSettings : public LightSettingsBase
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
@@ -19,8 +19,8 @@
 **********************************************************************/
 
 #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
@@ -24,19 +24,20 @@
                              59 Temple Place - Suite 330,
                              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 )
 {
 	int steps = 12; 
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