summaryrefslogtreecommitdiff
path: root/core/settings
Side-by-side diff
Diffstat (limited to 'core/settings') (more/less context) (show whitespace changes)
-rw-r--r--core/settings/button/remapdlg.cpp16
-rw-r--r--core/settings/citytime/citytime.cpp6
-rw-r--r--core/settings/citytime/citytimebase.cpp10
-rw-r--r--core/settings/citytime/zonemap.cpp12
-rw-r--r--core/settings/launcher/doctabsettings.cpp6
-rw-r--r--core/settings/launcher/inputmethodsettings.cpp6
-rw-r--r--core/settings/launcher/tabdialog.cpp18
-rw-r--r--core/settings/launcher/taskbarsettings.cpp22
-rw-r--r--core/settings/light-and-power/light.cpp7
-rw-r--r--core/settings/security/security.cpp8
-rw-r--r--core/settings/security/security.pro2
11 files changed, 77 insertions, 36 deletions
diff --git a/core/settings/button/remapdlg.cpp b/core/settings/button/remapdlg.cpp
index 4effebc..cadb955 100644
--- a/core/settings/button/remapdlg.cpp
+++ b/core/settings/button/remapdlg.cpp
@@ -1 +1,9 @@
+
+#include "remapdlg.h"
+#include "buttonutils.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+
+/* QT */
#include <qlistview.h>
@@ -4,4 +12,2 @@
-#include "remapdlg.h"
-#include "buttonutils.h"
@@ -110,3 +116,3 @@ void RemapDlg::itemChanged ( QListViewItem *it )
m_msg = m = OQCopMessage ( "ignore", 0 );
- qDebug ("***ignoring");
+ odebug << "***ignoring" << oendl;
}
@@ -115,3 +121,3 @@ void RemapDlg::itemChanged ( QListViewItem *it )
m_msg = m = m_msg_preset;
- qDebug ("***Preset");
+ odebug << "***Preset" << oendl;
}
@@ -119,3 +125,3 @@ void RemapDlg::itemChanged ( QListViewItem *it )
{
- qDebug ("***Custom: %s %s ",it-> text ( 1 ). latin1 ( ), it-> text ( 2 ). latin1 ( ));
+ odebug << "***Custom: " << it-> text ( 1 ). latin1 ( ) << " " << it-> text ( 2 ). latin1 ( ) << oendl;
enabled = ( it == m_map_custom );
diff --git a/core/settings/citytime/citytime.cpp b/core/settings/citytime/citytime.cpp
index 721285d..d73bda1 100644
--- a/core/settings/citytime/citytime.cpp
+++ b/core/settings/citytime/citytime.cpp
@@ -25,2 +25,3 @@
+/* OPIE */
#include <qpe/qpeapplication.h>
@@ -31,3 +32,5 @@
#endif
+#include <opie2/odebug.h>
+/* QT */
#include <qlabel.h>
@@ -37,2 +40,3 @@
+/* STD */
#include <stdlib.h>
@@ -48,3 +52,3 @@ CityTime::CityTime( QWidget *parent, const char* name,
bWhichClock = config.readBoolEntry( "AMPM", TRUE );
- qDebug( QString("%1").arg(bWhichClock) );
+ odebug << QString("%1").arg(bWhichClock) << oendl;
frmMap->changeClock( bWhichClock );
diff --git a/core/settings/citytime/citytimebase.cpp b/core/settings/citytime/citytimebase.cpp
index 323929b..77cb91d 100644
--- a/core/settings/citytime/citytimebase.cpp
+++ b/core/settings/citytime/citytimebase.cpp
@@ -5,6 +5,10 @@
#include "citytimebase.h"
+#include "zonemap.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+/* QT */
#include <qlabel.h>
#include <qtoolbutton.h>
-#include "zonemap.h"
#include <qlayout.h>
@@ -403,3 +407,3 @@ void CityTimeBase::beginNewTz()
{
- qWarning( "CityTimeBase::beginNewTz(): Not implemented yet!" );
+ owarn << "CityTimeBase::beginNewTz(): Not implemented yet!" << oendl;
}
@@ -408,3 +412,3 @@ void CityTimeBase::slotNewTz(const QString &, const QString &)
{
- qWarning( "CityTimeBase::slotNewTz(const QString &, const QString &): Not implemented yet!" );
+ owarn << "CityTimeBase::slotNewTz(const QString &, const QString &): Not implemented yet!" << oendl;
}
diff --git a/core/settings/citytime/zonemap.cpp b/core/settings/citytime/zonemap.cpp
index b6843d2..e4a25ef 100644
--- a/core/settings/citytime/zonemap.cpp
+++ b/core/settings/citytime/zonemap.cpp
@@ -25,5 +25,8 @@
+/* OPIE */
#include <qpe/resource.h>
#include <qpe/qpeapplication.h>
+#include <opie2/odebug.h>
+/* QT */
#include <qfile.h>
@@ -39,2 +42,3 @@
+/* STD */
#include <limits.h>
@@ -132,6 +136,6 @@ void ZoneField::showStructure( void ) const
{
- qDebug( "Country: %s", strCountry.latin1() );
- qDebug( "City: %s", strCity.latin1() );
- qDebug( "x: %d", _x );
- qDebug( "y: %d\n", _y );
+ odebug << "Country: " << strCountry << "" << oendl;
+ odebug << "City: " << strCity << "" << oendl;
+ odebug << "x: " << _x << "" << oendl;
+ odebug << "y: " << _y << "\n" << oendl;
}
diff --git a/core/settings/launcher/doctabsettings.cpp b/core/settings/launcher/doctabsettings.cpp
index 179a7f9..dfdc9be 100644
--- a/core/settings/launcher/doctabsettings.cpp
+++ b/core/settings/launcher/doctabsettings.cpp
@@ -30,4 +30,7 @@
+/* OPIE */
#include <qpe/config.h>
+#include <opie2/odebug.h>
+/* QT */
#include <qcheckbox.h>
@@ -37,2 +40,3 @@
+
DocTabSettings::DocTabSettings( QWidget *parent, const char *name ):QWidget( parent, name )
@@ -61,3 +65,3 @@ void DocTabSettings::accept()
{
- qDebug( "DocTabSettings::accept()" );
+ odebug << "DocTabSettings::accept()" << oendl;
Config cfg( "Launcher" );
diff --git a/core/settings/launcher/inputmethodsettings.cpp b/core/settings/launcher/inputmethodsettings.cpp
index e342c09..0422075 100644
--- a/core/settings/launcher/inputmethodsettings.cpp
+++ b/core/settings/launcher/inputmethodsettings.cpp
@@ -30,4 +30,7 @@
+/* OPIE */
#include <qpe/config.h>
+#include <opie2/odebug.h>
+/* QT */
#include <qspinbox.h>
@@ -38,2 +41,3 @@
+
InputMethodSettings::InputMethodSettings( QWidget *parent, const char *name ):QWidget( parent, name )
@@ -75,3 +79,3 @@ void InputMethodSettings::accept()
{
- qDebug( "InputMethodSettings::accept()" );
+ odebug << "InputMethodSettings::accept()" << oendl;
Config cfg( "Launcher" );
diff --git a/core/settings/launcher/tabdialog.cpp b/core/settings/launcher/tabdialog.cpp
index 763b360..546e229 100644
--- a/core/settings/launcher/tabdialog.cpp
+++ b/core/settings/launcher/tabdialog.cpp
@@ -27,4 +27,13 @@
+#include "tabdialog.h"
+
+/* OPIE */
#include <qpe/resource.h>
+#include <opie2/ofontselector.h>
+#include <opie2/otabwidget.h>
+#include <opie2/ocolorbutton.h>
+#include <opie2/ofiledialog.h>
+#include <opie2/odebug.h>
+/* QT */
#include <qlayout.h>
@@ -40,9 +49,2 @@
-#include <opie2/ofontselector.h>
-#include <opie2/otabwidget.h>
-#include <opie2/ocolorbutton.h>
-#include <opie2/ofiledialog.h>
-
-#include "tabdialog.h"
-
@@ -150,3 +152,3 @@ public:
case TabConfig::Image: {
- qDebug( "Loading image: %s", val.latin1() );
+ odebug << "Loading image: " << val << "" << oendl;
QPixmap bg ( Resource::loadPixmap ( "wallpaper/" + val ));
diff --git a/core/settings/launcher/taskbarsettings.cpp b/core/settings/launcher/taskbarsettings.cpp
index 43886c9..8dd9e97 100644
--- a/core/settings/launcher/taskbarsettings.cpp
+++ b/core/settings/launcher/taskbarsettings.cpp
@@ -30,2 +30,3 @@
+/* OPIE */
#include <qpe/config.h>
@@ -35,3 +36,5 @@
#include <qpe/qcopenvelope_qws.h>
+#include <opie2/odebug.h>
+/* QT */
#include <qdir.h>
@@ -43,2 +46,3 @@
+/* STD */
#include <stdlib.h>
@@ -87,8 +91,8 @@ void TaskbarSettings::init ( )
- qWarning("Load applet: %s", (*it).latin1() );
+ owarn << "Load applet: " << (*it) << "" << oendl;
QLibrary *lib = new QLibrary ( path + "/" + *it );
lib-> queryInterface ( IID_TaskbarNamedApplet, (QUnknownInterface**) &iface );
- qWarning("<1>");
+ owarn << "<1>" << oendl;
if ( iface ) {
- qWarning("<2>");
+ owarn << "<2>" << oendl;
QString lang = getenv( "LANG" );
@@ -105,5 +109,5 @@ void TaskbarSettings::init ( )
}
- qWarning("<3>");
+ owarn << "<3>" << oendl;
if ( !iface ) {
- qWarning("<4>");
+ owarn << "<4>" << oendl;
lib-> queryInterface ( IID_TaskbarApplet, (QUnknownInterface**) &iface );
@@ -111,5 +115,5 @@ void TaskbarSettings::init ( )
if ( iface ) {
- qWarning("<5>");
+ owarn << "<5>" << oendl;
name = (*it). mid ( 3 );
- qWarning("Found applet: %s", name.latin1() );
+ owarn << "Found applet: " << name << "" << oendl;
#ifdef Q_OS_MACX
@@ -128,6 +132,6 @@ void TaskbarSettings::init ( )
}
- qWarning("<6>");
+ owarn << "<6>" << oendl;
if ( iface ) {
- qWarning("<7>");
+ owarn << "<7>" << oendl;
QCheckListItem *item;
diff --git a/core/settings/light-and-power/light.cpp b/core/settings/light-and-power/light.cpp
index d64a063..424a64c 100644
--- a/core/settings/light-and-power/light.cpp
+++ b/core/settings/light-and-power/light.cpp
@@ -31,3 +31,5 @@
+/* OPIE */
#include <opie2/odevice.h>
+#include <opie2/odebug.h>
@@ -39,2 +41,3 @@
+/* QT */
#include <qlabel.h>
@@ -235,3 +238,3 @@ void LightSettings::setFrequency ( int index )
{
- qWarning("LightSettings::setFrequency(%d)", index);
+ owarn << "LightSettings::setFrequency(" << index << ")" << oendl;
ODevice::inst ( )-> setCurrentCpuFrequency(index);
@@ -247,3 +250,3 @@ void LightSettings::setCloseHingeAction ( int index )
{
- qWarning("LightSettings::setCloseHingeStatus(%d)", index);
+ owarn << "LightSettings::setCloseHingeStatus(" << index << ")" << oendl;
}
diff --git a/core/settings/security/security.cpp b/core/settings/security/security.cpp
index 4eddb55..b917aea 100644
--- a/core/settings/security/security.cpp
+++ b/core/settings/security/security.cpp
@@ -21,2 +21,3 @@
+/* OPIE */
#include <qpe/qpeapplication.h>
@@ -26,3 +27,5 @@
#include <qpe/qcopenvelope_qws.h>
+#include <opie2/odebug.h>
+/* QT */
#include <qcheckbox.h>
@@ -34,2 +37,5 @@
+
+using namespace Opie::Core;
+
Security::Security( QWidget* parent, const char* name, WFlags fl )
@@ -259,3 +265,3 @@ void Security::selectNet(int auth_peer,int auth_peer_bits, bool update)
}
- qDebug("No match for \"%s\"",sn.latin1());
+ odebug << "No match for \"" << sn << "\"" << oendl;
}
diff --git a/core/settings/security/security.pro b/core/settings/security/security.pro
index 4a29ee2..4c1e68b 100644
--- a/core/settings/security/security.pro
+++ b/core/settings/security/security.pro
@@ -6,3 +6,3 @@ INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += ../$(OPIEDIR)/include
-LIBS += -lqpe
+LIBS += -lqpe -lopiecore2
TARGET = security