1 files changed, 30 insertions, 30 deletions

diff --git a/noncore/settings/usermanager/userdialog.cpp b/noncore/settings/usermanager/userdialog.cpp
index 08de352..eb9a289 100644
--- a/noncore/settings/usermanager/userdialog.cpp
+++ b/noncore/settings/usermanager/userdialog.cpp
@@ -13,3 +13,3 @@
 /* OPIE */
-#include <opie/odevice.h>
+#include <opie2/odevice.h>
 #include <qpe/qpeapplication.h>
@@ -51,3 +51,3 @@ UserDialog::UserDialog(int viewmode, QWidget* parent, const char* name, bool mod
         if(accounts->gr_name.find(QRegExp("^#"),0))
-                {// Skip commented lines.
+        {    // Skip commented lines.
             new QCheckListItem(groupsListView,accounts->gr_name,QCheckListItem::CheckBox);
@@ -81,4 +81,4 @@ void UserDialog::setupTab1()
     picturePushButton->setMaximumSize(48,48);
-            picturePushButton->setPixmap(Resource::loadPixmap("usermanager/usericon"));// Load default usericon.
-            connect(picturePushButton,SIGNAL(clicked()),this,SLOT(clickedPicture()));// Clicking the picture should invoke pictureselector.
+    picturePushButton->setPixmap(Resource::loadPixmap("usermanager/usericon"));    // Load default usericon.
+    connect(picturePushButton,SIGNAL(clicked()),this,SLOT(clickedPicture()));    // Clicking the picture should invoke pictureselector.
 
@@ -202,3 +202,3 @@ void UserDialog::setupTab2()
  * Static function that creates the userinfo dialog.
- * The user will be prompted to add a user. 
+ * The user will be prompted to add a user.
  *
@@ -219,4 +219,4 @@ bool UserDialog::addUser(int uid, int gid)
     adduserDialog->setCaption(tr("Add User"));
-            adduserDialog->userID=uid;// Set next available UID as default uid.
-            adduserDialog->groupID=gid;// Set next available GID as default gid.
+    adduserDialog->userID=uid;    // Set next available UID as default uid.
+    adduserDialog->groupID=gid;    // Set next available GID as default gid.
     // Insert default group into groupComboBox
@@ -273,3 +273,3 @@ bool UserDialog::addUser(int uid, int gid)
         QString filename="/opt/QtPalmtop/pics/users/"+accounts->pw_name+".png";
-                //      adduserDialog->userImage=adduserDialog->userImage.smoothScale(48,48);
+        //        adduserDialog->userImage=adduserDialog->userImage.smoothScale(48,48);
         adduserDialog->userImage.save(filename,"PNG");
@@ -286,3 +286,3 @@ bool UserDialog::addUser(int uid, int gid)
 
-                command_cp.sprintf("cp -a /etc/skel/.[!.]* %s/",accounts->pw_dir.latin1());// Bug in busybox, ".*" includes parent directory, does this work as a workaround?
+        command_cp.sprintf("cp -a /etc/skel/.[!.]* %s/",accounts->pw_dir.latin1());    // Bug in busybox, ".*" includes parent directory, does this work as a workaround?
         system(command_cp);
@@ -307,5 +307,5 @@ bool UserDialog::delUser(const char *username)
     if((accounts->findUser(username)))
-            {// Does that user exist?
+    {    // Does that user exist?
         if(!(accounts->delUser(username)))
-                {// Delete the user.
+        {    // Delete the user.
             QMessageBox::information(0,"Ooops!","Something went wrong\nUnable to delete user: "+QString(username)+".");
@@ -334,7 +334,7 @@ bool UserDialog::editUser(const char *username)
     // viewmode is a workaround for a bug in qte-2.3.4 that gives bus error on manipulating edituserDialog's widgets here.
-            UserDialog *edituserDialog=new UserDialog(VIEWMODE_EDIT);// Create Dialog
+    UserDialog *edituserDialog=new UserDialog(VIEWMODE_EDIT);    // Create Dialog
     edituserDialog->setCaption(tr("Edit User"));
-            accounts->findUser(username);// Locate user in database and fill variables in 'accounts' object.
+    accounts->findUser(username);    // Locate user in database and fill variables in 'accounts' object.
     if(!(accounts->findGroup(accounts->pw_gid)))
-            {// Locate the user's primary group, and fill group variables in 'accounts' object.
+    {    // Locate the user's primary group, and fill group variables in 'accounts' object.
         invalid_group=1;
@@ -371,8 +371,8 @@ bool UserDialog::editUser(const char *username)
     // BAH!!! QRegExp in qt2 sucks... or maybe I do... can't figure out how to check for EITHER end of input ($) OR a comma, so here we do two different QRegExps instead.
-            QRegExp userRegExp(QString("[:,]%1$").arg(username));// The end of line variant.
-            QStringList tempList=accounts->groupStringList.grep(userRegExp);// Find all entries in the group database, that the user is a member of.
+    QRegExp userRegExp(QString("[:,]%1$").arg(username));    // The end of line variant.
+    QStringList tempList=accounts->groupStringList.grep(userRegExp);    // Find all entries in the group database, that the user is a member of.
     for(QStringList::Iterator it=tempList.begin(); it!=tempList.end(); ++it)
-            {// Iterate over all of them.
+    {    // Iterate over all of them.
         qWarning(*it);
-                QListViewItemIterator lvit( edituserDialog->groupsListView );// Compare to all groups.
+        QListViewItemIterator lvit( edituserDialog->groupsListView );    // Compare to all groups.
         for ( ; lvit.current(); ++lvit )
@@ -382,3 +382,3 @@ bool UserDialog::editUser(const char *username)
                 temp=(QCheckListItem*)lvit.current();
-                        temp->setOn(true);// If we find a line with that groupname, select it.;
+                temp->setOn(true);    // If we find a line with that groupname, select it.;
             }
@@ -386,8 +386,8 @@ bool UserDialog::editUser(const char *username)
     }
-            userRegExp=QRegExp(QString("[:,]%1,").arg(username));// And the other one. (not end of line.)
-            tempList=accounts->groupStringList.grep(userRegExp);// Find all entries in the group database, that the user is a member of.
+    userRegExp=QRegExp(QString("[:,]%1,").arg(username));    // And the other one. (not end of line.)
+    tempList=accounts->groupStringList.grep(userRegExp);    // Find all entries in the group database, that the user is a member of.
     for(QStringList::Iterator it=tempList.begin(); it!=tempList.end(); ++it)
-            {// Iterate over all of them.
+    {    // Iterate over all of them.
         qWarning(*it);
-                QListViewItemIterator lvit( edituserDialog->groupsListView );// Compare to all groups.
+        QListViewItemIterator lvit( edituserDialog->groupsListView );    // Compare to all groups.
         for ( ; lvit.current(); ++lvit )
@@ -397,3 +397,3 @@ bool UserDialog::editUser(const char *username)
                 temp=(QCheckListItem*)lvit.current();
-                        temp->setOn(true);// If we find a line with that groupname, select it.;
+                temp->setOn(true);    // If we find a line with that groupname, select it.;
             }
@@ -402,5 +402,5 @@ bool UserDialog::editUser(const char *username)
 
-            if(!(edituserDialog->exec())) return false;// SHOW THE DIALOG!
+    if(!(edituserDialog->exec())) return false;    // SHOW THE DIALOG!
 
-            accounts->findUser(username);// Fill user variables in 'acccounts' object.
+    accounts->findUser(username);    // Fill user variables in 'acccounts' object.
     accounts->pw_name=edituserDialog->loginLineEdit->text();
@@ -412,4 +412,4 @@ bool UserDialog::editUser(const char *username)
     if(accounts->findGroup(edituserDialog->groupComboBox->currentText()))
-            {// Fill all group variables in 'accounts' object.
-                accounts->pw_gid=accounts->gr_gid;// Only do this if the group is a valid group (ie. "<Undefined group>"), otherwise keep the old group.
+    {    // Fill all group variables in 'accounts' object.
+        accounts->pw_gid=accounts->gr_gid;    // Only do this if the group is a valid group (ie. "<Undefined group>"), otherwise keep the old group.
     }
@@ -444,3 +444,3 @@ bool UserDialog::editUser(const char *username)
         QString filename="/opt/QtPalmtop/pics/users/"+accounts->pw_name+".png";
-                //      edituserDialog->userImage=edituserDialog->userImage.smoothScale(48,48);
+        //        edituserDialog->userImage=edituserDialog->userImage.smoothScale(48,48);
         edituserDialog->userImage.save(filename,"PNG");
@@ -481,3 +481,3 @@ void UserDialog::clickedPicture()
         {
-                    //          userImage=userImage.smoothScale(48,48);
+            //            userImage=userImage.smoothScale(48,48);
             QPixmap *picture;