-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 | ||||
-rw-r--r-- | core/symlinker/main.cpp | 34 | ||||
-rw-r--r-- | core/symlinker/symlinker.pro | 2 | ||||
-rw-r--r-- | core/tools/quicklauncher/main.cpp | 19 |
14 files changed, 111 insertions, 57 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,12 +1,18 @@ | |||
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; |
10 | class NoSortItem : public QListViewItem { | 16 | class NoSortItem : public QListViewItem { |
11 | public: | 17 | public: |
12 | NoSortItem ( QListView *lv, uint pos, const QString &str, const QCString &s1 = 0, const QCString &s2 = 0 ) | 18 | NoSortItem ( QListView *lv, uint pos, const QString &str, const QCString &s1 = 0, const QCString &s2 = 0 ) |
@@ -105,22 +111,22 @@ void RemapDlg::itemChanged ( QListViewItem *it ) | |||
105 | 111 | ||
106 | m_current = it; | 112 | m_current = it; |
107 | 113 | ||
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 | } |
124 | 130 | ||
125 | w_channel-> setEnabled ( enabled ); | 131 | w_channel-> setEnabled ( enabled ); |
126 | w_message-> setEnabled ( enabled ); | 132 | w_message-> setEnabled ( enabled ); |
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 | |||
@@ -20,36 +20,40 @@ | |||
20 | 20 | ||
21 | // changes by Maximilian Reiss <harlekin@handhelds.org> | 21 | // changes by Maximilian Reiss <harlekin@handhelds.org> |
22 | 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, |
41 | WFlags fl ) | 45 | WFlags fl ) |
42 | : CityTimeBase( parent, name, fl ), | 46 | : CityTimeBase( parent, name, fl ), |
43 | strRealTz(0), | 47 | strRealTz(0), |
44 | bAdded(false) | 48 | bAdded(false) |
45 | { | 49 | { |
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; |
53 | pEnv = NULL; | 57 | pEnv = NULL; |
54 | pEnv = getenv("TZ"); | 58 | pEnv = getenv("TZ"); |
55 | if ( pEnv ) | 59 | if ( 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 | |||
@@ -1,15 +1,19 @@ | |||
1 | 1 | ||
2 | 2 | ||
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 | ||
13 | 17 | ||
14 | /* | 18 | /* |
15 | * Constructs a CityTimeBase which is a child of 'parent', with the | 19 | * Constructs a CityTimeBase which is a child of 'parent', with the |
@@ -398,14 +402,14 @@ bool CityTimeBase::event( QEvent* ev ) | |||
398 | } | 402 | } |
399 | return ret; | 403 | return ret; |
400 | } | 404 | } |
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 | |||
@@ -20,26 +20,30 @@ | |||
20 | 20 | ||
21 | // changes by Maximilian Reiss <harlekin@handhelds.org> | 21 | // changes by Maximilian Reiss <harlekin@handhelds.org> |
22 | 22 | ||
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> |
32 | #include <qtextstream.h> | 35 | #include <qtextstream.h> |
33 | #include <qtimer.h> | 36 | #include <qtimer.h> |
34 | #include <qtoolbutton.h> | 37 | #include <qtoolbutton.h> |
35 | #include <qlayout.h> | 38 | #include <qlayout.h> |
36 | #include <qhbox.h> | 39 | #include <qhbox.h> |
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... |
43 | static const char strZONEINFO[] = "/usr/share/zoneinfo/zone.tab"; | 47 | static const char strZONEINFO[] = "/usr/share/zoneinfo/zone.tab"; |
44 | static const char strMAP[] = "citytime/simple_grid_400"; | 48 | static const char strMAP[] = "citytime/simple_grid_400"; |
45 | 49 | ||
@@ -127,16 +131,16 @@ ZoneField::ZoneField( const QString& strLine ) | |||
127 | strCity = strLine.mid( iStart, iLen ); | 131 | strCity = strLine.mid( iStart, iLen ); |
128 | } | 132 | } |
129 | } | 133 | } |
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 ) |
140 | : QScrollView( parent, name ), | 144 | : QScrollView( parent, name ), |
141 | pLast( 0 ), | 145 | pLast( 0 ), |
142 | pRepaint( 0 ), | 146 | pRepaint( 0 ), |
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 | |||
@@ -25,19 +25,23 @@ | |||
25 | Boston, MA 02111-1307, USA. | 25 | Boston, MA 02111-1307, USA. |
26 | 26 | ||
27 | */ | 27 | */ |
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 ); |
41 | 45 | ||
42 | _enable = new QCheckBox( tr( "Enable the Documents Tab" ), this ); | 46 | _enable = new QCheckBox( tr( "Enable the Documents Tab" ), this ); |
43 | 47 | ||
@@ -56,13 +60,13 @@ DocTabSettings::DocTabSettings( QWidget *parent, const char *name ):QWidget( par | |||
56 | void DocTabSettings::appletChanged() | 60 | void DocTabSettings::appletChanged() |
57 | { | 61 | { |
58 | } | 62 | } |
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() ); |
66 | cfg.write(); | 70 | cfg.write(); |
67 | } | 71 | } |
68 | 72 | ||
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 | |||
@@ -25,20 +25,24 @@ | |||
25 | Boston, MA 02111-1307, USA. | 25 | Boston, MA 02111-1307, USA. |
26 | 26 | ||
27 | */ | 27 | */ |
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 ); |
42 | 46 | ||
43 | _resize = new QCheckBox( tr( "Resize application on Popup" ), this ); | 47 | _resize = new QCheckBox( tr( "Resize application on Popup" ), this ); |
44 | _float = new QCheckBox( tr( "Enable floating and resizing" ), this ); | 48 | _float = new QCheckBox( tr( "Enable floating and resizing" ), this ); |
@@ -70,13 +74,13 @@ InputMethodSettings::InputMethodSettings( QWidget *parent, const char *name ):QW | |||
70 | void InputMethodSettings::appletChanged() | 74 | void InputMethodSettings::appletChanged() |
71 | { | 75 | { |
72 | } | 76 | } |
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() ); |
80 | cfg.writeEntry( "Float", _float->isChecked() ); | 84 | cfg.writeEntry( "Float", _float->isChecked() ); |
81 | cfg.writeEntry( "Width", _size->value() ); | 85 | cfg.writeEntry( "Width", _size->value() ); |
82 | cfg.write(); | 86 | cfg.write(); |
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 | |||
@@ -22,32 +22,34 @@ | |||
22 | -- :-=` Free Software Foundation, Inc., | 22 | -- :-=` Free Software Foundation, Inc., |
23 | 59 Temple Place - Suite 330, | 23 | 59 Temple Place - Suite 330, |
24 | Boston, MA 02111-1307, USA. | 24 | Boston, MA 02111-1307, USA. |
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> |
33 | #include <qiconview.h> | 42 | #include <qiconview.h> |
34 | #include <qapplication.h> | 43 | #include <qapplication.h> |
35 | #include <qlabel.h> | 44 | #include <qlabel.h> |
36 | #include <qradiobutton.h> | 45 | #include <qradiobutton.h> |
37 | #include <qbuttongroup.h> | 46 | #include <qbuttongroup.h> |
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 { |
51 | public: | 53 | public: |
52 | SampleItem ( QIconView *v, const QString &text, const QPixmap &pix ) : QIconViewItem ( v, text ) | 54 | SampleItem ( QIconView *v, const QString &text, const QPixmap &pix ) : QIconViewItem ( v, text ) |
53 | { | 55 | { |
@@ -145,13 +147,13 @@ public: | |||
145 | else | 147 | else |
146 | setBackgroundColor ( val ); | 148 | setBackgroundColor ( val ); |
147 | break; | 149 | break; |
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; |
155 | imgio. setFileName ( val ); | 157 | imgio. setFileName ( val ); |
156 | QSize ds = qApp-> desktop ( )-> size ( ); | 158 | QSize ds = qApp-> desktop ( )-> size ( ); |
157 | QString param ( "Scale( %1, %2, ScaleMin )" ); // No tr | 159 | QString param ( "Scale( %1, %2, ScaleMin )" ); // No tr |
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 | |||
@@ -25,25 +25,29 @@ | |||
25 | Boston, MA 02111-1307, USA. | 25 | Boston, MA 02111-1307, USA. |
26 | 26 | ||
27 | */ | 27 | */ |
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> |
40 | #include <qlayout.h> | 43 | #include <qlayout.h> |
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 | ||
47 | TaskbarSettings::TaskbarSettings ( QWidget *parent, const char *name ) | 51 | TaskbarSettings::TaskbarSettings ( QWidget *parent, const char *name ) |
48 | : QWidget ( parent, name ) | 52 | : QWidget ( parent, name ) |
49 | { | 53 | { |
@@ -82,39 +86,39 @@ void TaskbarSettings::init ( ) | |||
82 | 86 | ||
83 | for ( QStringList::Iterator it = list. begin ( ); it != list. end ( ); ++it ) { | 87 | for ( QStringList::Iterator it = list. begin ( ); it != list. end ( ); ++it ) { |
84 | QString name; | 88 | QString name; |
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 (".")); |
97 | QString tfn = QPEApplication::qpeDir ( ) + "/i18n/" + lang + "/" + type + ".qm"; | 101 | QString tfn = QPEApplication::qpeDir ( ) + "/i18n/" + lang + "/" + type + ".qm"; |
98 | if ( trans-> load ( tfn )) | 102 | if ( trans-> load ( tfn )) |
99 | qApp-> installTranslator ( trans ); | 103 | qApp-> installTranslator ( trans ); |
100 | else | 104 | else |
101 | delete trans; | 105 | delete trans; |
102 | name = iface-> name ( ); | 106 | name = iface-> name ( ); |
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 |
118 | int sep = name. find( ".so" ); | 122 | int sep = name. find( ".so" ); |
119 | #endif /* Q_OS_MACX */ | 123 | #endif /* Q_OS_MACX */ |
120 | if ( sep > 0 ) | 124 | if ( sep > 0 ) |
@@ -123,16 +127,16 @@ void TaskbarSettings::init ( ) | |||
123 | if ( sep == (int) name.length ( ) - 6 ) | 127 | if ( sep == (int) name.length ( ) - 6 ) |
124 | name. truncate ( sep ); | 128 | name. truncate ( sep ); |
125 | name[0] = name[0]. upper ( ); | 129 | name[0] = name[0]. upper ( ); |
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 ( )) |
136 | item-> setPixmap ( 0, icon ); | 140 | item-> setPixmap ( 0, icon ); |
137 | item-> setOn ( exclude. find ( *it ) == exclude. end ( )); | 141 | item-> setOn ( exclude. find ( *it ) == exclude. end ( )); |
138 | m_applets [*it] = item; | 142 | m_applets [*it] = 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 | |||
@@ -26,20 +26,23 @@ | |||
26 | 26 | ||
27 | */ | 27 | */ |
28 | 28 | ||
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> |
36 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) | 38 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) |
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> |
43 | #include <qslider.h> | 46 | #include <qslider.h> |
44 | #include <qspinbox.h> | 47 | #include <qspinbox.h> |
45 | #include <qpushbutton.h> | 48 | #include <qpushbutton.h> |
@@ -230,25 +233,25 @@ void LightSettings::setContrast ( int contr ) | |||
230 | if (contr == -1) contr = m_oldcontrast; | 233 | if (contr == -1) contr = m_oldcontrast; |
231 | ODevice::inst ( )-> setDisplayContrast(contr); | 234 | ODevice::inst ( )-> setDisplayContrast(contr); |
232 | } | 235 | } |
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 | ||
240 | void LightSettings::resetBacklight ( ) | 243 | void LightSettings::resetBacklight ( ) |
241 | { | 244 | { |
242 | setBacklight ( -1 ); | 245 | setBacklight ( -1 ); |
243 | setContrast ( -1 ); | 246 | setContrast ( -1 ); |
244 | } | 247 | } |
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 ( ) |
252 | { | 255 | { |
253 | Config config ( "apm" ); | 256 | Config config ( "apm" ); |
254 | 257 | ||
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 | |||
@@ -16,25 +16,31 @@ | |||
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
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> |
31 | #include <qmessagebox.h> | 34 | #include <qmessagebox.h> |
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 | { |
38 | valid=FALSE; | 44 | valid=FALSE; |
39 | Config cfg("Security"); | 45 | Config cfg("Security"); |
40 | cfg.setGroup("Passcode"); | 46 | cfg.setGroup("Passcode"); |
@@ -254,13 +260,13 @@ void Security::selectNet(int auth_peer,int auth_peer_bits, bool update) | |||
254 | for (int i=0; i<syncnet->count(); i++) { | 260 | for (int i=0; i<syncnet->count(); i++) { |
255 | if ( syncnet->text(i).left(sn.length()) == sn ) { | 261 | if ( syncnet->text(i).left(sn.length()) == sn ) { |
256 | syncnet->setCurrentItem(i); | 262 | syncnet->setCurrentItem(i); |
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) |
264 | { | 270 | { |
265 | auth_peer=0; | 271 | auth_peer=0; |
266 | if ( sn == tr("Any") ) { | 272 | if ( sn == tr("Any") ) { |
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 | |||
@@ -1,10 +1,10 @@ | |||
1 | CONFIG += qt warn_on quick-app | 1 | CONFIG += qt warn_on quick-app |
2 | HEADERS = security.h | 2 | HEADERS = security.h |
3 | SOURCES = security.cpp main.cpp | 3 | 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 ) |
diff --git a/core/symlinker/main.cpp b/core/symlinker/main.cpp index 6a04980..96e7f3c 100644 --- a/core/symlinker/main.cpp +++ b/core/symlinker/main.cpp | |||
@@ -1,13 +1,19 @@ | |||
1 | |||
2 | /* OPIE */ | ||
3 | #include <opie2/odebug.h> | ||
4 | |||
5 | /* QT */ | ||
1 | #include <qapplication.h> | 6 | #include <qapplication.h> |
2 | #include <qfile.h> | 7 | #include <qfile.h> |
3 | #include <qfileinfo.h> | 8 | #include <qfileinfo.h> |
4 | #include <qdir.h> | 9 | #include <qdir.h> |
5 | #include <qtextstream.h> | 10 | #include <qtextstream.h> |
6 | #include <qstringlist.h> | 11 | #include <qstringlist.h> |
7 | 12 | ||
13 | /* STD */ | ||
8 | #include <stdlib.h> | 14 | #include <stdlib.h> |
9 | #include <unistd.h> //symlink() | 15 | #include <unistd.h> //symlink() |
10 | #include <sys/stat.h> // mkdir() | 16 | #include <sys/stat.h> // mkdir() |
11 | 17 | ||
12 | #include <sys/vfs.h> | 18 | #include <sys/vfs.h> |
13 | #include <mntent.h> | 19 | #include <mntent.h> |
@@ -21,56 +27,56 @@ static void createSymlinks( const QString &location, const QString &package ) | |||
21 | QFile inFile( location + "/usr/lib/ipkg/info/" + package + ".list" ); | 27 | QFile inFile( location + "/usr/lib/ipkg/info/" + package + ".list" ); |
22 | mkdir( "/usr/lib/ipkg", 0777 ); | 28 | mkdir( "/usr/lib/ipkg", 0777 ); |
23 | mkdir( listDir, 0777 ); | 29 | mkdir( listDir, 0777 ); |
24 | 30 | ||
25 | QFile outFile( listDir + package + ".list"); | 31 | QFile outFile( listDir + package + ".list"); |
26 | 32 | ||
27 | // qDebug( "createSymlinks %s -> %s", inFile.name().ascii(), outFile.name().ascii() ); | 33 | // odebug << "createSymlinks " << inFile.name().ascii() << " -> " << outFile.name().ascii() << "" << oendl; |
28 | 34 | ||
29 | 35 | ||
30 | 36 | ||
31 | if ( inFile.open(IO_ReadOnly) && outFile.open(IO_WriteOnly)) { | 37 | if ( inFile.open(IO_ReadOnly) && outFile.open(IO_WriteOnly)) { |
32 | QTextStream in(&inFile); | 38 | QTextStream in(&inFile); |
33 | QTextStream out(&outFile); | 39 | QTextStream out(&outFile); |
34 | 40 | ||
35 | QString s; | 41 | QString s; |
36 | while ( !in.eof() ) { // until end of file... | 42 | while ( !in.eof() ) { // until end of file... |
37 | s = in.readLine(); // line of text excluding '\n' | 43 | s = in.readLine(); // line of text excluding '\n' |
38 | // qDebug( "Read: %s", s.ascii() ); | 44 | // odebug << "Read: " << s.ascii() << "" << oendl; |
39 | if (s.find(location,0,true) >= 0){ | 45 | if (s.find(location,0,true) >= 0){ |
40 | // qDebug( "Found!" ); | 46 | // odebug << "Found!" << oendl; |
41 | s = s.replace(location,""); | 47 | s = s.replace(location,""); |
42 | } | 48 | } |
43 | // qDebug( "Read after: %s", s.ascii() ); | 49 | // odebug << "Read after: " << s.ascii() << "" << oendl; |
44 | 50 | ||
45 | // for s, do link/mkdir. | 51 | // for s, do link/mkdir. |
46 | if ( s.right(1) == "/" ) { | 52 | if ( s.right(1) == "/" ) { |
47 | // qDebug("do mkdir for %s", s.ascii()); | 53 | // odebug << "do mkdir for " << s.ascii() << "" << oendl; |
48 | mkdir( s.ascii(), 0777 ); | 54 | mkdir( s.ascii(), 0777 ); |
49 | //possible optimization: symlink directories | 55 | //possible optimization: symlink directories |
50 | //that don't exist already. -- Risky. | 56 | //that don't exist already. -- Risky. |
51 | } else { | 57 | } else { |
52 | // qDebug("do symlink for %s", s.ascii()); | 58 | // odebug << "do symlink for " << s.ascii() << "" << oendl; |
53 | QFileInfo ffi( s ); | 59 | QFileInfo ffi( s ); |
54 | //Don't try to symlink if a regular file exists already | 60 | //Don't try to symlink if a regular file exists already |
55 | if ( !ffi.exists() || ffi.isSymLink() ) { | 61 | if ( !ffi.exists() || ffi.isSymLink() ) { |
56 | if (symlink( (location+s).ascii(), s.ascii() ) != 0){ | 62 | if (symlink( (location+s).ascii(), s.ascii() ) != 0){ |
57 | if (errno == ENOENT){ | 63 | if (errno == ENOENT){ |
58 | // perror("Symlink Failed! "); | 64 | // perror("Symlink Failed! "); |
59 | QString e=s.ascii(); | 65 | QString e=s.ascii(); |
60 | e = e.replace(ffi.fileName(),""); | 66 | e = e.replace(ffi.fileName(),""); |
61 | // qDebug("DirName : %s",e.ascii() ); | 67 | // odebug << "DirName : " << e.ascii() << "" << oendl; |
62 | system ( QString("mkdir -p ")+e.ascii() ); | 68 | system ( QString("mkdir -p ")+e.ascii() ); |
63 | if (symlink( (location+s).ascii(), s.ascii() ) != 0) | 69 | if (symlink( (location+s).ascii(), s.ascii() ) != 0) |
64 | qDebug ("Big problem creating symlink and directory"); | 70 | odebug << "Big problem creating symlink and directory" << oendl; |
65 | } | 71 | } |
66 | } | 72 | } |
67 | // qDebug ( "Created %s" ,s.ascii() ); | 73 | // qDebug ( "Created %s" ,s.ascii() ); |
68 | out << s << "\n"; | 74 | out << s << "\n"; |
69 | } else { | 75 | } else { |
70 | qDebug( "%s exists already, not symlinked", s.ascii() ); | 76 | odebug << "" << s.ascii() << " exists already, not symlinked" << oendl; |
71 | } | 77 | } |
72 | } | 78 | } |
73 | } | 79 | } |
74 | inFile.close(); | 80 | inFile.close(); |
75 | outFile.close(); | 81 | outFile.close(); |
76 | } | 82 | } |
@@ -85,20 +91,20 @@ static void removeSymlinks( const QString &package ) | |||
85 | if ( inFile.open(IO_ReadOnly) ) { | 91 | if ( inFile.open(IO_ReadOnly) ) { |
86 | QTextStream in(&inFile); | 92 | QTextStream in(&inFile); |
87 | 93 | ||
88 | QString s; | 94 | QString s; |
89 | while ( !in.eof() ) { // until end of file... | 95 | while ( !in.eof() ) { // until end of file... |
90 | s = in.readLine(); // line of text excluding '\n' | 96 | s = in.readLine(); // line of text excluding '\n' |
91 | // qDebug("remove symlink %s", s.ascii()); | 97 | // odebug << "remove symlink " << s.ascii() << "" << oendl; |
92 | QFileInfo ffi( s ); | 98 | QFileInfo ffi( s ); |
93 | //Confirm that it's still a symlink. | 99 | //Confirm that it's still a symlink. |
94 | if ( ffi.isSymLink() ){ | 100 | if ( ffi.isSymLink() ){ |
95 | unlink( s.ascii() ); | 101 | unlink( s.ascii() ); |
96 | // qDebug ( "Removed %s", s.ascii() );} | 102 | // qDebug ( "Removed %s", s.ascii() );} |
97 | // else | 103 | // else |
98 | // qDebug( "Not removed %s", s.ascii() ); | 104 | // odebug << "Not removed " << s.ascii() << "" << oendl; |
99 | } | 105 | } |
100 | } | 106 | } |
101 | inFile.close(); | 107 | inFile.close(); |
102 | inFile.remove(); | 108 | inFile.remove(); |
103 | } | 109 | } |
104 | } | 110 | } |
@@ -128,21 +134,21 @@ static void updateSymlinks() | |||
128 | QString root = me->mnt_dir; | 134 | QString root = me->mnt_dir; |
129 | if ( root == "/" ) | 135 | if ( root == "/" ) |
130 | continue; | 136 | continue; |
131 | 137 | ||
132 | QString info = root + "/usr/lib/ipkg/info"; | 138 | QString info = root + "/usr/lib/ipkg/info"; |
133 | QDir infoDir( info ); | 139 | QDir infoDir( info ); |
134 | // qDebug( "looking at %s", info.ascii() ); | 140 | // odebug << "looking at " << info.ascii() << "" << oendl; |
135 | if ( infoDir.isReadable() ) { | 141 | if ( infoDir.isReadable() ) { |
136 | const QFileInfoList *packages = infoDir.entryInfoList( "*.list" ); // No tr | 142 | const QFileInfoList *packages = infoDir.entryInfoList( "*.list" ); // No tr |
137 | QFileInfoListIterator it( *packages ); | 143 | QFileInfoListIterator it( *packages ); |
138 | QFileInfo *fi; | 144 | QFileInfo *fi; |
139 | while (( fi = *it )) { | 145 | while (( fi = *it )) { |
140 | ++it; | 146 | ++it; |
141 | if ( knownPackages.contains( fi->fileName() ) ) { | 147 | if ( knownPackages.contains( fi->fileName() ) ) { |
142 | // qDebug( "found %s and we've seen it before", fi->fileName().latin1() ); | 148 | // odebug << "found " << fi->fileName() << " and we've seen it before" << oendl; |
143 | knownPackages.remove( fi->fileName() ); | 149 | knownPackages.remove( fi->fileName() ); |
144 | } else { | 150 | } else { |
145 | //it's a new one | 151 | //it's a new one |
146 | createSymlinks( root, fi->baseName() ); | 152 | createSymlinks( root, fi->baseName() ); |
147 | } | 153 | } |
148 | 154 | ||
@@ -172,8 +178,8 @@ int main( int argc, char *argv[] ) | |||
172 | updateSymlinks(); | 178 | updateSymlinks(); |
173 | else if ( command == "create" && argc > 3 ) // No tr | 179 | else if ( command == "create" && argc > 3 ) // No tr |
174 | createSymlinks( argv[2], argv[3] ); | 180 | createSymlinks( argv[2], argv[3] ); |
175 | else if ( command == "remove" && argc > 2 ) // No tr | 181 | else if ( command == "remove" && argc > 2 ) // No tr |
176 | removeSymlinks( argv[2] ); | 182 | removeSymlinks( argv[2] ); |
177 | else | 183 | else |
178 | qWarning( "Argument error" ); | 184 | owarn << "Argument error" << oendl; |
179 | } | 185 | } |
diff --git a/core/symlinker/symlinker.pro b/core/symlinker/symlinker.pro index f850d46..50ad785 100644 --- a/core/symlinker/symlinker.pro +++ b/core/symlinker/symlinker.pro | |||
@@ -6,10 +6,10 @@ HEADERS = | |||
6 | SOURCES = main.cpp | 6 | SOURCES = main.cpp |
7 | INTERFACES= | 7 | INTERFACES= |
8 | 8 | ||
9 | TARGET = opie-update-symlinks | 9 | TARGET = opie-update-symlinks |
10 | INCLUDEPATH += $(OPIEDIR)/include | 10 | INCLUDEPATH += $(OPIEDIR)/include |
11 | DEPENDPATH += $(OPIEDIR)/include . | 11 | DEPENDPATH += $(OPIEDIR)/include . |
12 | LIBS += -lqpe | 12 | LIBS += -lqpe -lopiecore2 |
13 | 13 | ||
14 | include ( $(OPIEDIR)/include.pro ) | 14 | include ( $(OPIEDIR)/include.pro ) |
15 | 15 | ||
diff --git a/core/tools/quicklauncher/main.cpp b/core/tools/quicklauncher/main.cpp index d467d6e..c2467fb 100644 --- a/core/tools/quicklauncher/main.cpp +++ b/core/tools/quicklauncher/main.cpp | |||
@@ -15,12 +15,18 @@ | |||
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #include "dropins.h" | ||
22 | |||
23 | /* OPIE */ | ||
24 | #include <opie2/odebug.h> | ||
25 | |||
26 | /* QT */ | ||
21 | #include <qpainter.h> | 27 | #include <qpainter.h> |
22 | #include <qstrlist.h> | 28 | #include <qstrlist.h> |
23 | #include <qtimer.h> | 29 | #include <qtimer.h> |
24 | #include <qguardedptr.h> | 30 | #include <qguardedptr.h> |
25 | #include <qcopchannel_qws.h> | 31 | #include <qcopchannel_qws.h> |
26 | #define QTOPIA_INTERNAL_INITAPP | 32 | #define QTOPIA_INTERNAL_INITAPP |
@@ -28,19 +34,20 @@ | |||
28 | #ifdef private | 34 | #ifdef private |
29 | # undef private | 35 | # undef private |
30 | #endif | 36 | #endif |
31 | #define private public | 37 | #define private public |
32 | #include <qtopia/qpeapplication.h> | 38 | #include <qtopia/qpeapplication.h> |
33 | #undef private | 39 | #undef private |
40 | |||
41 | /* STD */ | ||
34 | #include <stdio.h> | 42 | #include <stdio.h> |
35 | #include <stdlib.h> | 43 | #include <stdlib.h> |
36 | #include <sys/types.h> | 44 | #include <sys/types.h> |
37 | #include <sys/stat.h> | 45 | #include <sys/stat.h> |
38 | #include <unistd.h> | 46 | #include <unistd.h> |
39 | 47 | ||
40 | #include "dropins.h" | ||
41 | 48 | ||
42 | using QuickPrivate::PluginLoader; | 49 | using QuickPrivate::PluginLoader; |
43 | 50 | ||
44 | static QPEApplication *app = 0; | 51 | static QPEApplication *app = 0; |
45 | static PluginLoader *loader = 0; | 52 | static PluginLoader *loader = 0; |
46 | static ApplicationInterface *appIface = 0; | 53 | static ApplicationInterface *appIface = 0; |
@@ -108,13 +115,13 @@ public: | |||
108 | if ( mainWindow->metaObject()->slotNames().contains("setDocument(const QString&)") ) { | 115 | if ( mainWindow->metaObject()->slotNames().contains("setDocument(const QString&)") ) { |
109 | app->showMainDocumentWidget( mainWindow ); | 116 | app->showMainDocumentWidget( mainWindow ); |
110 | } else { | 117 | } else { |
111 | app->showMainWidget( mainWindow ); | 118 | app->showMainWidget( mainWindow ); |
112 | } | 119 | } |
113 | } else { | 120 | } else { |
114 | qWarning( "Could not create application main window" ); | 121 | owarn << "Could not create application main window" << oendl; |
115 | exit(-1); | 122 | exit(-1); |
116 | } | 123 | } |
117 | } | 124 | } |
118 | 125 | ||
119 | private slots: | 126 | private slots: |
120 | void message(const QCString &msg, const QByteArray & data) | 127 | void message(const QCString &msg, const QByteArray & data) |
@@ -123,21 +130,21 @@ private slots: | |||
123 | 130 | ||
124 | if ( msg == "execute(QStrList)" ) { | 131 | if ( msg == "execute(QStrList)" ) { |
125 | delete qlChannel; | 132 | delete qlChannel; |
126 | QDataStream stream( data, IO_ReadOnly ); | 133 | QDataStream stream( data, IO_ReadOnly ); |
127 | QStrList argList; | 134 | QStrList argList; |
128 | stream >> argList; | 135 | stream >> argList; |
129 | qDebug( "QuickLauncher execute: %s", argList.at(0) ); | 136 | odebug << "QuickLauncher execute: " << argList.at(0) << "" << oendl; |
130 | doQuickLaunch( argList ); | 137 | doQuickLaunch( argList ); |
131 | delete this; | 138 | delete this; |
132 | } else if ( msg == "execute(QString)" ) { | 139 | } else if ( msg == "execute(QString)" ) { |
133 | delete qlChannel; | 140 | delete qlChannel; |
134 | QDataStream stream( data, IO_ReadOnly ); | 141 | QDataStream stream( data, IO_ReadOnly ); |
135 | QString arg; | 142 | QString arg; |
136 | stream >> arg; | 143 | stream >> arg; |
137 | qDebug( "QuickLauncher execute: %s", arg.latin1() ); | 144 | odebug << "QuickLauncher execute: " << arg << "" << oendl; |
138 | QStrList argList; | 145 | QStrList argList; |
139 | argList.append( arg.utf8() ); | 146 | argList.append( arg.utf8() ); |
140 | doQuickLaunch( argList ); | 147 | doQuickLaunch( argList ); |
141 | delete this; | 148 | delete this; |
142 | } | 149 | } |
143 | } | 150 | } |
@@ -177,13 +184,13 @@ int main( int argc, char** argv ) | |||
177 | 184 | ||
178 | QCString arg0 = argv[0]; | 185 | QCString arg0 = argv[0]; |
179 | int sep = arg0.findRev( '/' ); | 186 | int sep = arg0.findRev( '/' ); |
180 | if ( sep > 0 ) | 187 | if ( sep > 0 ) |
181 | arg0 = arg0.mid( sep+1 ); | 188 | arg0 = arg0.mid( sep+1 ); |
182 | if ( arg0 != "quicklauncher" ) { | 189 | if ( arg0 != "quicklauncher" ) { |
183 | qDebug( "QuickLauncher invoked as: %s", arg0.data() ); | 190 | odebug << "QuickLauncher invoked as: " << arg0.data() << "" << oendl; |
184 | QuickLauncher::exec( argc, argv ); | 191 | QuickLauncher::exec( argc, argv ); |
185 | } else { | 192 | } else { |
186 | #ifdef _OS_LINUX_ | 193 | #ifdef _OS_LINUX_ |
187 | // Setup to change proc title | 194 | // Setup to change proc title |
188 | int i; | 195 | int i; |
189 | char **envp = environ; | 196 | char **envp = environ; |
@@ -203,13 +210,13 @@ int main( int argc, char** argv ) | |||
203 | if (i > 0) | 210 | if (i > 0) |
204 | argv_lth = envp[i-1] + strlen(envp[i-1]) - argv0[0]; | 211 | argv_lth = envp[i-1] + strlen(envp[i-1]) - argv0[0]; |
205 | else | 212 | else |
206 | argv_lth = argv0[argc-1] + strlen(argv0[argc-1]) - argv0[0]; | 213 | argv_lth = argv0[argc-1] + strlen(argv0[argc-1]) - argv0[0]; |
207 | #endif | 214 | #endif |
208 | (void)new QuickLauncher(); | 215 | (void)new QuickLauncher(); |
209 | qDebug( "QuickLauncher running" ); | 216 | odebug << "QuickLauncher running" << oendl; |
210 | // Pre-load default fonts | 217 | // Pre-load default fonts |
211 | QFontMetrics fm( QApplication::font() ); | 218 | QFontMetrics fm( QApplication::font() ); |
212 | fm.ascent(); // causes font load. | 219 | fm.ascent(); // causes font load. |
213 | QFont f( QApplication::font() ); | 220 | QFont f( QApplication::font() ); |
214 | f.setWeight( QFont::Bold ); | 221 | f.setWeight( QFont::Bold ); |
215 | QFontMetrics fmb( f ); | 222 | QFontMetrics fmb( f ); |