User Manager: libopie->libopie2

5 files changed, 76 insertions, 76 deletions

diff --git a/noncore/settings/usermanager/main.cpp b/noncore/settings/usermanager/main.cpp
index 515ea9a..d7147d1 100644
--- a/noncore/settings/usermanager/main.cpp
+++ b/noncore/settings/usermanager/main.cpp
@@ -9,6 +9,6 @@
 
 #include "usermanager.h"
-#include <qpe/qpeapplication.h>
-#include <opie/oapplicationfactory.h>
+
+#include <opie2/oapplicationfactory.h>
 
 OPIE_EXPORT_APP( OApplicationFactory<UserConfig> )
diff --git a/noncore/settings/usermanager/opie-usermanager.control b/noncore/settings/usermanager/opie-usermanager.control
index 5061366..52930d2 100644
--- a/noncore/settings/usermanager/opie-usermanager.control
+++ b/noncore/settings/usermanager/opie-usermanager.control
@@ -3,5 +3,5 @@ Files: plugins/application/libusermanager.so* bin/usermanager apps/Settings/user
 Priority: optional
 Section: opie/settings
-Depends: task-opie-minimal
+Depends: task-opie-minimal, libopiecore2, libopieui2
 Architecture: arm
 Maintainer: Ted Parnefors <zaurus@bredband.net>
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
@@ -12,5 +12,5 @@
 
 /* OPIE */
-#include <opie/odevice.h>
+#include <opie2/odevice.h>
 #include <qpe/qpeapplication.h>
 
@@ -50,5 +50,5 @@ UserDialog::UserDialog(int viewmode, QWidget* parent, const char* name, bool mod
         accounts->splitGroupEntry(*it);
         if(accounts->gr_name.find(QRegExp("^#"),0))
-        {	// Skip commented lines.
+        {    // Skip commented lines.
             new QCheckListItem(groupsListView,accounts->gr_name,QCheckListItem::CheckBox);
             groupComboBox->insertItem(accounts->gr_name);
@@ -80,6 +80,6 @@ void UserDialog::setupTab1()
     picturePushButton->setMinimumSize(48,48);
     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.
 
     // Login
@@ -201,5 +201,5 @@ 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.
  *
  * @param uid This is a suggested available UID.
@@ -218,6 +218,6 @@ bool UserDialog::addUser(int uid, int gid)
     UserDialog *adduserDialog=new UserDialog(VIEWMODE_NEW);
     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
     adduserDialog->groupComboBox->insertItem("<create new group>",0);
@@ -272,5 +272,5 @@ 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");
     }
@@ -285,5 +285,5 @@ bool UserDialog::addUser(int uid, int gid)
         system(command_cp);
 
-        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);
 
@@ -306,7 +306,7 @@ 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)+".");
         }
@@ -333,9 +333,9 @@ bool UserDialog::editUser(const char *username)
     int invalid_group=0;
     // 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;
     }
@@ -370,10 +370,10 @@ bool UserDialog::editUser(const char *username)
     QCheckListItem *temp;
     // 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 )
         {
@@ -381,14 +381,14 @@ 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.;
             }
         }
     }
-    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 )
         {
@@ -396,12 +396,12 @@ 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.;
             }
         }
     }
 
-    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();
     // Has the password been changed ? Make a new "crypt":ed password.
@@ -411,6 +411,6 @@ bool UserDialog::editUser(const char *username)
     accounts->pw_uid=edituserDialog->uidLineEdit->text().toInt();
     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.
     }
     accounts->pw_gecos=edituserDialog->gecosLineEdit->text();
@@ -443,5 +443,5 @@ 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");
     }
