1 files changed, 38 insertions, 9 deletions

diff --git a/noncore/settings/networksettings/ppp/pppdata.h b/noncore/settings/networksettings/ppp/pppdata.h
index 6e1379d..d1cbeb5 100644
--- a/noncore/settings/networksettings/ppp/pppdata.h
+++ b/noncore/settings/networksettings/ppp/pppdata.h
@@ -66,2 +66,4 @@ class Config;
 // general
+#define ACCOUNT_LIST       "AccountList"
+#define DEVICE_LIST        "DeviceList"
 #define DEFAULTACCOUNT_KEY "DefaultAccount"
@@ -74,3 +76,4 @@ class Config;
 #define QUITONDISCONNECT_KEY "QuitOnDisconnect"
-#define NUMACCOUNTS_KEY    "NumberOfAccounts"
+#define NUMACCOUNTS_KEY    "HighcountAccounts"
+#define NUMDEVICES_KEY    "HighcountDevices"
         #define ID_KEY     "ID"
@@ -78,2 +81,3 @@ class Config;
 // modem
+#define MODEMNAME_KEY      "Modem_Name"
 #define MODEMDEV_KEY       "Device"
@@ -153,2 +157,6 @@ class Config;
 
+#define DEVICESNAMES_LIST  "DevicesNames_List"
+#define DEVICES_LIST       "Devices_List"
+#define DEVICES_LIST_SEP   ','
+
 class PPPData {
@@ -164,2 +172,4 @@ public:
 
+    QStringList getAccountList();
+
     static QMap<QString,QString> getConfiguredInterfaces();
@@ -186,3 +196,3 @@ public:
 
-  int currentAccountID() { return caccount; };
+//  int currentAccountID() { return caccount; };
   const QString defaultAccount();
@@ -238,4 +248,8 @@ public:
 
-  const QString modemDevice();
-  bool setModemDevice(const QString &);
+//  const QString modemName();
+//  bool setModemName(const QString &);
+//  bool changeModemName(const QString &);
+
+   const QString modemDevice();
+   bool setModemDevice(const QString &);
 
@@ -315,5 +329,6 @@ public:
   bool setAccount(const QString &);
-  bool setAccountbyIndex(int);
+//  bool setAccountbyIndex(int);
 
   bool isUniqueAccname(const QString &);
+  bool isUniqueDevname(const QString &);
 
@@ -322,3 +337,3 @@ public:
   int newaccount();
-  int copyaccount(int i);
+  int copyaccount(const QString&);
 
@@ -411,2 +426,3 @@ public:
 
+  QStringList getDevicesList();
 
@@ -414,2 +430,11 @@ public:
 
+  const QString devname();
+  void setDevname(const QString &);
+  bool setDevice(const QString& );
+  bool deleteDevice();
+  bool deleteDevice(const QString &);
+  int newdevice();
+  int copydevice(const QString&);
+  QStringList getDevicesNamesList();
+
 private:
@@ -417,7 +442,8 @@ private:
     //static PPPData *_data;
-    int modemDeviceGroup;
+//    int modemDeviceGroup;
     QString passwd;
-    //  static Config* config;                       // configuration object
+    QString _modemName;
     int highcount;                         // index of highest account
-    int caccount;                          // index of the current account
+    int highcountdev;                      // index of highest device
+//    int caccount;                          // index of the current account
     QString cgroup;                        // name of current config group
@@ -429,3 +455,6 @@ private:
 
+
     QStringList phonelist;
+    QStringList accountList;
+    QStringList deviceList;
     QMap<QString,QString> stringEntries;