1 files changed, 16 insertions, 46 deletions

diff --git a/noncore/settings/networksettings/ppp/pppdata.h b/noncore/settings/networksettings/ppp/pppdata.h
index c1c7e69..af960c6 100644
--- a/noncore/settings/networksettings/ppp/pppdata.h
+++ b/noncore/settings/networksettings/ppp/pppdata.h
@@ -156,17 +156,16 @@ public:
     PPPData();
     ~PPPData() {};
-    static PPPData* data();
 
     enum { NumInitStrings = 2 };
 
     // general functions
-    bool open();
     void save();
     void cancel();
 
-    QMap<QString,QString> getConfiguredInterfaces();
-    void setConfiguredInterfaces( QMap<QString,QString> );
+    static QMap<QString,QString> getConfiguredInterfaces();
+    static void setConfiguredInterfaces( QMap<QString,QString> );
 
     // function to read/write date to configuration file
+    static Config config();
     QString readConfig(const QString &, const QString &, const QString &);
     int readNumConfig(const QString &, const QString &, int);
@@ -208,9 +207,9 @@ public:
   bool automatic_redial();
 
-  void set_iconify_on_connect(bool set);
-  bool get_iconify_on_connect();
+//   void set_iconify_on_connect(bool set);
+//   bool get_iconify_on_connect();
 
-  void set_dock_into_panel(bool set);
-  bool get_dock_into_panel();
+//   void set_dock_into_panel(bool set);
+//   bool get_dock_into_panel();
 
   const QString enter();
@@ -312,9 +311,4 @@ public:
   void setVolumeHigh(const QString &);
 
-#if 0
-  void setUseCDLine(const int n);
-  int  UseCDLine();
-#endif
-
   // functions to set/get account information
   int count() const;
@@ -375,6 +369,6 @@ public:
   void setAcctEnabled(bool set);
 
-  int VolAcctEnabled();
-  void setVolAcctEnabled(int set);
+//   int VolAcctEnabled();
+//   void setVolAcctEnabled(int set);
 
   bool autoDNS();
@@ -416,39 +410,10 @@ public:
   void setpppdError(int err);
 
-  // functions to set/query the accounting info
-//   const QString accountingFile();
-//   void setAccountingFile(const QString &);
-
-//   const QString totalCosts();
-//   void setTotalCosts(const QString &);
-
-//   int totalBytes();
-//   void  setTotalBytes(int);
-
-//   // graphing widget
-//   void setGraphingOptions(bool enabled,
-        //                QColor bg,
-        //                QColor text,
-        //                QColor in,
-        //                QColor out);
-//   void graphingOptions(bool &enabled,
-        //             QColor &bg,
-        //             QColor &text,
-        //             QColor &in,
-        //             QColor &out);
-//   bool graphingEnabled();
-
-//   // window positions
-//   void winPosConWin(int &, int &);
-//   void setWinPosConWin(int, int);
-//   void winPosStatWin(int &, int &);
-//   void setWinPosStatWin(int, int);
-
 private:
 
-    static PPPData *_data;
+    //static PPPData *_data;
     int modemDeviceGroup;
     QString passwd;
-    static Config* config;                       // configuration object
+    //  static Config* config;                       // configuration object
     int highcount;                         // index of highest account
     int caccount;                          // index of the current account
@@ -461,4 +426,9 @@ private:
 
     QStringList phonelist;
+    QMap<QString,QString> stringEntries;
+    QMap<QString,int> intEntries;
+    QMap<QString,QStringList> listEntries;
+    QMap<QString,QChar> sepEntries;
+
 };