author | ar <ar> | 2004-05-02 17:31:50 (UTC) |
---|---|---|
committer | ar <ar> | 2004-05-02 17:31:50 (UTC) |
commit | a210b9a597ba0c929d95c38ffbaf972916c7b8a7 (patch) (unidiff) | |
tree | ce121d5017eb054222c86e0afb6057a28ea7bf8a /core/settings | |
parent | 18759e9156c96795831120408a9da0d3b4ec71a4 (diff) | |
download | opie-a210b9a597ba0c929d95c38ffbaf972916c7b8a7.zip opie-a210b9a597ba0c929d95c38ffbaf972916c7b8a7.tar.gz opie-a210b9a597ba0c929d95c38ffbaf972916c7b8a7.tar.bz2 |
- convert qDebug to odebug
-rw-r--r-- | core/settings/button/remapdlg.cpp | 16 | ||||
-rw-r--r-- | core/settings/citytime/citytime.cpp | 6 | ||||
-rw-r--r-- | core/settings/citytime/citytimebase.cpp | 10 | ||||
-rw-r--r-- | core/settings/citytime/zonemap.cpp | 12 | ||||
-rw-r--r-- | core/settings/launcher/doctabsettings.cpp | 6 | ||||
-rw-r--r-- | core/settings/launcher/inputmethodsettings.cpp | 6 | ||||
-rw-r--r-- | core/settings/launcher/tabdialog.cpp | 18 | ||||
-rw-r--r-- | core/settings/launcher/taskbarsettings.cpp | 22 | ||||
-rw-r--r-- | core/settings/light-and-power/light.cpp | 7 | ||||
-rw-r--r-- | core/settings/security/security.cpp | 8 | ||||
-rw-r--r-- | core/settings/security/security.pro | 2 |
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,9 +1,15 @@ | |||
1 | |||
2 | #include "remapdlg.h" | ||
3 | #include "buttonutils.h" | ||
4 | |||
5 | /* OPIE */ | ||
6 | #include <opie2/odebug.h> | ||
7 | |||
8 | /* QT */ | ||
1 | #include <qlistview.h> | 9 | #include <qlistview.h> |
2 | #include <qcombobox.h> | 10 | #include <qcombobox.h> |
3 | #include <qtimer.h> | 11 | #include <qtimer.h> |
4 | 12 | ||
5 | #include "remapdlg.h" | ||
6 | #include "buttonutils.h" | ||
7 | 13 | ||
8 | 14 | ||
9 | using namespace Opie::Core; | 15 | using namespace Opie::Core; |
@@ -108,16 +114,16 @@ void RemapDlg::itemChanged ( QListViewItem *it ) | |||
108 | if ( it == m_map_none ) | 114 | if ( it == m_map_none ) |
109 | { | 115 | { |
110 | m_msg = m = OQCopMessage ( "ignore", 0 ); | 116 | m_msg = m = OQCopMessage ( "ignore", 0 ); |
111 | qDebug ("***ignoring"); | 117 | odebug << "***ignoring" << oendl; |
112 | } | 118 | } |
113 | else if ( it == m_map_preset ) | 119 | else if ( it == m_map_preset ) |
114 | { | 120 | { |
115 | m_msg = m = m_msg_preset; | 121 | m_msg = m = m_msg_preset; |
116 | qDebug ("***Preset"); | 122 | odebug << "***Preset" << oendl; |
117 | } | 123 | } |
118 | else if ( it && !it-> childCount ( ) ) | 124 | else if ( it && !it-> childCount ( ) ) |
119 | { | 125 | { |
120 | qDebug ("***Custom: %s %s ",it-> text ( 1 ). latin1 ( ), it-> text ( 2 ). latin1 ( )); | 126 | odebug << "***Custom: " << it-> text ( 1 ). latin1 ( ) << " " << it-> text ( 2 ). latin1 ( ) << oendl; |
121 | enabled = ( it == m_map_custom ); | 127 | enabled = ( it == m_map_custom ); |
122 | m_msg = m = OQCopMessage ( it-> text ( 1 ). latin1 ( ), it-> text ( 2 ). latin1 ( )); | 128 | m_msg = m = OQCopMessage ( it-> text ( 1 ). latin1 ( ), it-> text ( 2 ). latin1 ( )); |
123 | } | 129 | } |
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 | |||
@@ -23,18 +23,22 @@ | |||
23 | #include "zonemap.h" | 23 | #include "zonemap.h" |
24 | #include "citytime.h" | 24 | #include "citytime.h" |
25 | 25 | ||
26 | /* OPIE */ | ||
26 | #include <qpe/qpeapplication.h> | 27 | #include <qpe/qpeapplication.h> |
27 | #include <qpe/config.h> | 28 | #include <qpe/config.h> |
28 | #include <qpe/tzselect.h> | 29 | #include <qpe/tzselect.h> |
29 | #if !defined(QT_NO_COP) | 30 | #if !defined(QT_NO_COP) |
30 | #include <qpe/qcopenvelope_qws.h> | 31 | #include <qpe/qcopenvelope_qws.h> |
31 | #endif | 32 | #endif |
33 | #include <opie2/odebug.h> | ||
32 | 34 | ||
35 | /* QT */ | ||
33 | #include <qlabel.h> | 36 | #include <qlabel.h> |
34 | #include <qmessagebox.h> | 37 | #include <qmessagebox.h> |
35 | #include <qtoolbutton.h> | 38 | #include <qtoolbutton.h> |
36 | #include <qlayout.h> | 39 | #include <qlayout.h> |
37 | 40 | ||
41 | /* STD */ | ||
38 | #include <stdlib.h> | 42 | #include <stdlib.h> |
39 | 43 | ||
40 | CityTime::CityTime( QWidget *parent, const char* name, | 44 | CityTime::CityTime( QWidget *parent, const char* name, |
@@ -46,7 +50,7 @@ CityTime::CityTime( QWidget *parent, const char* name, | |||
46 | Config config( "qpe" ); | 50 | Config config( "qpe" ); |
47 | config.setGroup( "Time" ); | 51 | config.setGroup( "Time" ); |
48 | bWhichClock = config.readBoolEntry( "AMPM", TRUE ); | 52 | bWhichClock = config.readBoolEntry( "AMPM", TRUE ); |
49 | qDebug( QString("%1").arg(bWhichClock) ); | 53 | odebug << QString("%1").arg(bWhichClock) << oendl; |
50 | frmMap->changeClock( bWhichClock ); | 54 | frmMap->changeClock( bWhichClock ); |
51 | 55 | ||
52 | char *pEnv; | 56 | char *pEnv; |
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 | |||
@@ -3,10 +3,14 @@ | |||
3 | // changes by Maximilian Reiss <harlekin@handhelds.org> | 3 | // changes by Maximilian Reiss <harlekin@handhelds.org> |
4 | 4 | ||
5 | #include "citytimebase.h" | 5 | #include "citytimebase.h" |
6 | #include "zonemap.h" | ||
7 | |||
8 | /* OPIE */ | ||
9 | #include <opie2/odebug.h> | ||
6 | 10 | ||
11 | /* QT */ | ||
7 | #include <qlabel.h> | 12 | #include <qlabel.h> |
8 | #include <qtoolbutton.h> | 13 | #include <qtoolbutton.h> |
9 | #include "zonemap.h" | ||
10 | #include <qlayout.h> | 14 | #include <qlayout.h> |
11 | #include <qwhatsthis.h> | 15 | #include <qwhatsthis.h> |
12 | 16 | ||
@@ -401,11 +405,11 @@ bool CityTimeBase::event( QEvent* ev ) | |||
401 | 405 | ||
402 | void CityTimeBase::beginNewTz() | 406 | void CityTimeBase::beginNewTz() |
403 | { | 407 | { |
404 | qWarning( "CityTimeBase::beginNewTz(): Not implemented yet!" ); | 408 | owarn << "CityTimeBase::beginNewTz(): Not implemented yet!" << oendl; |
405 | } | 409 | } |
406 | 410 | ||
407 | void CityTimeBase::slotNewTz(const QString &, const QString &) | 411 | void CityTimeBase::slotNewTz(const QString &, const QString &) |
408 | { | 412 | { |
409 | qWarning( "CityTimeBase::slotNewTz(const QString &, const QString &): Not implemented yet!" ); | 413 | owarn << "CityTimeBase::slotNewTz(const QString &, const QString &): Not implemented yet!" << oendl; |
410 | } | 414 | } |
411 | 415 | ||
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 | |||
@@ -23,9 +23,12 @@ | |||
23 | #include "sun.h" | 23 | #include "sun.h" |
24 | #include "zonemap.h" | 24 | #include "zonemap.h" |
25 | 25 | ||
26 | /* OPIE */ | ||
26 | #include <qpe/resource.h> | 27 | #include <qpe/resource.h> |
27 | #include <qpe/qpeapplication.h> | 28 | #include <qpe/qpeapplication.h> |
29 | #include <opie2/odebug.h> | ||
28 | 30 | ||
31 | /* QT */ | ||
29 | #include <qfile.h> | 32 | #include <qfile.h> |
30 | #include <qlabel.h> | 33 | #include <qlabel.h> |
31 | #include <qmessagebox.h> | 34 | #include <qmessagebox.h> |
@@ -37,6 +40,7 @@ | |||
37 | #include <qlistview.h> | 40 | #include <qlistview.h> |
38 | #include <qwhatsthis.h> | 41 | #include <qwhatsthis.h> |
39 | 42 | ||
43 | /* STD */ | ||
40 | #include <limits.h> | 44 | #include <limits.h> |
41 | 45 | ||
42 | // the map file... | 46 | // the map file... |
@@ -130,10 +134,10 @@ ZoneField::ZoneField( const QString& strLine ) | |||
130 | 134 | ||
131 | void ZoneField::showStructure( void ) const | 135 | void ZoneField::showStructure( void ) const |
132 | { | 136 | { |
133 | qDebug( "Country: %s", strCountry.latin1() ); | 137 | odebug << "Country: " << strCountry << "" << oendl; |
134 | qDebug( "City: %s", strCity.latin1() ); | 138 | odebug << "City: " << strCity << "" << oendl; |
135 | qDebug( "x: %d", _x ); | 139 | odebug << "x: " << _x << "" << oendl; |
136 | qDebug( "y: %d\n", _y ); | 140 | odebug << "y: " << _y << "\n" << oendl; |
137 | } | 141 | } |
138 | 142 | ||
139 | ZoneMap::ZoneMap( QWidget *parent, const char* name ) | 143 | ZoneMap::ZoneMap( QWidget *parent, const char* name ) |
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 | |||
@@ -28,13 +28,17 @@ | |||
28 | 28 | ||
29 | #include "doctabsettings.h" | 29 | #include "doctabsettings.h" |
30 | 30 | ||
31 | /* OPIE */ | ||
31 | #include <qpe/config.h> | 32 | #include <qpe/config.h> |
33 | #include <opie2/odebug.h> | ||
32 | 34 | ||
35 | /* QT */ | ||
33 | #include <qcheckbox.h> | 36 | #include <qcheckbox.h> |
34 | #include <qlayout.h> | 37 | #include <qlayout.h> |
35 | #include <qlabel.h> | 38 | #include <qlabel.h> |
36 | #include <qwhatsthis.h> | 39 | #include <qwhatsthis.h> |
37 | 40 | ||
41 | |||
38 | DocTabSettings::DocTabSettings( QWidget *parent, const char *name ):QWidget( parent, name ) | 42 | DocTabSettings::DocTabSettings( QWidget *parent, const char *name ):QWidget( parent, name ) |
39 | { | 43 | { |
40 | QBoxLayout *lay = new QVBoxLayout( this, 4, 4 ); | 44 | QBoxLayout *lay = new QVBoxLayout( this, 4, 4 ); |
@@ -59,7 +63,7 @@ void DocTabSettings::appletChanged() | |||
59 | 63 | ||
60 | void DocTabSettings::accept() | 64 | void DocTabSettings::accept() |
61 | { | 65 | { |
62 | qDebug( "DocTabSettings::accept()" ); | 66 | odebug << "DocTabSettings::accept()" << oendl; |
63 | Config cfg( "Launcher" ); | 67 | Config cfg( "Launcher" ); |
64 | cfg.setGroup( "DocTab" ); | 68 | cfg.setGroup( "DocTab" ); |
65 | cfg.writeEntry( "Enable", _enable->isChecked() ); | 69 | cfg.writeEntry( "Enable", _enable->isChecked() ); |
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 | |||
@@ -28,14 +28,18 @@ | |||
28 | 28 | ||
29 | #include "inputmethodsettings.h" | 29 | #include "inputmethodsettings.h" |
30 | 30 | ||
31 | /* OPIE */ | ||
31 | #include <qpe/config.h> | 32 | #include <qpe/config.h> |
33 | #include <opie2/odebug.h> | ||
32 | 34 | ||
35 | /* QT */ | ||
33 | #include <qspinbox.h> | 36 | #include <qspinbox.h> |
34 | #include <qcheckbox.h> | 37 | #include <qcheckbox.h> |
35 | #include <qlayout.h> | 38 | #include <qlayout.h> |
36 | #include <qlabel.h> | 39 | #include <qlabel.h> |
37 | #include <qwhatsthis.h> | 40 | #include <qwhatsthis.h> |
38 | 41 | ||
42 | |||
39 | InputMethodSettings::InputMethodSettings( QWidget *parent, const char *name ):QWidget( parent, name ) | 43 | InputMethodSettings::InputMethodSettings( QWidget *parent, const char *name ):QWidget( parent, name ) |
40 | { | 44 | { |
41 | QBoxLayout *lay = new QVBoxLayout( this, 4, 4 ); | 45 | QBoxLayout *lay = new QVBoxLayout( this, 4, 4 ); |
@@ -73,7 +77,7 @@ void InputMethodSettings::appletChanged() | |||
73 | 77 | ||
74 | void InputMethodSettings::accept() | 78 | void InputMethodSettings::accept() |
75 | { | 79 | { |
76 | qDebug( "InputMethodSettings::accept()" ); | 80 | odebug << "InputMethodSettings::accept()" << oendl; |
77 | Config cfg( "Launcher" ); | 81 | Config cfg( "Launcher" ); |
78 | cfg.setGroup( "InputMethods" ); | 82 | cfg.setGroup( "InputMethods" ); |
79 | cfg.writeEntry( "Resize", _resize->isChecked() ); | 83 | cfg.writeEntry( "Resize", _resize->isChecked() ); |
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 | |||
@@ -25,8 +25,17 @@ | |||
25 | 25 | ||
26 | */ | 26 | */ |
27 | 27 | ||
28 | #include "tabdialog.h" | ||
29 | |||
30 | /* OPIE */ | ||
28 | #include <qpe/resource.h> | 31 | #include <qpe/resource.h> |
32 | #include <opie2/ofontselector.h> | ||
33 | #include <opie2/otabwidget.h> | ||
34 | #include <opie2/ocolorbutton.h> | ||
35 | #include <opie2/ofiledialog.h> | ||
36 | #include <opie2/odebug.h> | ||
29 | 37 | ||
38 | /* QT */ | ||
30 | #include <qlayout.h> | 39 | #include <qlayout.h> |
31 | #include <qvbox.h> | 40 | #include <qvbox.h> |
32 | #include <qtabbar.h> | 41 | #include <qtabbar.h> |
@@ -38,13 +47,6 @@ | |||
38 | #include <qwhatsthis.h> | 47 | #include <qwhatsthis.h> |
39 | #include <qcheckbox.h> | 48 | #include <qcheckbox.h> |
40 | 49 | ||
41 | #include <opie2/ofontselector.h> | ||
42 | #include <opie2/otabwidget.h> | ||
43 | #include <opie2/ocolorbutton.h> | ||
44 | #include <opie2/ofiledialog.h> | ||
45 | |||
46 | #include "tabdialog.h" | ||
47 | |||
48 | 50 | ||
49 | using namespace Opie::Ui; | 51 | using namespace Opie::Ui; |
50 | class SampleItem : public QIconViewItem { | 52 | class SampleItem : public QIconViewItem { |
@@ -148,7 +150,7 @@ public: | |||
148 | } | 150 | } |
149 | 151 | ||
150 | case TabConfig::Image: { | 152 | case TabConfig::Image: { |
151 | qDebug( "Loading image: %s", val.latin1() ); | 153 | odebug << "Loading image: " << val << "" << oendl; |
152 | QPixmap bg ( Resource::loadPixmap ( "wallpaper/" + val )); | 154 | QPixmap bg ( Resource::loadPixmap ( "wallpaper/" + val )); |
153 | if ( bg. isNull ( )) { | 155 | if ( bg. isNull ( )) { |
154 | QImageIO imgio; | 156 | QImageIO imgio; |
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 | |||
@@ -28,12 +28,15 @@ | |||
28 | 28 | ||
29 | #include "taskbarsettings.h" | 29 | #include "taskbarsettings.h" |
30 | 30 | ||
31 | /* OPIE */ | ||
31 | #include <qpe/config.h> | 32 | #include <qpe/config.h> |
32 | #include <qpe/qlibrary.h> | 33 | #include <qpe/qlibrary.h> |
33 | #include <qpe/qpeapplication.h> | 34 | #include <qpe/qpeapplication.h> |
34 | #include <qpe/taskbarappletinterface.h> | 35 | #include <qpe/taskbarappletinterface.h> |
35 | #include <qpe/qcopenvelope_qws.h> | 36 | #include <qpe/qcopenvelope_qws.h> |
37 | #include <opie2/odebug.h> | ||
36 | 38 | ||
39 | /* QT */ | ||
37 | #include <qdir.h> | 40 | #include <qdir.h> |
38 | #include <qlistview.h> | 41 | #include <qlistview.h> |
39 | #include <qheader.h> | 42 | #include <qheader.h> |
@@ -41,6 +44,7 @@ | |||
41 | #include <qlabel.h> | 44 | #include <qlabel.h> |
42 | #include <qwhatsthis.h> | 45 | #include <qwhatsthis.h> |
43 | 46 | ||
47 | /* STD */ | ||
44 | #include <stdlib.h> | 48 | #include <stdlib.h> |
45 | 49 | ||
46 | 50 | ||
@@ -85,12 +89,12 @@ void TaskbarSettings::init ( ) | |||
85 | QPixmap icon; | 89 | QPixmap icon; |
86 | TaskbarNamedAppletInterface *iface = 0; | 90 | TaskbarNamedAppletInterface *iface = 0; |
87 | 91 | ||
88 | qWarning("Load applet: %s", (*it).latin1() ); | 92 | owarn << "Load applet: " << (*it) << "" << oendl; |
89 | QLibrary *lib = new QLibrary ( path + "/" + *it ); | 93 | QLibrary *lib = new QLibrary ( path + "/" + *it ); |
90 | lib-> queryInterface ( IID_TaskbarNamedApplet, (QUnknownInterface**) &iface ); | 94 | lib-> queryInterface ( IID_TaskbarNamedApplet, (QUnknownInterface**) &iface ); |
91 | qWarning("<1>"); | 95 | owarn << "<1>" << oendl; |
92 | if ( iface ) { | 96 | if ( iface ) { |
93 | qWarning("<2>"); | 97 | owarn << "<2>" << oendl; |
94 | QString lang = getenv( "LANG" ); | 98 | QString lang = getenv( "LANG" ); |
95 | QTranslator *trans = new QTranslator ( qApp ); | 99 | QTranslator *trans = new QTranslator ( qApp ); |
96 | QString type = (*it). left ((*it). find (".")); | 100 | QString type = (*it). left ((*it). find (".")); |
@@ -103,15 +107,15 @@ void TaskbarSettings::init ( ) | |||
103 | icon = iface-> icon ( ); | 107 | icon = iface-> icon ( ); |
104 | iface-> release ( ); | 108 | iface-> release ( ); |
105 | } | 109 | } |
106 | qWarning("<3>"); | 110 | owarn << "<3>" << oendl; |
107 | if ( !iface ) { | 111 | if ( !iface ) { |
108 | qWarning("<4>"); | 112 | owarn << "<4>" << oendl; |
109 | lib-> queryInterface ( IID_TaskbarApplet, (QUnknownInterface**) &iface ); | 113 | lib-> queryInterface ( IID_TaskbarApplet, (QUnknownInterface**) &iface ); |
110 | 114 | ||
111 | if ( iface ) { | 115 | if ( iface ) { |
112 | qWarning("<5>"); | 116 | owarn << "<5>" << oendl; |
113 | name = (*it). mid ( 3 ); | 117 | name = (*it). mid ( 3 ); |
114 | qWarning("Found applet: %s", name.latin1() ); | 118 | owarn << "Found applet: " << name << "" << oendl; |
115 | #ifdef Q_OS_MACX | 119 | #ifdef Q_OS_MACX |
116 | int sep = name. find( ".dylib" ); | 120 | int sep = name. find( ".dylib" ); |
117 | #else | 121 | #else |
@@ -126,10 +130,10 @@ void TaskbarSettings::init ( ) | |||
126 | iface-> release ( ); | 130 | iface-> release ( ); |
127 | } | 131 | } |
128 | } | 132 | } |
129 | qWarning("<6>"); | 133 | owarn << "<6>" << oendl; |
130 | 134 | ||
131 | if ( iface ) { | 135 | if ( iface ) { |
132 | qWarning("<7>"); | 136 | owarn << "<7>" << oendl; |
133 | QCheckListItem *item; | 137 | QCheckListItem *item; |
134 | item = new QCheckListItem ( m_list, name, QCheckListItem::CheckBox ); | 138 | item = new QCheckListItem ( m_list, name, QCheckListItem::CheckBox ); |
135 | if ( !icon. isNull ( )) | 139 | if ( !icon. isNull ( )) |
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 | |||
@@ -29,7 +29,9 @@ | |||
29 | #include "light.h" | 29 | #include "light.h" |
30 | #include "sensor.h" | 30 | #include "sensor.h" |
31 | 31 | ||
32 | /* OPIE */ | ||
32 | #include <opie2/odevice.h> | 33 | #include <opie2/odevice.h> |
34 | #include <opie2/odebug.h> | ||
33 | 35 | ||
34 | #include <qpe/config.h> | 36 | #include <qpe/config.h> |
35 | #include <qpe/power.h> | 37 | #include <qpe/power.h> |
@@ -37,6 +39,7 @@ | |||
37 | #include <qpe/qcopenvelope_qws.h> | 39 | #include <qpe/qcopenvelope_qws.h> |
38 | #endif | 40 | #endif |
39 | 41 | ||
42 | /* QT */ | ||
40 | #include <qlabel.h> | 43 | #include <qlabel.h> |
41 | #include <qcheckbox.h> | 44 | #include <qcheckbox.h> |
42 | #include <qtabwidget.h> | 45 | #include <qtabwidget.h> |
@@ -233,7 +236,7 @@ void LightSettings::setContrast ( int contr ) | |||
233 | 236 | ||
234 | void LightSettings::setFrequency ( int index ) | 237 | void LightSettings::setFrequency ( int index ) |
235 | { | 238 | { |
236 | qWarning("LightSettings::setFrequency(%d)", index); | 239 | owarn << "LightSettings::setFrequency(" << index << ")" << oendl; |
237 | ODevice::inst ( )-> setCurrentCpuFrequency(index); | 240 | ODevice::inst ( )-> setCurrentCpuFrequency(index); |
238 | } | 241 | } |
239 | 242 | ||
@@ -245,7 +248,7 @@ void LightSettings::resetBacklight ( ) | |||
245 | 248 | ||
246 | void LightSettings::setCloseHingeAction ( int index ) | 249 | void LightSettings::setCloseHingeAction ( int index ) |
247 | { | 250 | { |
248 | qWarning("LightSettings::setCloseHingeStatus(%d)", index); | 251 | owarn << "LightSettings::setCloseHingeStatus(" << index << ")" << oendl; |
249 | } | 252 | } |
250 | 253 | ||
251 | void LightSettings::accept ( ) | 254 | void LightSettings::accept ( ) |
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 | |||
@@ -19,12 +19,15 @@ | |||
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #include "security.h" | 20 | #include "security.h" |
21 | 21 | ||
22 | /* OPIE */ | ||
22 | #include <qpe/qpeapplication.h> | 23 | #include <qpe/qpeapplication.h> |
23 | #include <qpe/config.h> | 24 | #include <qpe/config.h> |
24 | #include <qpe/password.h> | 25 | #include <qpe/password.h> |
25 | #include <qpe/qpedialog.h> | 26 | #include <qpe/qpedialog.h> |
26 | #include <qpe/qcopenvelope_qws.h> | 27 | #include <qpe/qcopenvelope_qws.h> |
28 | #include <opie2/odebug.h> | ||
27 | 29 | ||
30 | /* QT */ | ||
28 | #include <qcheckbox.h> | 31 | #include <qcheckbox.h> |
29 | #include <qpushbutton.h> | 32 | #include <qpushbutton.h> |
30 | #include <qcombobox.h> | 33 | #include <qcombobox.h> |
@@ -32,6 +35,9 @@ | |||
32 | #include <qfile.h> | 35 | #include <qfile.h> |
33 | #include <qtextstream.h> | 36 | #include <qtextstream.h> |
34 | 37 | ||
38 | |||
39 | using namespace Opie::Core; | ||
40 | |||
35 | Security::Security( QWidget* parent, const char* name, WFlags fl ) | 41 | Security::Security( QWidget* parent, const char* name, WFlags fl ) |
36 | : SecurityBase( parent, name, TRUE, WStyle_ContextHelp ) | 42 | : SecurityBase( parent, name, TRUE, WStyle_ContextHelp ) |
37 | { | 43 | { |
@@ -257,7 +263,7 @@ void Security::selectNet(int auth_peer,int auth_peer_bits, bool update) | |||
257 | return; | 263 | return; |
258 | } | 264 | } |
259 | } | 265 | } |
260 | qDebug("No match for \"%s\"",sn.latin1()); | 266 | odebug << "No match for \"" << sn << "\"" << oendl; |
261 | } | 267 | } |
262 | 268 | ||
263 | void Security::parseNet(const QString& sn,int& auth_peer,int& auth_peer_bits) | 269 | void Security::parseNet(const QString& sn,int& auth_peer,int& auth_peer_bits) |
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 | |||
@@ -4,7 +4,7 @@ SOURCES = security.cpp main.cpp | |||
4 | INTERFACES= securitybase.ui | 4 | INTERFACES= securitybase.ui |
5 | INCLUDEPATH += $(OPIEDIR)/include | 5 | INCLUDEPATH += $(OPIEDIR)/include |
6 | DEPENDPATH+= ../$(OPIEDIR)/include | 6 | DEPENDPATH+= ../$(OPIEDIR)/include |
7 | LIBS += -lqpe | 7 | LIBS += -lqpe -lopiecore2 |
8 | TARGET = security | 8 | TARGET = security |
9 | 9 | ||
10 | include ( $(OPIEDIR)/include.pro ) | 10 | include ( $(OPIEDIR)/include.pro ) |