@@ -480,5 +480,5 @@ void UserDialog::clickedPicture()
         else
         {
-            //			userImage=userImage.smoothScale(48,48);
+            //            userImage=userImage.smoothScale(48,48);
             QPixmap *picture;
             picture=(QPixmap *)picturePushButton->pixmap();
diff --git a/noncore/settings/usermanager/userdialog.h b/noncore/settings/usermanager/userdialog.h
index 3272afc..a94e49b 100644
--- a/noncore/settings/usermanager/userdialog.h
+++ b/noncore/settings/usermanager/userdialog.h
@@ -21,46 +21,46 @@
 #include <qpe/resource.h>
 
-#include <opie/ofiledialog.h>
+#include <opie2/ofiledialog.h>
 
-class UserDialog : public QDialog 
+class UserDialog : public QDialog
 {
-	Q_OBJECT
+    Q_OBJECT
 private:
-	QTabWidget *myTabWidget;
-	QPushButton *picturePushButton;
-	QLineEdit *loginLineEdit;
-	QLineEdit *uidLineEdit;
-	QLineEdit *gecosLineEdit;
-	QLineEdit *passwordLineEdit;
-	QComboBox *shellComboBox;
-	QComboBox *groupComboBox;
-	QLabel *skelLabel;
-	QCheckBox *skelCheckBox;
-	QListView *groupsListView;
-	
-	QStringList groupMembers;
-	QString pictureLocation;
-	QImage userImage;
-	int groupID;
-	int userID;
-	int vm;
-	enum VIEWMODE {
-		VIEWMODE_NEW,
-		VIEWMODE_EDIT
-	};
-		
-	void setupTab1(void);
-	void setupTab2(void);
-	void accept(void);
+    QTabWidget *myTabWidget;
+    QPushButton *picturePushButton;
+    QLineEdit *loginLineEdit;
+    QLineEdit *uidLineEdit;
+    QLineEdit *gecosLineEdit;
+    QLineEdit *passwordLineEdit;
+    QComboBox *shellComboBox;
+    QComboBox *groupComboBox;
+    QLabel *skelLabel;
+    QCheckBox *skelCheckBox;
+    QListView *groupsListView;
+
+    QStringList groupMembers;
+    QString pictureLocation;
+    QImage userImage;
+    int groupID;
+    int userID;
+    int vm;
+    enum VIEWMODE {
+        VIEWMODE_NEW,
+        VIEWMODE_EDIT
+    };
+
+    void setupTab1(void);
+    void setupTab2(void);
+    void accept(void);
 
 private slots:
-	void clickedPicture(void);
+    void clickedPicture(void);
 
 public:
-	UserDialog( int viewmode=VIEWMODE_NEW, QWidget* parent = 0, const char* name = 0, bool modal=true, WFlags fl = 0 );
-	~UserDialog();
-	static bool addUser(int uid, int gid);
-	static bool editUser(const char *username);
-	static bool delUser(const char *username);
+    UserDialog( int viewmode=VIEWMODE_NEW, QWidget* parent = 0, const char* name = 0, bool modal=true, WFlags fl = 0 );
+    ~UserDialog();
+    static bool addUser(int uid, int gid);
+    static bool editUser(const char *username);
+    static bool delUser(const char *username);
 };
 
diff --git a/noncore/settings/usermanager/usermanager.pro b/noncore/settings/usermanager/usermanager.pro
index 0b2f056..f20c9c3 100644
--- a/noncore/settings/usermanager/usermanager.pro
+++ b/noncore/settings/usermanager/usermanager.pro
@@ -1,10 +1,10 @@
-#CONFIG		= qt warn_on debug
-CONFIG		= qt warn_on release quick-app
-HEADERS		= usermanager.h userdialog.h groupdialog.h passwd.h
-SOURCES		= usermanager.cpp userdialog.cpp groupdialog.cpp passwd.cpp main.cpp
-INCLUDEPATH	+= $(OPIEDIR)/include
-DEPENDPATH	+= $(OPIEDIR)/include
-LIBS            += -lqpe -lopie -lcrypt
-TARGET		= usermanager
+#CONFIG        = qt warn_on debug
+CONFIG        = qt warn_on release quick-app
+HEADERS        = usermanager.h userdialog.h groupdialog.h passwd.h
+SOURCES        = usermanager.cpp userdialog.cpp groupdialog.cpp passwd.cpp main.cpp
+INCLUDEPATH    += $(OPIEDIR)/include
+DEPENDPATH    += $(OPIEDIR)/include
+LIBS            += -lqpe -lopiecore2 -lopieui2 -lcrypt
+TARGET        = usermanager
 
 include ( $(OPIEDIR)/include.pro )