summaryrefslogtreecommitdiff
authordrw <drw>2005-06-15 19:45:55 (UTC)
committer drw <drw>2005-06-15 19:45:55 (UTC)
commitd2474c8e654d223b85b6200ce09fabd3a40af8e3 (patch) (unidiff)
tree2c9781e5f0793a2d796b331dba2cd177affda648
parent1cc97c3b70f59b90dc4bf032a14198dc8bd07f2e (diff)
downloadopie-d2474c8e654d223b85b6200ce09fabd3a40af8e3.zip
opie-d2474c8e654d223b85b6200ce09fabd3a40af8e3.tar.gz
opie-d2474c8e654d223b85b6200ce09fabd3a40af8e3.tar.bz2
Remove unneeded include
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
@@ -1,77 +1,76 @@
1/* this is a straight copy of datemonthview. We can not make child of 1/* this is a straight copy of datemonthview. We can not make child of
2 * it 'cause the origin view isn't virtual in any form. 2 * it 'cause the origin view isn't virtual in any form.
3 */ 3 */
4/********************************************************************** 4/**********************************************************************
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 ),
54 db( newDb ) 53 db( newDb )
55{ 54{
56 d = new ODateBookMonthTablePrivate(); 55 d = new ODateBookMonthTablePrivate();
57 selYear = -1; 56 selYear = -1;
58 selMonth = -1; 57 selMonth = -1;
59 selDay = -1; 58 selDay = -1;
60 59
61 /* init these as well make valgrind happy and be consistent with Qtopia1.6 -zecke */ 60 /* init these as well make valgrind happy and be consistent with Qtopia1.6 -zecke */
62 year = -1; 61 year = -1;
63 month = -1; 62 month = -1;
64 day = -1; 63 day = -1;
65 64
66 Config cfg( "qpe" ); 65 Config cfg( "qpe" );
67 cfg.setGroup( "Time" ); 66 cfg.setGroup( "Time" );
68 d->onMonday = cfg.readBoolEntry( "MONDAY" ); 67 d->onMonday = cfg.readBoolEntry( "MONDAY" );
69 68
70 horizontalHeader()->setResizeEnabled( FALSE ); 69 horizontalHeader()->setResizeEnabled( FALSE );
71 // we have to do this here... or suffer the consequences later... 70 // we have to do this here... or suffer the consequences later...
72 for ( int i = 0; i < 7; i++ ){ 71 for ( int i = 0; i < 7; i++ ){
73 horizontalHeader()->resizeSection( i, 30 ); 72 horizontalHeader()->resizeSection( i, 30 );
74 setColumnStretchable( i, TRUE ); 73 setColumnStretchable( i, TRUE );
75 } 74 }
76 setupLabels(); 75 setupLabels();
77 76
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,67 +1,66 @@
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;
47 enum VIEWMODE { 46 enum VIEWMODE {
48 VIEWMODE_NEW, 47 VIEWMODE_NEW,
49 VIEWMODE_EDIT 48 VIEWMODE_EDIT
50 }; 49 };
51 50
52 void setupTab1(void); 51 void setupTab1(void);
53 void setupTab2(void); 52 void setupTab2(void);
54 void accept(void); 53 void accept(void);
55 54
56private slots: 55private slots:
57 void clickedPicture(void); 56 void clickedPicture(void);
58 57
59public: 58public:
60 UserDialog( int viewmode=VIEWMODE_NEW, QWidget* parent = 0, const char* name = 0, bool modal=true, WFlags fl = 0 ); 59 UserDialog( int viewmode=VIEWMODE_NEW, QWidget* parent = 0, const char* name = 0, bool modal=true, WFlags fl = 0 );
61 ~UserDialog(); 60 ~UserDialog();
62 static bool addUser(int uid, int gid); 61 static bool addUser(int uid, int gid);
63 static bool editUser(const char *username); 62 static bool editUser(const char *username);
64 static bool delUser(const char *username); 63 static bool delUser(const char *username);
65}; 64};
66 65
67#endif 66#endif