summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/datebook/modules/monthview/odatebookmonth.cpp1
-rw-r--r--noncore/settings/usermanager/userdialog.h3
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
@@ -5,49 +5,48 @@
5** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. 5** Copyright (C) 2000-2002 Trolltech AS. All rights reserved.
6** 6**
7** This file is part of the Qtopia Environment. 7** This file is part of the Qtopia Environment.
8** 8**
9** This file may be distributed and/or modified under the terms of the 9** This file may be distributed and/or modified under the terms of the
10** GNU General Public License version 2 as published by the Free Software 10** GNU General Public License version 2 as published by the Free Software
11** Foundation and appearing in the file LICENSE.GPL included in the 11** Foundation and appearing in the file LICENSE.GPL included in the
12** packaging of this file. 12** packaging of this file.
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
41class ODateBookMonthTablePrivate 40class ODateBookMonthTablePrivate
42{ 41{
43public: 42public:
44 ODateBookMonthTablePrivate() {}; 43 ODateBookMonthTablePrivate() {};
45 ~ODateBookMonthTablePrivate() { mMonthEvents.clear(); }; 44 ~ODateBookMonthTablePrivate() { mMonthEvents.clear(); };
46 45
47 QValueList<EffectiveEvent> mMonthEvents; 46 QValueList<EffectiveEvent> mMonthEvents;
48 bool onMonday; 47 bool onMonday;
49}; 48};
50 49
51ODateBookMonthTable::ODateBookMonthTable( QWidget *parent, const char *name, 50ODateBookMonthTable::ODateBookMonthTable( QWidget *parent, const char *name,
52 DateBookDBHoliday *newDb ) 51 DateBookDBHoliday *newDb )
53 : QTable( 6, 7, parent, name ), 52 : QTable( 6, 7, parent, name ),
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,46 +1,45 @@
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
25class UserDialog : public QDialog 24class UserDialog : public QDialog
26{ 25{
27 Q_OBJECT 26 Q_OBJECT
28private: 27private:
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;
39 QListView *groupsListView; 38 QListView *groupsListView;
40 39
41 QStringList groupMembers; 40 QStringList groupMembers;
42 QString pictureLocation; 41 QString pictureLocation;
43 QImage userImage; 42 QImage userImage;
44 int groupID; 43 int groupID;
45 int userID; 44 int userID;
46 int vm; 45 int vm;