author | ar <ar> | 2003-12-22 17:29:18 (UTC) |
---|---|---|
committer | ar <ar> | 2003-12-22 17:29:18 (UTC) |
commit | f0a4320f43abb1a24f80d6de1a94d39453945355 (patch) (unidiff) | |
tree | 5ad5cd96bb659152a67c0f8b43726091615109e8 | |
parent | 34194d7d8957b77fbc032efa5b89ef56e322d35f (diff) | |
download | opie-f0a4320f43abb1a24f80d6de1a94d39453945355.zip opie-f0a4320f43abb1a24f80d6de1a94d39453945355.tar.gz opie-f0a4320f43abb1a24f80d6de1a94d39453945355.tar.bz2 |
- remove stdlib.h and stdio.h
-rw-r--r-- | noncore/settings/usermanager/groupdialog.cpp | 2 | ||||
-rw-r--r-- | noncore/settings/usermanager/userdialog.cpp | 3 | ||||
-rw-r--r-- | noncore/settings/usermanager/usermanager.cpp | 1 |
3 files changed, 0 insertions, 6 deletions
diff --git a/noncore/settings/usermanager/groupdialog.cpp b/noncore/settings/usermanager/groupdialog.cpp index b595d31..76810be 100644 --- a/noncore/settings/usermanager/groupdialog.cpp +++ b/noncore/settings/usermanager/groupdialog.cpp | |||
@@ -1,65 +1,63 @@ | |||
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 | 9 | ||
10 | #include "groupdialog.h" | 10 | #include "groupdialog.h" |
11 | 11 | ||
12 | #include <qlabel.h> | 12 | #include <qlabel.h> |
13 | #include <qlayout.h> | 13 | #include <qlayout.h> |
14 | #include <qmessagebox.h> | 14 | #include <qmessagebox.h> |
15 | 15 | ||
16 | #include <stdlib.h> | ||
17 | |||
18 | #include "passwd.h" | 16 | #include "passwd.h" |
19 | 17 | ||
20 | GroupDialog::GroupDialog(QWidget* parent, const char* name, bool modal, WFlags fl) : QDialog(parent, name, modal, fl) { | 18 | GroupDialog::GroupDialog(QWidget* parent, const char* name, bool modal, WFlags fl) : QDialog(parent, name, modal, fl) { |
21 | // GID | 19 | // GID |
22 | QLabel *gidLabel=new QLabel(this,"gid: "); | 20 | QLabel *gidLabel=new QLabel(this,"gid: "); |
23 | gidLabel->setText("GroupID: "); | 21 | gidLabel->setText("GroupID: "); |
24 | gidLineEdit=new QLineEdit(this,"gid: "); | 22 | gidLineEdit=new QLineEdit(this,"gid: "); |
25 | gidLineEdit->setEnabled(false); | 23 | gidLineEdit->setEnabled(false); |
26 | 24 | ||
27 | // Groupname | 25 | // Groupname |
28 | QLabel *groupnameLabel=new QLabel(this,"groupname"); | 26 | QLabel *groupnameLabel=new QLabel(this,"groupname"); |
29 | groupnameLabel->setText("Groupname: "); | 27 | groupnameLabel->setText("Groupname: "); |
30 | groupnameLineEdit=new QLineEdit(this,"groupname"); | 28 | groupnameLineEdit=new QLineEdit(this,"groupname"); |
31 | 29 | ||
32 | // Widget layout | 30 | // Widget layout |
33 | QVBoxLayout *layout=new QVBoxLayout(this); | 31 | QVBoxLayout *layout=new QVBoxLayout(this); |
34 | layout->setMargin(5); | 32 | layout->setMargin(5); |
35 | QHBoxLayout *hlayout=new QHBoxLayout(-1,"hlayout"); | 33 | QHBoxLayout *hlayout=new QHBoxLayout(-1,"hlayout"); |
36 | layout->addLayout(hlayout); | 34 | layout->addLayout(hlayout); |
37 | QVBoxLayout *vlayout1=new QVBoxLayout(-1,"vlayout1"); | 35 | QVBoxLayout *vlayout1=new QVBoxLayout(-1,"vlayout1"); |
38 | QVBoxLayout *vlayout2=new QVBoxLayout(-1,"vlayout2"); | 36 | QVBoxLayout *vlayout2=new QVBoxLayout(-1,"vlayout2"); |
39 | // First column, labels | 37 | // First column, labels |
40 | vlayout1->addWidget(gidLabel); | 38 | vlayout1->addWidget(gidLabel); |
41 | vlayout1->addWidget(groupnameLabel); | 39 | vlayout1->addWidget(groupnameLabel); |
42 | // Second column, data | 40 | // Second column, data |
43 | vlayout2->addWidget(gidLineEdit); | 41 | vlayout2->addWidget(gidLineEdit); |
44 | vlayout2->addWidget(groupnameLineEdit); | 42 | vlayout2->addWidget(groupnameLineEdit); |
45 | hlayout->addLayout(vlayout1); | 43 | hlayout->addLayout(vlayout1); |
46 | hlayout->addLayout(vlayout2); | 44 | hlayout->addLayout(vlayout2); |
47 | layout->addSpacing(5); | 45 | layout->addSpacing(5); |
48 | 46 | ||
49 | //showMaximized(); | 47 | //showMaximized(); |
50 | } | 48 | } |
51 | 49 | ||
52 | GroupDialog::~GroupDialog() { | 50 | GroupDialog::~GroupDialog() { |
53 | } | 51 | } |
54 | 52 | ||
55 | bool GroupDialog::addGroup(int gid) { | 53 | bool GroupDialog::addGroup(int gid) { |
56 | GroupDialog *addgroupDialog=new GroupDialog();// Make a groupinfo dialog. | 54 | GroupDialog *addgroupDialog=new GroupDialog();// Make a groupinfo dialog. |
57 | addgroupDialog->setCaption(tr("Add Group"));// Set the caption. | 55 | addgroupDialog->setCaption(tr("Add Group"));// Set the caption. |
58 | addgroupDialog->gidLineEdit->setText(QString::number(gid));// Set the next available gid. | 56 | addgroupDialog->gidLineEdit->setText(QString::number(gid));// Set the next available gid. |
59 | if(!(addgroupDialog->exec())) return false;// View the dialog, and only continue if 'ok' was pressed. | 57 | if(!(addgroupDialog->exec())) return false;// View the dialog, and only continue if 'ok' was pressed. |
60 | if(!(accounts->addGroup(addgroupDialog->groupnameLineEdit->text(),addgroupDialog->gidLineEdit->text().toInt()))) {// Try to add the group. | 58 | if(!(accounts->addGroup(addgroupDialog->groupnameLineEdit->text(),addgroupDialog->gidLineEdit->text().toInt()))) {// Try to add the group. |
61 | QMessageBox::information(0,"Ooops!","Something went wrong.\nUnable to add group."); | 59 | QMessageBox::information(0,"Ooops!","Something went wrong.\nUnable to add group."); |
62 | return false; | 60 | return false; |
63 | } | 61 | } |
64 | return true; | 62 | return true; |
65 | } | 63 | } |
diff --git a/noncore/settings/usermanager/userdialog.cpp b/noncore/settings/usermanager/userdialog.cpp index 19b0e84..d87a005 100644 --- a/noncore/settings/usermanager/userdialog.cpp +++ b/noncore/settings/usermanager/userdialog.cpp | |||
@@ -1,67 +1,64 @@ | |||
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 | 9 | ||
10 | #include "userdialog.h" | 10 | #include "userdialog.h" |
11 | 11 | ||
12 | #include <qlayout.h> | 12 | #include <qlayout.h> |
13 | #include <qlabel.h> | 13 | #include <qlabel.h> |
14 | #include <qmessagebox.h> | 14 | #include <qmessagebox.h> |
15 | #include <qfile.h> | 15 | #include <qfile.h> |
16 | 16 | ||
17 | #include <stdlib.h> | ||
18 | |||
19 | #include <stdio.h> | ||
20 | #include <sys/types.h> | 17 | #include <sys/types.h> |
21 | #include <sys/wait.h> | 18 | #include <sys/wait.h> |
22 | #include <unistd.h> | 19 | #include <unistd.h> |
23 | #include <signal.h> | 20 | #include <signal.h> |
24 | 21 | ||
25 | #include "passwd.h" | 22 | #include "passwd.h" |
26 | 23 | ||
27 | #include <opie/odevice.h> | 24 | #include <opie/odevice.h> |
28 | using namespace Opie; | 25 | using namespace Opie; |
29 | 26 | ||
30 | 27 | ||
31 | /** | 28 | /** |
32 | * UserDialog constructor. Setup the dialog, fill the groupComboBox & groupsListView with all groups. | 29 | * UserDialog constructor. Setup the dialog, fill the groupComboBox & groupsListView with all groups. |
33 | * | 30 | * |
34 | */ | 31 | */ |
35 | UserDialog::UserDialog(int viewmode, QWidget* parent, const char* name, bool modal, WFlags fl) : QDialog(parent, name, modal, fl) { | 32 | UserDialog::UserDialog(int viewmode, QWidget* parent, const char* name, bool modal, WFlags fl) : QDialog(parent, name, modal, fl) { |
36 | vm=viewmode; | 33 | vm=viewmode; |
37 | QVBoxLayout *layout = new QVBoxLayout(this); | 34 | QVBoxLayout *layout = new QVBoxLayout(this); |
38 | myTabWidget=new QTabWidget(this,"User Tab Widget"); | 35 | myTabWidget=new QTabWidget(this,"User Tab Widget"); |
39 | layout->addWidget(myTabWidget); | 36 | layout->addWidget(myTabWidget); |
40 | setupTab1(); | 37 | setupTab1(); |
41 | setupTab2(); | 38 | setupTab2(); |
42 | 39 | ||
43 | accounts->groupStringList.sort(); | 40 | accounts->groupStringList.sort(); |
44 | // And also fill the listview & the combobox with all available groups. | 41 | // And also fill the listview & the combobox with all available groups. |
45 | for( QStringList::Iterator it = accounts->groupStringList.begin(); it!=accounts->groupStringList.end(); ++it) { | 42 | for( QStringList::Iterator it = accounts->groupStringList.begin(); it!=accounts->groupStringList.end(); ++it) { |
46 | accounts->splitGroupEntry(*it); | 43 | accounts->splitGroupEntry(*it); |
47 | if(accounts->gr_name.find(QRegExp("^#"),0)) {// Skip commented lines. | 44 | if(accounts->gr_name.find(QRegExp("^#"),0)) {// Skip commented lines. |
48 | new QCheckListItem(groupsListView,accounts->gr_name,QCheckListItem::CheckBox); | 45 | new QCheckListItem(groupsListView,accounts->gr_name,QCheckListItem::CheckBox); |
49 | groupComboBox->insertItem(accounts->gr_name); | 46 | groupComboBox->insertItem(accounts->gr_name); |
50 | } | 47 | } |
51 | } | 48 | } |
52 | showMaximized(); | 49 | showMaximized(); |
53 | } | 50 | } |
54 | 51 | ||
55 | /** | 52 | /** |
56 | * Empty destructor. | 53 | * Empty destructor. |
57 | * | 54 | * |
58 | */ | 55 | */ |
59 | UserDialog::~UserDialog() { | 56 | UserDialog::~UserDialog() { |
60 | } | 57 | } |
61 | 58 | ||
62 | /** | 59 | /** |
63 | * Creates the first tab, all userinfo is here. | 60 | * Creates the first tab, all userinfo is here. |
64 | * | 61 | * |
65 | */ | 62 | */ |
66 | void UserDialog::setupTab1() { | 63 | void UserDialog::setupTab1() { |
67 | QPixmap mypixmap; | 64 | QPixmap mypixmap; |
diff --git a/noncore/settings/usermanager/usermanager.cpp b/noncore/settings/usermanager/usermanager.cpp index 5c90525..5411995 100644 --- a/noncore/settings/usermanager/usermanager.cpp +++ b/noncore/settings/usermanager/usermanager.cpp | |||
@@ -1,61 +1,60 @@ | |||
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 | 9 | ||
10 | #include "usermanager.h" | 10 | #include "usermanager.h" |
11 | 11 | ||
12 | #include <qlayout.h> | 12 | #include <qlayout.h> |
13 | #include <stdio.h> | ||
14 | 13 | ||
15 | #include <qmessagebox.h> | 14 | #include <qmessagebox.h> |
16 | #include <qfile.h> | 15 | #include <qfile.h> |
17 | #include <qpe/resource.h> | 16 | #include <qpe/resource.h> |
18 | 17 | ||
19 | #include <qregexp.h> | 18 | #include <qregexp.h> |
20 | 19 | ||
21 | /** | 20 | /** |
22 | * The mainwindow constructor. | 21 | * The mainwindow constructor. |
23 | * | 22 | * |
24 | * @param QWidget *parent | 23 | * @param QWidget *parent |
25 | * @param const char *name | 24 | * @param const char *name |
26 | * @ param WFlags fl | 25 | * @ param WFlags fl |
27 | * | 26 | * |
28 | */ | 27 | */ |
29 | UserConfig::UserConfig(QWidget* parent, const char* name, WFlags fl) : QMainWindow(parent, name, fl) { | 28 | UserConfig::UserConfig(QWidget* parent, const char* name, WFlags fl) : QMainWindow(parent, name, fl) { |
30 | setCaption(tr("Opie User Manager")); | 29 | setCaption(tr("Opie User Manager")); |
31 | 30 | ||
32 | // Create an instance of the global object 'accounts'. This holds all user/group info, and functions to modify them. | 31 | // Create an instance of the global object 'accounts'. This holds all user/group info, and functions to modify them. |
33 | accounts=new Passwd(); | 32 | accounts=new Passwd(); |
34 | accounts->open();// This actually loads the files /etc/passwd & /etc/group into memory. | 33 | accounts->open();// This actually loads the files /etc/passwd & /etc/group into memory. |
35 | 34 | ||
36 | // Create the toolbar. | 35 | // Create the toolbar. |
37 | QToolBar *toolbar = new QToolBar(this,"Toolbar"); | 36 | QToolBar *toolbar = new QToolBar(this,"Toolbar"); |
38 | toolbar->setHorizontalStretchable(1); // Is there any other way to get the toolbar to stretch of the full screen!? | 37 | toolbar->setHorizontalStretchable(1); // Is there any other way to get the toolbar to stretch of the full screen!? |
39 | adduserToolButton = new QToolButton(Resource::loadPixmap("usermanager/adduser"),"Add User",0,this,SLOT(addUser()),toolbar,"Add User"); | 38 | adduserToolButton = new QToolButton(Resource::loadPixmap("usermanager/adduser"),"Add User",0,this,SLOT(addUser()),toolbar,"Add User"); |
40 | edituserToolButton = new QToolButton(Resource::loadPixmap("usermanager/edituser"),"Edit User",0,this,SLOT(editUser()),toolbar,"Edit User"); | 39 | edituserToolButton = new QToolButton(Resource::loadPixmap("usermanager/edituser"),"Edit User",0,this,SLOT(editUser()),toolbar,"Edit User"); |
41 | deleteuserToolButton = new QToolButton(Resource::loadPixmap("usermanager/deleteuser"),"Delete User",0,this,SLOT(delUser()),toolbar,"Delete User"); | 40 | deleteuserToolButton = new QToolButton(Resource::loadPixmap("usermanager/deleteuser"),"Delete User",0,this,SLOT(delUser()),toolbar,"Delete User"); |
42 | QToolButton *userstext = new QToolButton(0,"User",0,0,0,toolbar,"User"); | 41 | QToolButton *userstext = new QToolButton(0,"User",0,0,0,toolbar,"User"); |
43 | userstext->setUsesTextLabel(true); | 42 | userstext->setUsesTextLabel(true); |
44 | toolbar->addSeparator(); | 43 | toolbar->addSeparator(); |
45 | addgroupToolButton = new QToolButton(Resource::loadPixmap("usermanager/addgroup"),"Add Group",0,this,SLOT(addGroup()),toolbar,"Add Group"); | 44 | addgroupToolButton = new QToolButton(Resource::loadPixmap("usermanager/addgroup"),"Add Group",0,this,SLOT(addGroup()),toolbar,"Add Group"); |
46 | editgroupToolButton = new QToolButton(Resource::loadPixmap("usermanager/editgroup"),"Edit Group",0,this,SLOT(editGroup()),toolbar,"Edit Group"); | 45 | editgroupToolButton = new QToolButton(Resource::loadPixmap("usermanager/editgroup"),"Edit Group",0,this,SLOT(editGroup()),toolbar,"Edit Group"); |
47 | deletegroupToolButton = new QToolButton(Resource::loadPixmap("usermanager/deletegroup"),"Delete Group",0,this,SLOT(delGroup()),toolbar,"Delete Group"); | 46 | deletegroupToolButton = new QToolButton(Resource::loadPixmap("usermanager/deletegroup"),"Delete Group",0,this,SLOT(delGroup()),toolbar,"Delete Group"); |
48 | QToolButton *groupstext = new QToolButton(0,"Group",0,0,0,toolbar,"Group"); | 47 | QToolButton *groupstext = new QToolButton(0,"Group",0,0,0,toolbar,"Group"); |
49 | groupstext->setUsesTextLabel(true); | 48 | groupstext->setUsesTextLabel(true); |
50 | addToolBar(toolbar,"myToolBar"); | 49 | addToolBar(toolbar,"myToolBar"); |
51 | 50 | ||
52 | // Add a tabwidget and all the tabs. | 51 | // Add a tabwidget and all the tabs. |
53 | myTabWidget = new QTabWidget(this,"My Tab Widget"); | 52 | myTabWidget = new QTabWidget(this,"My Tab Widget"); |
54 | setupTabAccounts(); | 53 | setupTabAccounts(); |
55 | setupTabAllUsers(); | 54 | setupTabAllUsers(); |
56 | setupTabAllGroups(); | 55 | setupTabAllGroups(); |
57 | userPopupMenu.insertItem("Copy",0); | 56 | userPopupMenu.insertItem("Copy",0); |
58 | 57 | ||
59 | getUsers(); // Fill out the iconview & listview with all users. | 58 | getUsers(); // Fill out the iconview & listview with all users. |
60 | getGroups(); // Fill out the group listview with all groups. | 59 | getGroups(); // Fill out the group listview with all groups. |
61 | 60 | ||