libopie1->libopie2, segfaulting

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,2 +1,2 @@
-CONFIG		+= qt warn_on release quick-app
+CONFIG		+= qt warn_on debug quick-app
 HEADERS		= light.h sensor.h calibration.h
@@ -6,3 +6,3 @@ INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH	+= ../$(OPIEDIR)/include
-LIBS            += -lqpe -lopie
+LIBS            += -lqpe -lopiecore2
 
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
@@ -29,2 +29,5 @@
 #include "light.h"
+#include "sensor.h"
+
+#include <opie2/odevice.h>
 
@@ -45,5 +48,3 @@
 
-#include <opie/odevice.h>
 
-#include "sensor.h"
 
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
@@ -30,2 +30,3 @@
 
+#include "lightsettingsbase.h"
 
@@ -33,3 +34,2 @@
 #include <qlistbox.h>
-#include "lightsettingsbase.h"
 
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
@@ -22,3 +22,3 @@
 
-#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
@@ -18,3 +18,3 @@
 ..}^=.=       =       ;      Public License for more details.
-++=   -.     .`     .:       
+++=   -.     .`     .:
  :     =  ...= . :.=-        You should have received a copy of the GNU
@@ -27,2 +27,8 @@
 */
+
+#include "calibration.h"
+#include "sensor.h"
+
+#include <opie2/odevice.h>
+
 #include <qlayout.h>
@@ -31,9 +37,4 @@
 
-#include <opie/odevice.h>
-
 using namespace Opie;
 
-#include "calibration.h"
-#include "sensor.h"
-
 Sensor::Sensor ( QStringList &params, QWidget *parent, const char *name )
@@ -41,5 +42,5 @@ Sensor::Sensor ( QStringList &params, QWidget *parent, const char *name )
 {
-	int steps = 12; 
+	int steps = 12;
 	int inter = 2;
-	
+
 	int smin = 40;
@@ -48,3 +49,3 @@ Sensor::Sensor ( QStringList &params, QWidget *parent, const char *name )
 	int lmax = 255;
-	
+
 	switch ( params. count ( )) {
@@ -60,3 +61,3 @@ Sensor::Sensor ( QStringList &params, QWidget *parent, const char *name )
 	int yscale = ODevice::inst ( )-> displayBrightnessResolution ( );
-	
+
 	QVBoxLayout *lay = new QVBoxLayout ( frame );
@@ -64,3 +65,3 @@ Sensor::Sensor ( QStringList &params, QWidget *parent, const char *name )
 	m_calib = new Calibration ( frame );
-	lay-> add ( m_calib );	
+	lay-> add ( m_calib );
 
@@ -71,12 +72,12 @@ Sensor::Sensor ( QStringList &params, QWidget *parent, const char *name )
 	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&)));
-}                
+}
 
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
@@ -54,2 +54,2 @@ private:
 
-#endif
\ No newline at end of file
+#endif