Diffstat (limited to 'noncore/settings/networksettings/ppp/pppdata.h') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/networksettings/ppp/pppdata.h | 62 |
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 @@ -146,37 +146,36 @@ class Config; #define E_IF_TIMEOUT 1 #define E_PPPD_DIED 2 // account list #define ACCOUNTS_COUNT "Accounts_Count" #define ACOUNTS_DEV "Accounts_Modem" #define ACOUNTS_ACC "Accounts_Account" class PPPData { 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); bool readListConfig(const QString &, const QString &, QStringList &, char sep = ','); void writeConfig(const QString &, const QString &, const QString &); void writeConfig(const QString &, const QString &, int); void writeListConfig(const QString &, const QString &, QStringList &, char sep = ','); // return the current account group QString currentGroup() { return cgroup; } QString modemGroup(); @@ -198,29 +197,29 @@ public: void set_quit_on_disconnect(bool); bool quit_on_disconnect(); void set_show_clock_on_caption(bool set); bool get_show_clock_on_caption(); void set_show_log_window(bool set); bool get_show_log_window(); void set_automatic_redial(bool set); 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(); void setEnter(const QString &); QString pppdVersion(); bool pppdVersionMin(int ver, int mod, int patch); int pppdTimeout(); void setpppdTimeout(int); int busyWait(); void setbusyWait(int); @@ -302,29 +301,24 @@ public: const QString modemAnswerResp(); void setModemAnswerResp(const QString &); QString volumeOff(); void setVolumeOff(const QString &); QString volumeMedium(); void setVolumeMedium(const QString &); QString volumeHigh(); void setVolumeHigh(const QString &); -#if 0 - void setUseCDLine(const int n); - int UseCDLine(); -#endif - // functions to set/get account information int count() const; bool setAccount(const QString &); bool setAccountbyIndex(int); bool isUniqueAccname(const QString &); bool deleteAccount(); bool deleteAccount(const QString &); int newaccount(); int copyaccount(int i); @@ -365,26 +359,26 @@ public: const QString command_before_disconnect(); void setCommand_before_disconnect(const QString &); const QString ipaddr(); void setIpaddr(const QString &); const QString subnetmask(); void setSubnetmask(const QString &); bool AcctEnabled(); void setAcctEnabled(bool set); - int VolAcctEnabled(); - void setVolAcctEnabled(int set); +// int VolAcctEnabled(); +// void setVolAcctEnabled(int set); bool autoDNS(); void setAutoDNS(bool set); bool exDNSDisabled(); void setExDNSDisabled(bool set); bool autoname(); void setAutoname(bool set); const QString gateway(); void setGateway(const QString &); @@ -406,60 +400,36 @@ public: QStringList &pppdArgument(); void setpppdArgumentDefaults(); void setpppdArgument(QStringList &); //functions to change/set the child pppd process info bool pppdRunning() const; void setpppdRunning(bool set); int pppdError() const; 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 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; + QMap<QString,QString> stringEntries; + QMap<QString,int> intEntries; + QMap<QString,QStringList> listEntries; + QMap<QString,QChar> sepEntries; + }; #endif |