Diffstat (limited to 'noncore/settings/networksettings/ppp/pppdata.h') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/settings/networksettings/ppp/pppdata.h | 56 |
1 files changed, 29 insertions, 27 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 | |||
@@ -54,13 +54,13 @@ class Config; | |||
54 | // keys for config file | 54 | // keys for config file |
55 | // | 55 | // |
56 | 56 | ||
57 | // groups | 57 | // groups |
58 | #define GENERAL_GRP "General" | 58 | #define GENERAL_GRP "PPP_General" |
59 | #define MODEM_GRP "Modem" | 59 | #define MODEM_GRP "PPP_Modem" |
60 | #define ACCOUNT_GRP "Account" | 60 | #define ACCOUNT_GRP "PPP_Account" |
61 | #define GRAPH_GRP "Graph" | 61 | //#define GRAPH_GRP "Graph" |
62 | #define WINPOS_GRP "WindowPosition" | 62 | //#define WINPOS_GRP "WindowPosition" |
63 | 63 | ||
64 | // general | 64 | // general |
65 | #define DEFAULTACCOUNT_KEY "DefaultAccount" | 65 | #define DEFAULTACCOUNT_KEY "DefaultAccount" |
66 | #define PPPDVERSION_KEY "pppdVersion" | 66 | #define PPPDVERSION_KEY "pppdVersion" |
@@ -160,16 +160,17 @@ class Config; | |||
160 | class PPPData { | 160 | class PPPData { |
161 | public: | 161 | public: |
162 | PPPData(); | 162 | PPPData(); |
163 | ~PPPData() {}; | 163 | ~PPPData() {}; |
164 | static PPPData* data(); | ||
164 | 165 | ||
165 | enum { NumInitStrings = 2 }; | 166 | enum { NumInitStrings = 2 }; |
166 | 167 | ||
167 | // general functions | 168 | // general functions |
168 | bool open(); | 169 | bool open(); |
169 | void save(); | 170 | void save(); |
170 | void cancel(); | 171 | void cancel(); |
171 | int access() const; // read/write access | 172 | // int access() const; // read/write access |
172 | 173 | ||
173 | // function to read/write date to configuration file | 174 | // function to read/write date to configuration file |
174 | QString readConfig(const QString &, const QString &, const QString &); | 175 | QString readConfig(const QString &, const QString &, const QString &); |
175 | int readNumConfig(const QString &, const QString &, int); | 176 | int readNumConfig(const QString &, const QString &, int); |
@@ -425,30 +426,33 @@ public: | |||
425 | 426 | ||
426 | int totalBytes(); | 427 | int totalBytes(); |
427 | void setTotalBytes(int); | 428 | void setTotalBytes(int); |
428 | 429 | ||
429 | // graphing widget | 430 | // // graphing widget |
430 | void setGraphingOptions(bool enabled, | 431 | // void setGraphingOptions(bool enabled, |
431 | QColor bg, | 432 | // QColor bg, |
432 | QColor text, | 433 | // QColor text, |
433 | QColor in, | 434 | // QColor in, |
434 | QColor out); | 435 | // QColor out); |
435 | void graphingOptions(bool &enabled, | 436 | // void graphingOptions(bool &enabled, |
436 | QColor &bg, | 437 | // QColor &bg, |
437 | QColor &text, | 438 | // QColor &text, |
438 | QColor &in, | 439 | // QColor &in, |
439 | QColor &out); | 440 | // QColor &out); |
440 | bool graphingEnabled(); | 441 | // bool graphingEnabled(); |
441 | 442 | ||
442 | // window positions | 443 | // // window positions |
443 | void winPosConWin(int &, int &); | 444 | // void winPosConWin(int &, int &); |
444 | void setWinPosConWin(int, int); | 445 | // void setWinPosConWin(int, int); |
445 | void winPosStatWin(int &, int &); | 446 | // void winPosStatWin(int &, int &); |
446 | void setWinPosStatWin(int, int); | 447 | // void setWinPosStatWin(int, int); |
447 | 448 | ||
448 | private: | 449 | private: |
450 | |||
451 | static PPPData *_data; | ||
452 | |||
449 | QString passwd; | 453 | QString passwd; |
450 | Config* config; // configuration object | 454 | static Config* config; // configuration object |
451 | int highcount; // index of highest account | 455 | int highcount; // index of highest account |
452 | int caccount; // index of the current account | 456 | int caccount; // index of the current account |
453 | QString cgroup; // name of current config group | 457 | QString cgroup; // name of current config group |
454 | pid_t suidprocessid; // process ID of setuid child | 458 | pid_t suidprocessid; // process ID of setuid child |
@@ -459,7 +463,5 @@ private: | |||
459 | 463 | ||
460 | QStringList phonelist; | 464 | QStringList phonelist; |
461 | }; | 465 | }; |
462 | 466 | ||
463 | extern PPPData gpppdata; | ||
464 | |||
465 | #endif | 467 | #endif |