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,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
@@ -22,35 +22,36 @@
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #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)
 #include <qpe/qcopenvelope_qws.h>
 #endif
 
 #include <qlabel.h>
 #include <qcheckbox.h>
 #include <qtabwidget.h>
 #include <qslider.h>
 #include <qspinbox.h>
 #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 )
 	: LightSettingsBase( parent, name, false, WStyle_ContextHelp )
 {
 	m_bres = ODevice::inst ( )-> displayBrightnessResolution ( );
 	m_cres = ODevice::inst ( )-> displayContrastResolution ( );
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
@@ -23,20 +23,20 @@
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 #ifndef __LIGHT_H__
 #define __LIGHT_H__
 
+#include "lightsettingsbase.h"
 
 #include <qstringlist.h>
 #include <qlistbox.h>
-#include "lightsettingsbase.h"
 
 class QTimer;
 
 class LightSettings : public LightSettingsBase
 {
     Q_OBJECT
 
 public:
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
@@ -15,12 +15,12 @@
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #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
@@ -11,79 +11,80 @@
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This file is distributed in the hope that
      +  .  -:.       =       it will be useful, but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     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;
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              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; 
+	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 ( );
 		case 5: lmin = params [4]. toInt ( );
 		case 4: smax = params [3]. toInt ( );
 		case 3: smin = params [2]. toInt ( );
 		case 2: steps = params [1]. toInt ( );
 		case 1: inter = params [0]. toInt ( ) / 1000;
 	}
 
 	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 ));
 	m_calib-> setLineSteps ( steps );
 	m_calib-> setInterval ( inter );
 	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 ( )
 {
 	int xscale = ODevice::inst ( )-> lightSensorResolution ( );
 	int yscale = ODevice::inst ( )-> displayBrightnessResolution ( );
 
 	m_params. clear ( );
 	m_params << QString::number ( m_calib-> interval ( ) * 1000 )
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
@@ -47,9 +47,9 @@ signals:
 private slots:
 	void pointDrag ( const QPoint & );
 	
 private:
 	QStringList &m_params;
 	Calibration *m_calib;
 };
 
-#endif
\ No newline at end of file
+#endif