1 files changed, 40 insertions, 38 deletions

diff --git a/noncore/settings/networksettings/ppp/pppdata.h b/noncore/settings/networksettings/ppp/pppdata.h
index e286b70..57ce2fd 100644
--- a/noncore/settings/networksettings/ppp/pppdata.h
+++ b/noncore/settings/networksettings/ppp/pppdata.h
@@ -56,9 +56,9 @@ class Config;
 
 // groups
-#define GENERAL_GRP        "General"
-#define MODEM_GRP          "Modem"
-#define ACCOUNT_GRP        "Account"
-#define GRAPH_GRP          "Graph"
-#define WINPOS_GRP         "WindowPosition"
+#define GENERAL_GRP        "PPP_General"
+#define MODEM_GRP          "PPP_Modem"
+#define ACCOUNT_GRP        "PPP_Account"
+//#define GRAPH_GRP          "Graph"
+//#define WINPOS_GRP         "WindowPosition"
 
 // general
@@ -162,4 +162,5 @@ public:
   PPPData();
   ~PPPData() {};
+    static PPPData* data();
 
   enum { NumInitStrings = 2 };
@@ -169,5 +170,5 @@ public:
   void save();
   void cancel();
-  int  access() const;       // read/write access
+//  int  access() const;       // read/write access
 
   // function to read/write date to configuration file
@@ -427,39 +428,40 @@ public:
   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);
+//   // 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:
-  QString passwd;
-  Config* config;                       // configuration object
-  int highcount;                         // index of highest account
-  int caccount;                          // index of the current account
-  QString cgroup;                        // name of current config group
-  pid_t suidprocessid;                   // process ID of setuid child
-  bool pppdisrunning;                    // pppd process
-                                         // daemon
-  int pppderror;                         // error encounterd running pppd
-  int pppdVer, pppdMod, pppdPatch;       // pppd version
-
-  QStringList phonelist;
-};
 
-extern PPPData gpppdata;
+    static PPPData *_data;
+
+    QString passwd;
+    static Config* config;                       // configuration object
+    int highcount;                         // index of highest account
+    int caccount;                          // index of the current account
+    QString cgroup;                        // name of current config group
+    pid_t suidprocessid;                   // process ID of setuid child
+    bool pppdisrunning;                    // pppd process
+    // daemon
+    int pppderror;                         // error encounterd running pppd
+    int pppdVer, pppdMod, pppdPatch;       // pppd version
+
+    QStringList phonelist;
+};
 
 #endif