summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/settings/button/buttonsettings.cpp1
-rw-r--r--core/settings/button/main.cpp1
-rw-r--r--core/settings/button/remapdlg.cpp1
3 files changed, 0 insertions, 3 deletions
diff --git a/core/settings/button/buttonsettings.cpp b/core/settings/button/buttonsettings.cpp
index b6a07a8..523e295 100644
--- a/core/settings/button/buttonsettings.cpp
+++ b/core/settings/button/buttonsettings.cpp
@@ -8,49 +8,48 @@
8.="- .-=="i,     .._ License as published by the Free Software 8.="- .-=="i,     .._ License as published by the Free Software
9 - .   .-<_>     .<> Foundation; either version 2 of the License, 9 - .   .-<_>     .<> Foundation; either version 2 of the License,
10     ._= =}       : or (at your option) any later version. 10     ._= =}       : or (at your option) any later version.
11    .%`+i>       _;_. 11    .%`+i>       _;_.
12    .i_,=:_.      -<s. This file is distributed in the hope that 12    .i_,=:_.      -<s. This file is distributed in the hope that
13     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY; 13     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
14    : ..    .:,     . . . without even the implied warranty of 14    : ..    .:,     . . . without even the implied warranty of
15    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A 15    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
16  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU General 16  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU General
17..}^=.=       =       ; Public License for more details. 17..}^=.=       =       ; Public License for more details.
18++=   -.     .`     .: 18++=   -.     .`     .:
19 :     =  ...= . :.=- You should have received a copy of the GNU 19 :     =  ...= . :.=- You should have received a copy of the GNU
20 -.   .:....=;==+<; General Public License along with this file; 20 -.   .:....=;==+<; General Public License along with this file;
21  -_. . .   )=.  = see the file COPYING. If not, write to the 21  -_. . .   )=.  = see the file COPYING. If not, write to the
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 <qlayout.h> 28#include <qlayout.h>
29#include <qlabel.h> 29#include <qlabel.h>
30#include <qtimer.h> 30#include <qtimer.h>
31 31
32#include <qpe/qpeapplication.h>
33 32
34#include <opie/odevice.h> 33#include <opie/odevice.h>
35 34
36#include "buttonsettings.h" 35#include "buttonsettings.h"
37#include "buttonutils.h" 36#include "buttonutils.h"
38#include "remapdlg.h" 37#include "remapdlg.h"
39 38
40using namespace Opie; 39using namespace Opie;
41 40
42struct buttoninfo { 41struct buttoninfo {
43 const ODeviceButton *m_button; 42 const ODeviceButton *m_button;
44 int m_index; 43 int m_index;
45 44
46 OQCopMessage m_pmsg; 45 OQCopMessage m_pmsg;
47 QLabel *m_picon; 46 QLabel *m_picon;
48 QLabel *m_plabel; 47 QLabel *m_plabel;
49 48
50 OQCopMessage m_hmsg; 49 OQCopMessage m_hmsg;
51 QLabel *m_hicon; 50 QLabel *m_hicon;
52 QLabel *m_hlabel; 51 QLabel *m_hlabel;
53 52
54 bool m_pdirty : 1; 53 bool m_pdirty : 1;
55 bool m_hdirty : 1; 54 bool m_hdirty : 1;
56}; 55};
diff --git a/core/settings/button/main.cpp b/core/settings/button/main.cpp
index c063c3c..e7c5bf9 100644
--- a/core/settings/button/main.cpp
+++ b/core/settings/button/main.cpp
@@ -6,28 +6,27 @@
6.> <`_,   >  .   <= redistribute it and/or modify it under 6.> <`_,   >  .   <= redistribute it and/or modify it under
7:`=1 )Y*s>-.--   : the terms of the GNU General Public 7:`=1 )Y*s>-.--   : the terms of the GNU General Public
8.="- .-=="i,     .._ License as published by the Free Software 8.="- .-=="i,     .._ License as published by the Free Software
9 - .   .-<_>     .<> Foundation; either version 2 of the License, 9 - .   .-<_>     .<> Foundation; either version 2 of the License,
10     ._= =}       : or (at your option) any later version. 10     ._= =}       : or (at your option) any later version.
11    .%`+i>       _;_. 11    .%`+i>       _;_.
12    .i_,=:_.      -<s. This file is distributed in the hope that 12    .i_,=:_.      -<s. This file is distributed in the hope that
13     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY; 13     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
14    : ..    .:,     . . . without even the implied warranty of 14    : ..    .:,     . . . without even the implied warranty of
15    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A 15    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
16  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU General 16  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU General
17..}^=.=       =       ; Public License for more details. 17..}^=.=       =       ; Public License for more details.
18++=   -.     .`     .: 18++=   -.     .`     .:
19 :     =  ...= . :.=- You should have received a copy of the GNU 19 :     =  ...= . :.=- You should have received a copy of the GNU
20 -.   .:....=;==+<; General Public License along with this file; 20 -.   .:....=;==+<; General Public License along with this file;
21  -_. . .   )=.  = see the file COPYING. If not, write to the 21  -_. . .   )=.  = see the file COPYING. If not, write to the
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 "buttonsettings.h" 28#include "buttonsettings.h"
29 29
30#include <qpe/qpeapplication.h>
31#include <opie/oapplicationfactory.h> 30#include <opie/oapplicationfactory.h>
32 31
33OPIE_EXPORT_APP( OApplicationFactory<ButtonSettings> ) 32OPIE_EXPORT_APP( OApplicationFactory<ButtonSettings> )
diff --git a/core/settings/button/remapdlg.cpp b/core/settings/button/remapdlg.cpp
index 939a6bf..7dabe68 100644
--- a/core/settings/button/remapdlg.cpp
+++ b/core/settings/button/remapdlg.cpp
@@ -1,26 +1,25 @@
1#include <qlistview.h> 1#include <qlistview.h>
2#include <qlabel.h>
3#include <qcombobox.h> 2#include <qcombobox.h>
4#include <qtimer.h> 3#include <qtimer.h>
5 4
6#include "remapdlg.h" 5#include "remapdlg.h"
7#include "buttonutils.h" 6#include "buttonutils.h"
8 7
9using namespace Opie; 8using namespace Opie;
10 9
11class NoSortItem : public QListViewItem { 10class NoSortItem : public QListViewItem {
12public: 11public:
13 NoSortItem ( QListView *lv, uint pos, const QString &str, const QCString &s1 = 0, const QCString &s2 = 0 ) 12 NoSortItem ( QListView *lv, uint pos, const QString &str, const QCString &s1 = 0, const QCString &s2 = 0 )
14 : QListViewItem ( lv, str, s1, s2 ) 13 : QListViewItem ( lv, str, s1, s2 )
15 { 14 {
16 m_key = QString ( QChar ( 'a' + pos )); 15 m_key = QString ( QChar ( 'a' + pos ));
17 m_def = false; 16 m_def = false;
18 } 17 }
19 18
20 void setDefault ( bool b ) 19 void setDefault ( bool b )
21 { 20 {
22 m_def = b; 21 m_def = b;
23 } 22 }
24 23
25 virtual QString key ( int /*column*/, bool /*ascending*/ ) const 24 virtual QString key ( int /*column*/, bool /*ascending*/ ) const
26 { 25 {