-rw-r--r-- | core/pim/datebook/modules/monthview/odatebookmonth.cpp | 1 | ||||
-rw-r--r-- | noncore/settings/usermanager/userdialog.h | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/core/pim/datebook/modules/monthview/odatebookmonth.cpp b/core/pim/datebook/modules/monthview/odatebookmonth.cpp index 5e2f1bb..d52a092 100644 --- a/core/pim/datebook/modules/monthview/odatebookmonth.cpp +++ b/core/pim/datebook/modules/monthview/odatebookmonth.cpp | |||
@@ -13,33 +13,32 @@ | |||
13 | ** | 13 | ** |
14 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 14 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
15 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 15 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
16 | ** | 16 | ** |
17 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 17 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
18 | ** | 18 | ** |
19 | ** Contact info@trolltech.com if any conditions of this licensing are | 19 | ** Contact info@trolltech.com if any conditions of this licensing are |
20 | ** not clear to you. | 20 | ** not clear to you. |
21 | ** | 21 | ** |
22 | **********************************************************************/ | 22 | **********************************************************************/ |
23 | #include "odatebookmonth.h" | 23 | #include "odatebookmonth.h" |
24 | #include "datebooktypes.h" | 24 | #include "datebooktypes.h" |
25 | 25 | ||
26 | #include <qpe/config.h> | 26 | #include <qpe/config.h> |
27 | #include <qpe/datebookmonth.h> | 27 | #include <qpe/datebookmonth.h> |
28 | 28 | ||
29 | #include <qpe/resource.h> | ||
30 | #include <qpe/qpeapplication.h> | 29 | #include <qpe/qpeapplication.h> |
31 | 30 | ||
32 | #include <qtoolbutton.h> | 31 | #include <qtoolbutton.h> |
33 | #include <qspinbox.h> | 32 | #include <qspinbox.h> |
34 | #include <qcombobox.h> | 33 | #include <qcombobox.h> |
35 | #include <qvaluestack.h> | 34 | #include <qvaluestack.h> |
36 | #include <qwhatsthis.h> | 35 | #include <qwhatsthis.h> |
37 | 36 | ||
38 | 37 | ||
39 | //--------------------------------------------------------------------------- | 38 | //--------------------------------------------------------------------------- |
40 | 39 | ||
41 | class ODateBookMonthTablePrivate | 40 | class ODateBookMonthTablePrivate |
42 | { | 41 | { |
43 | public: | 42 | public: |
44 | ODateBookMonthTablePrivate() {}; | 43 | ODateBookMonthTablePrivate() {}; |
45 | ~ODateBookMonthTablePrivate() { mMonthEvents.clear(); }; | 44 | ~ODateBookMonthTablePrivate() { mMonthEvents.clear(); }; |
diff --git a/noncore/settings/usermanager/userdialog.h b/noncore/settings/usermanager/userdialog.h index a94e49b..78cd608 100644 --- a/noncore/settings/usermanager/userdialog.h +++ b/noncore/settings/usermanager/userdialog.h | |||
@@ -1,38 +1,37 @@ | |||
1 | /*************************************************************************** | 1 | /*************************************************************************** |
2 | * * | 2 | * * |
3 | * This program is free software; you can redistribute it and/or modify * | 3 | * This program is free software; you can redistribute it and/or modify * |
4 | * it under the terms of the GNU General Public License as published by * | 4 | * it under the terms of the GNU General Public License as published by * |
5 | * the Free Software Foundation; either version 2 of the License, or * | 5 | * the Free Software Foundation; either version 2 of the License, or * |
6 | * (at your option) any later version. * | 6 | * (at your option) any later version. * |
7 | * * | 7 | * * |
8 | ***************************************************************************/ | 8 | ***************************************************************************/ |
9 | #ifndef USERDIALOG_H | 9 | #ifndef USERDIALOG_H |
10 | #define USERDIALOG_H | 10 | #define USERDIALOG_H |
11 | 11 | ||
12 | #include <qdialog.h> | 12 | #include <qdialog.h> |
13 | #include <qimage.h> | ||
13 | #include <qlineedit.h> | 14 | #include <qlineedit.h> |
14 | #include <qcombobox.h> | 15 | #include <qcombobox.h> |
15 | #include <qlistview.h> | 16 | #include <qlistview.h> |
16 | #include <qtabwidget.h> | 17 | #include <qtabwidget.h> |
17 | #include <qpushbutton.h> | 18 | #include <qpushbutton.h> |
18 | #include <qcheckbox.h> | 19 | #include <qcheckbox.h> |
19 | #include <qlabel.h> | 20 | #include <qlabel.h> |
20 | 21 | ||
21 | #include <qpe/resource.h> | ||
22 | |||
23 | #include <opie2/ofiledialog.h> | 22 | #include <opie2/ofiledialog.h> |
24 | 23 | ||
25 | class UserDialog : public QDialog | 24 | class UserDialog : public QDialog |
26 | { | 25 | { |
27 | Q_OBJECT | 26 | Q_OBJECT |
28 | private: | 27 | private: |
29 | QTabWidget *myTabWidget; | 28 | QTabWidget *myTabWidget; |
30 | QPushButton *picturePushButton; | 29 | QPushButton *picturePushButton; |
31 | QLineEdit *loginLineEdit; | 30 | QLineEdit *loginLineEdit; |
32 | QLineEdit *uidLineEdit; | 31 | QLineEdit *uidLineEdit; |
33 | QLineEdit *gecosLineEdit; | 32 | QLineEdit *gecosLineEdit; |
34 | QLineEdit *passwordLineEdit; | 33 | QLineEdit *passwordLineEdit; |
35 | QComboBox *shellComboBox; | 34 | QComboBox *shellComboBox; |
36 | QComboBox *groupComboBox; | 35 | QComboBox *groupComboBox; |
37 | QLabel *skelLabel; | 36 | QLabel *skelLabel; |
38 | QCheckBox *skelCheckBox; | 37 | QCheckBox *skelCheckBox; |