From 47c8a359c5276062c4bc17f0e82410f29081b502 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:48:06 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1157648 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kppp/pppdata.cpp | 296 +++++++++++++++++++++++++++---------------------------- 1 file changed, 148 insertions(+), 148 deletions(-) (limited to 'kppp/pppdata.cpp') diff --git a/kppp/pppdata.cpp b/kppp/pppdata.cpp index 56b2c580..2c43d7f7 100644 --- a/kppp/pppdata.cpp +++ b/kppp/pppdata.cpp @@ -96,8 +96,8 @@ bool PPPData::open() { { config->setGroup("Modem"); - QMap map = config->entryMap("Modem"); - QMap ::ConstIterator it = map.begin(); + TQMap map = config->entryMap("Modem"); + TQMap ::ConstIterator it = map.begin(); newmodem(); @@ -107,7 +107,7 @@ bool PPPData::open() { it++; } - QString newname("Modem0"); + TQString newname("Modem0"); setModname(newname); } @@ -163,8 +163,8 @@ int PPPData::access() const { // functions to read/write date to configuration file -QString PPPData::readConfig(const QString &group, const QString &key, - const QString &defvalue = "") +TQString PPPData::readConfig(const TQString &group, const TQString &key, + const TQString &defvalue = "") { if (config) { config->setGroup(group); @@ -174,7 +174,7 @@ QString PPPData::readConfig(const QString &group, const QString &key, } -int PPPData::readNumConfig(const QString &group, const QString &key, +int PPPData::readNumConfig(const TQString &group, const TQString &key, int defvalue) { if (config) { config->setGroup(group); @@ -185,8 +185,8 @@ int PPPData::readNumConfig(const QString &group, const QString &key, } -bool PPPData::readListConfig(const QString &group, const QString &key, - QStringList &list, char sep) { +bool PPPData::readListConfig(const TQString &group, const TQString &key, + TQStringList &list, char sep) { list.clear(); if (config) { config->setGroup(group); @@ -197,8 +197,8 @@ bool PPPData::readListConfig(const QString &group, const QString &key, } -void PPPData::writeConfig(const QString &group, const QString &key, - const QString &value) { +void PPPData::writeConfig(const TQString &group, const TQString &key, + const TQString &value) { if (config) { config->setGroup(group); config->writeEntry(key, value); @@ -206,7 +206,7 @@ void PPPData::writeConfig(const QString &group, const QString &key, } -void PPPData::writeConfig(const QString &group, const QString &key, int value) { +void PPPData::writeConfig(const TQString &group, const TQString &key, int value) { if (config) { config->setGroup(group); config->writeEntry(key, value); @@ -214,8 +214,8 @@ void PPPData::writeConfig(const QString &group, const QString &key, int value) { } -void PPPData::writeListConfig(const QString &group, const QString &key, - QStringList &list, char sep) { +void PPPData::writeListConfig(const TQString &group, const TQString &key, + TQStringList &list, char sep) { if (config) { config->setGroup(group); config->writeEntry(key, list, sep); @@ -226,22 +226,22 @@ void PPPData::writeListConfig(const QString &group, const QString &key, // // functions to set/return general information // -QString PPPData::password() const { +TQString PPPData::password() const { return passwd; } -void PPPData::setPassword(const QString &pw) { +void PPPData::setPassword(const TQString &pw) { passwd = pw; } -const QString PPPData::defaultAccount() { +const TQString PPPData::defaultAccount() { return readConfig(GENERAL_GRP, DEFAULTACCOUNT_KEY); } -void PPPData::setDefaultAccount(const QString &n) { +void PPPData::setDefaultAccount(const TQString &n) { writeConfig(GENERAL_GRP, DEFAULTACCOUNT_KEY, n); //now set the current account index to the default account @@ -249,12 +249,12 @@ void PPPData::setDefaultAccount(const QString &n) { } -const QString PPPData::defaultModem() { +const TQString PPPData::defaultModem() { return readConfig(GENERAL_GRP, DEFAULTMODEM_KEY); } -void PPPData::setDefaultModem(const QString &n) { +void PPPData::setDefaultModem(const TQString &n) { writeConfig(GENERAL_GRP, DEFAULTMODEM_KEY, n); //now set the current modem index to the default modem @@ -349,8 +349,8 @@ void PPPData::set_dock_into_panel(bool set) { } -QString PPPData::pppdVersion() { - return QString("%1.%2.%3").arg(pppdVer).arg(pppdMod).arg(pppdPatch); +TQString PPPData::pppdVersion() { + return TQString("%1.%2.%3").arg(pppdVer).arg(pppdMod).arg(pppdPatch); } bool PPPData::pppdVersionMin(int ver, int mod, int patch) { @@ -380,7 +380,7 @@ int PPPData::modemCount() const { } -bool PPPData::setModem(const QString &mname) { +bool PPPData::setModem(const TQString &mname) { for(int i = 0; i <= modemhighcount; i++) { setModemByIndex(i); if(modname() == mname) { @@ -402,7 +402,7 @@ bool PPPData::setModemByIndex(int i) { } -bool PPPData::isUniqueModname(const QString &n) { +bool PPPData::isUniqueModname(const TQString &n) { int current = cmodem; for(int i=0; i <= modemhighcount; i++) { setModemByIndex(i); @@ -420,8 +420,8 @@ bool PPPData::deleteModem() { if(cmodem < 0) return false; - QMap map; - QMap ::Iterator it; + TQMap map; + TQMap ::Iterator it; // set all entries of the current modem to "" map = config->entryMap(cmodemgroup); @@ -463,7 +463,7 @@ bool PPPData::deleteModem() { return true; } -bool PPPData::deleteModem(const QString &mname) { +bool PPPData::deleteModem(const TQString &mname) { if(!setModem(mname)) return false; @@ -495,10 +495,10 @@ int PPPData::copymodem(int i) { setModemByIndex(i); - QMap map = config->entryMap(cmodemgroup); - QMap ::ConstIterator it = map.begin(); + TQMap map = config->entryMap(cmodemgroup); + TQMap ::ConstIterator it = map.begin(); - QString newname = i18n("%1_copy").arg(modname()); + TQString newname = i18n("%1_copy").arg(modname()); newmodem(); @@ -514,11 +514,11 @@ int PPPData::copymodem(int i) { } -const QString PPPData::modname() { +const TQString PPPData::modname() { return readConfig(cmodemgroup, MOD_NAME_KEY); } -void PPPData::setModname(const QString &n) { +void PPPData::setModname(const TQString &n) { if(!cmodemgroup.isNull()) { // are we manipulating the default modem's name ? then change it, too. bool def = modname() == defaultModem(); @@ -531,29 +531,29 @@ void PPPData::setModname(const QString &n) { -const QString PPPData::modemDevice() { +const TQString PPPData::modemDevice() { return readConfig (cmodemgroup, MODEMDEV_KEY, devices[DEV_DEFAULT]); } -void PPPData::setModemDevice(const QString &n) { +void PPPData::setModemDevice(const TQString &n) { writeConfig(cmodemgroup, MODEMDEV_KEY, n); } -QString PPPData::flowcontrol() { +TQString PPPData::flowcontrol() { // keep default value in sync with general.cpp return readConfig(cmodemgroup, FLOWCONTROL_KEY, i18n("Hardware [CRTSCTS]")); } -void PPPData::setFlowcontrol(const QString &n) { +void PPPData::setFlowcontrol(const TQString &n) { writeConfig(cmodemgroup, FLOWCONTROL_KEY, n); } -const QString PPPData::speed() { - QString s = readConfig(cmodemgroup, SPEED_KEY, "57600"); +const TQString PPPData::speed() { + TQString s = readConfig(cmodemgroup, SPEED_KEY, "57600"); // undo the damage of a bug in former versions. It left an empty Speed= // entry in kppprc. kppp did set the serial port to 57600 as default but // pppd wouldn't receive the speed via the command line. @@ -563,7 +563,7 @@ const QString PPPData::speed() { } -void PPPData::setSpeed(const QString &n) { +void PPPData::setSpeed(const TQString &n) { writeConfig(cmodemgroup, SPEED_KEY, n); } @@ -579,22 +579,22 @@ int PPPData::UseCDLine() { } #endif -const QString PPPData::modemEscapeStr() { +const TQString PPPData::modemEscapeStr() { return readConfig(cmodemgroup,ESCAPESTR_KEY,"+++"); } -void PPPData::setModemEscapeStr(const QString &n) { +void PPPData::setModemEscapeStr(const TQString &n) { writeConfig(cmodemgroup,ESCAPESTR_KEY,n); } -const QString PPPData::modemEscapeResp() { +const TQString PPPData::modemEscapeResp() { return readConfig(cmodemgroup,ESCAPERESP_KEY,"OK"); } -void PPPData::setModemEscapeResp(const QString &n) { +void PPPData::setModemEscapeResp(const TQString &n) { writeConfig(cmodemgroup,ESCAPERESP_KEY,n); } @@ -653,28 +653,28 @@ void PPPData::setbusyWait(int n) { //Advanced "Modem" dialog // // defaults: InitString=ATZ, InitString1="" etc. -const QString PPPData::modemInitStr(int i) { +const TQString PPPData::modemInitStr(int i) { assert(i >= 0 && i < NumInitStrings); if(i == 0) return readConfig(cmodemgroup, INITSTR_KEY, "ATZ"); else - return readConfig(cmodemgroup, INITSTR_KEY + QString::number(i), ""); + return readConfig(cmodemgroup, INITSTR_KEY + TQString::number(i), ""); } -void PPPData::setModemInitStr(int i, const QString &n) { +void PPPData::setModemInitStr(int i, const TQString &n) { assert(i >= 0 && i < NumInitStrings); - QString k = INITSTR_KEY + (i > 0 ? QString::number(i) : ""); + TQString k = INITSTR_KEY + (i > 0 ? TQString::number(i) : ""); writeConfig(cmodemgroup, k, n); } -const QString PPPData::modemInitResp() { +const TQString PPPData::modemInitResp() { return readConfig(cmodemgroup, INITRESP_KEY, "OK"); } -void PPPData::setModemInitResp(const QString &n) { +void PPPData::setModemInitResp(const TQString &n) { writeConfig(cmodemgroup, INITRESP_KEY, n); } @@ -698,133 +698,133 @@ void PPPData::setModemInitDelay(int n) { writeConfig(cmodemgroup, INITDELAY_KEY, n); } -QString PPPData::modemNoDialToneDetectionStr() { +TQString PPPData::modemNoDialToneDetectionStr() { return readConfig(cmodemgroup, NODTDETECT_KEY, "ATX3"); } -void PPPData::setModemNoDialToneDetectionStr(const QString &n) { +void PPPData::setModemNoDialToneDetectionStr(const TQString &n) { writeConfig(cmodemgroup, NODTDETECT_KEY, n); } -const QString PPPData::modemDialStr() { +const TQString PPPData::modemDialStr() { return readConfig(cmodemgroup, DIALSTR_KEY, "ATDT"); } -void PPPData::setModemDialStr(const QString &n) { +void PPPData::setModemDialStr(const TQString &n) { writeConfig(cmodemgroup, DIALSTR_KEY, n); } -const QString PPPData::modemConnectResp() { +const TQString PPPData::modemConnectResp() { return readConfig(cmodemgroup, CONNECTRESP_KEY, "CONNECT"); } -void PPPData::setModemConnectResp(const QString &n) { +void PPPData::setModemConnectResp(const TQString &n) { writeConfig(cmodemgroup, CONNECTRESP_KEY, n); } -const QString PPPData::modemBusyResp() { +const TQString PPPData::modemBusyResp() { return readConfig(cmodemgroup, BUSYRESP_KEY, "BUSY"); } -void PPPData::setModemBusyResp(const QString &n) { +void PPPData::setModemBusyResp(const TQString &n) { writeConfig(cmodemgroup, BUSYRESP_KEY, n); } -const QString PPPData::modemNoCarrierResp() { +const TQString PPPData::modemNoCarrierResp() { return readConfig(cmodemgroup, NOCARRIERRESP_KEY, "NO CARRIER"); } -void PPPData::setModemNoCarrierResp(const QString &n) { +void PPPData::setModemNoCarrierResp(const TQString &n) { writeConfig(cmodemgroup, NOCARRIERRESP_KEY, n); } -const QString PPPData::modemNoDialtoneResp() { +const TQString PPPData::modemNoDialtoneResp() { return readConfig(cmodemgroup, NODIALTONERESP_KEY, "NO DIALTONE"); } -void PPPData::setModemNoDialtoneResp(const QString &n) { +void PPPData::setModemNoDialtoneResp(const TQString &n) { writeConfig(cmodemgroup, NODIALTONERESP_KEY, n); } -const QString PPPData::modemHangupStr() { +const TQString PPPData::modemHangupStr() { return readConfig(cmodemgroup, HANGUPSTR_KEY, "+++ATH"); } -void PPPData::setModemHangupStr(const QString &n) { +void PPPData::setModemHangupStr(const TQString &n) { writeConfig(cmodemgroup, HANGUPSTR_KEY, n); } -const QString PPPData::modemHangupResp() { +const TQString PPPData::modemHangupResp() { return readConfig(cmodemgroup, HANGUPRESP_KEY, "OK"); } -void PPPData::setModemHangupResp(const QString &n) { +void PPPData::setModemHangupResp(const TQString &n) { writeConfig(cmodemgroup, HANGUPRESP_KEY, n); } -QString PPPData::modemDLPResp() { +TQString PPPData::modemDLPResp() { return readConfig(cmodemgroup, DLPRESP_KEY, "DIGITAL LINE DETECTED"); } -void PPPData::setModemDLPResp(const QString &n) { +void PPPData::setModemDLPResp(const TQString &n) { writeConfig(cmodemgroup, DLPRESP_KEY, n); } -const QString PPPData::modemAnswerStr() { +const TQString PPPData::modemAnswerStr() { return readConfig(cmodemgroup, ANSWERSTR_KEY, "ATA"); } -QString PPPData::volumeOff() { +TQString PPPData::volumeOff() { return readConfig(cmodemgroup, VOLUME_OFF, "M0L0"); } -void PPPData::setVolumeOff(const QString &s) { +void PPPData::setVolumeOff(const TQString &s) { writeConfig(cmodemgroup, VOLUME_OFF, s); } -QString PPPData::volumeMedium() { +TQString PPPData::volumeMedium() { return readConfig(cmodemgroup, VOLUME_MEDIUM, "M1L1"); } -void PPPData::setVolumeMedium(const QString &s) { +void PPPData::setVolumeMedium(const TQString &s) { writeConfig(cmodemgroup, VOLUME_MEDIUM, s); } -QString PPPData::volumeHigh() { - QString tmp = readConfig(cmodemgroup, VOLUME_HIGH, "M1L3"); +TQString PPPData::volumeHigh() { + TQString tmp = readConfig(cmodemgroup, VOLUME_HIGH, "M1L3"); if(tmp == "M1L4") tmp = "M1L3"; return tmp; } -void PPPData::setVolumeHigh(const QString &s) { +void PPPData::setVolumeHigh(const TQString &s) { writeConfig(cmodemgroup, VOLUME_HIGH, s); } -QString PPPData::volumeInitString() { - QString s; +TQString PPPData::volumeInitString() { + TQString s; switch(volume()) { case 0: @@ -861,37 +861,37 @@ void PPPData::setWaitForDialTone(int i) { writeConfig(cmodemgroup, DIALTONEWAIT_KEY, i); } -void PPPData::setModemAnswerStr(const QString &n) { +void PPPData::setModemAnswerStr(const TQString &n) { writeConfig(cmodemgroup, ANSWERSTR_KEY, n); } -const QString PPPData::modemRingResp() { +const TQString PPPData::modemRingResp() { return readConfig(cmodemgroup, RINGRESP_KEY, "RING"); } -void PPPData::setModemRingResp(const QString &n) { +void PPPData::setModemRingResp(const TQString &n) { writeConfig(cmodemgroup, RINGRESP_KEY, n); } -const QString PPPData::modemAnswerResp() { +const TQString PPPData::modemAnswerResp() { return readConfig(cmodemgroup, ANSWERRESP_KEY, "CONNECT"); } -void PPPData::setModemAnswerResp(const QString &n) { +void PPPData::setModemAnswerResp(const TQString &n) { writeConfig(cmodemgroup, ANSWERRESP_KEY, n); } -const QString PPPData::enter() { +const TQString PPPData::enter() { return readConfig(cmodemgroup, ENTER_KEY, "CR"); } -void PPPData::setEnter(const QString &n) { +void PPPData::setEnter(const TQString &n) { writeConfig(cmodemgroup, ENTER_KEY, n); } @@ -906,7 +906,7 @@ int PPPData::accountCount() const { } -bool PPPData::setAccount(const QString &aname) { +bool PPPData::setAccount(const TQString &aname) { for(int i = 0; i <= accounthighcount; i++) { setAccountByIndex(i); if(accname() == aname) { @@ -928,7 +928,7 @@ bool PPPData::setAccountByIndex(int i) { } -bool PPPData::isUniqueAccname(const QString &n) { +bool PPPData::isUniqueAccname(const TQString &n) { if(n.contains(':')) return false; int current = caccount; @@ -948,8 +948,8 @@ bool PPPData::deleteAccount() { if(caccount < 0) return false; - QMap map; - QMap ::Iterator it; + TQMap map; + TQMap ::Iterator it; // set all entries of the current account to "" map = config->entryMap(caccountgroup); @@ -991,7 +991,7 @@ bool PPPData::deleteAccount() { return true; } -bool PPPData::deleteAccount(const QString &aname) { +bool PPPData::deleteAccount(const TQString &aname) { if(!setAccount(aname)) return false; @@ -1023,10 +1023,10 @@ int PPPData::copyaccount(int i) { setAccountByIndex(i); - QMap map = config->entryMap(caccountgroup); - QMap ::ConstIterator it = map.begin(); + TQMap map = config->entryMap(caccountgroup); + TQMap ::ConstIterator it = map.begin(); - QString newname = i18n("%1_copy").arg(accname()); + TQString newname = i18n("%1_copy").arg(accname()); newaccount(); @@ -1042,11 +1042,11 @@ int PPPData::copyaccount(int i) { } -const QString PPPData::accname() { +const TQString PPPData::accname() { return readConfig(caccountgroup, ACC_NAME_KEY); } -void PPPData::setAccname(const QString &n) { +void PPPData::setAccname(const TQString &n) { if(!caccountgroup.isNull()) { // are we manipulating the default account's name ? then change it, too. bool def = accname() == defaultAccount(); @@ -1058,7 +1058,7 @@ void PPPData::setAccname(const QString &n) { #define SEPARATOR_CHAR ':' -QStringList &PPPData::phonenumbers() { +TQStringList &PPPData::phonenumbers() { readListConfig(caccountgroup, PHONENUMBER_KEY, phonelist, SEPARATOR_CHAR); return phonelist; @@ -1066,22 +1066,22 @@ QStringList &PPPData::phonenumbers() { } -const QString PPPData::phonenumber() { +const TQString PPPData::phonenumber() { return readConfig(caccountgroup, PHONENUMBER_KEY); } -void PPPData::setPhonenumber(const QString &n) { +void PPPData::setPhonenumber(const TQString &n) { writeConfig(caccountgroup, PHONENUMBER_KEY, n); } -const QString PPPData::dialPrefix() { +const TQString PPPData::dialPrefix() { return readConfig(caccountgroup, DIAL_PREFIX_KEY, ""); } -void PPPData::setDialPrefix(const QString &s) { +void PPPData::setDialPrefix(const TQString &s) { writeConfig(caccountgroup, DIAL_PREFIX_KEY, s); } @@ -1096,22 +1096,22 @@ void PPPData::setAuthMethod(int value) { } -const QString PPPData::storedUsername() { +const TQString PPPData::storedUsername() { return readConfig(caccountgroup, STORED_USERNAME_KEY, ""); } -void PPPData::setStoredUsername(const QString &b) { +void PPPData::setStoredUsername(const TQString &b) { writeConfig(caccountgroup, STORED_USERNAME_KEY, b); } -const QString PPPData::storedPassword() { +const TQString PPPData::storedPassword() { return readConfig(caccountgroup, STORED_PASSWORD_KEY, ""); } -void PPPData::setStoredPassword(const QString &b) { +void PPPData::setStoredPassword(const TQString &b) { writeConfig(caccountgroup, STORED_PASSWORD_KEY, b); } @@ -1128,11 +1128,11 @@ void PPPData::setCallbackType(int value) { writeConfig(caccountgroup, CALLBACK_TYPE_KEY, value); } -QString PPPData::callbackPhone() { +TQString PPPData::callbackPhone() { return readConfig(caccountgroup, CALLBACK_PHONE_KEY, ""); } -void PPPData::setCallbackPhone(const QString &b) { +void PPPData::setCallbackPhone(const TQString &b) { writeConfig(caccountgroup, CALLBACK_PHONE_KEY, b); } @@ -1144,12 +1144,12 @@ void PPPData::setWaitCallback(bool value) { waitcallback = value; } -const QString PPPData::command_before_connect() { +const TQString PPPData::command_before_connect() { return readConfig(caccountgroup, BEFORE_CONNECT_KEY); } -void PPPData::setCommand_before_connect(const QString &n) { +void PPPData::setCommand_before_connect(const TQString &n) { writeConfig(caccountgroup, BEFORE_CONNECT_KEY, n); } @@ -1159,52 +1159,52 @@ void PPPData::setStorePassword(bool b) { } -const QString PPPData::command_on_connect() { +const TQString PPPData::command_on_connect() { return readConfig(caccountgroup, COMMAND_KEY); } -void PPPData::setCommand_on_connect(const QString &n) { +void PPPData::setCommand_on_connect(const TQString &n) { writeConfig(caccountgroup, COMMAND_KEY, n); } -const QString PPPData::command_on_disconnect() { +const TQString PPPData::command_on_disconnect() { return readConfig(caccountgroup, DISCONNECT_COMMAND_KEY); } -void PPPData::setCommand_on_disconnect(const QString &n) { +void PPPData::setCommand_on_disconnect(const TQString &n) { writeConfig(caccountgroup, DISCONNECT_COMMAND_KEY, n); } -const QString PPPData::command_before_disconnect() { +const TQString PPPData::command_before_disconnect() { return readConfig(caccountgroup, BEFORE_DISCONNECT_KEY); } -void PPPData::setCommand_before_disconnect(const QString &n) { +void PPPData::setCommand_before_disconnect(const TQString &n) { writeConfig(caccountgroup, BEFORE_DISCONNECT_KEY, n); } -const QString PPPData::ipaddr() { +const TQString PPPData::ipaddr() { return readConfig(caccountgroup, IPADDR_KEY); } -void PPPData::setIpaddr(const QString &n) { +void PPPData::setIpaddr(const TQString &n) { writeConfig(caccountgroup, IPADDR_KEY, n); } -const QString PPPData::subnetmask() { +const TQString PPPData::subnetmask() { return readConfig(caccountgroup, SUBNETMASK_KEY); } -void PPPData::setSubnetmask(const QString &n) { +void PPPData::setSubnetmask(const TQString &n) { writeConfig(caccountgroup, SUBNETMASK_KEY, n); } @@ -1239,12 +1239,12 @@ void PPPData::setVolAcctEnabled(int set) { } -const QString PPPData::gateway() { +const TQString PPPData::gateway() { return readConfig(caccountgroup, GATEWAY_KEY); } -void PPPData::setGateway(const QString &n ) { +void PPPData::setGateway(const TQString &n ) { writeConfig(caccountgroup, GATEWAY_KEY, n); } @@ -1281,8 +1281,8 @@ bool PPPData::exDNSDisabled() { } -QStringList &PPPData::dns() { - static QStringList dnslist; +TQStringList &PPPData::dns() { + static TQStringList dnslist; readListConfig(caccountgroup, DNS_KEY, dnslist); while(dnslist.count() > MAX_DNS_ENTRIES) @@ -1292,23 +1292,23 @@ QStringList &PPPData::dns() { } -void PPPData::setDns(QStringList &list) { +void PPPData::setDns(TQStringList &list) { writeListConfig(caccountgroup, DNS_KEY, list); } -const QString PPPData::domain() { +const TQString PPPData::domain() { return readConfig(caccountgroup, DOMAIN_KEY); } -void PPPData::setDomain(const QString &n ) { +void PPPData::setDomain(const TQString &n ) { writeConfig(caccountgroup, DOMAIN_KEY, n); } -QStringList &PPPData::scriptType() { - static QStringList typelist; +TQStringList &PPPData::scriptType() { + static TQStringList typelist; readListConfig(caccountgroup, SCRIPTCOM_KEY, typelist); while(typelist.count() > MAX_SCRIPT_ENTRIES) @@ -1318,13 +1318,13 @@ QStringList &PPPData::scriptType() { } -void PPPData::setScriptType(QStringList &list) { +void PPPData::setScriptType(TQStringList &list) { writeListConfig(caccountgroup, SCRIPTCOM_KEY, list); } -QStringList &PPPData::script() { - static QStringList scriptlist; +TQStringList &PPPData::script() { + static TQStringList scriptlist; readListConfig(caccountgroup, SCRIPTARG_KEY, scriptlist); while(scriptlist.count() > MAX_SCRIPT_ENTRIES) @@ -1334,27 +1334,27 @@ QStringList &PPPData::script() { } -void PPPData::setScript(QStringList &list) { +void PPPData::setScript(TQStringList &list) { writeListConfig(caccountgroup, SCRIPTARG_KEY, list); } -const QString PPPData::accountingFile() { +const TQString PPPData::accountingFile() { return readConfig(caccountgroup, ACCTFILE_KEY); } -void PPPData::setAccountingFile(const QString &n) { +void PPPData::setAccountingFile(const TQString &n) { writeConfig(caccountgroup, ACCTFILE_KEY, n); } -const QString PPPData::totalCosts() { +const TQString PPPData::totalCosts() { return readConfig(caccountgroup, TOTALCOSTS_KEY); } -void PPPData::setTotalCosts(const QString &n) { +void PPPData::setTotalCosts(const TQString &n) { writeConfig(caccountgroup, TOTALCOSTS_KEY, n); } @@ -1368,8 +1368,8 @@ void PPPData::setTotalBytes(int n) { } -QStringList &PPPData::pppdArgument() { - static QStringList arglist; +TQStringList &PPPData::pppdArgument() { + static TQStringList arglist; while(arglist.count() > MAX_PPPD_ARGUMENTS) arglist.remove(arglist.last()); @@ -1379,23 +1379,23 @@ QStringList &PPPData::pppdArgument() { } -void PPPData::setpppdArgument(QStringList &args) { +void PPPData::setpppdArgument(TQStringList &args) { writeListConfig(caccountgroup, PPPDARG_KEY, args); } void PPPData::setpppdArgumentDefaults() { - QStringList arg; + TQStringList arg; setpppdArgument(arg); } // graphing widget void PPPData::setGraphingOptions(bool enable, - QColor bg, - QColor text, - QColor in, - QColor out) + TQColor bg, + TQColor text, + TQColor in, + TQColor out) { if(config) { config->setGroup(GRAPH_GRP); @@ -1408,12 +1408,12 @@ void PPPData::setGraphingOptions(bool enable, } void PPPData::graphingOptions(bool &enable, - QColor &bg, - QColor &text, - QColor &in, - QColor &out) + TQColor &bg, + TQColor &text, + TQColor &in, + TQColor &out) { - QColor c; + TQColor c; if(config) { config->setGroup(GRAPH_GRP); @@ -1464,7 +1464,7 @@ void PPPData::setpppdError(int err) { // window position // void PPPData::winPosConWin(int& p_x, int& p_y) { - QRect desk = KGlobalSettings::splashScreenDesktopGeometry(); + TQRect desk = KGlobalSettings::splashScreenDesktopGeometry(); p_x = readNumConfig(WINPOS_GRP, WINPOS_CONWIN_X, desk.center().x()-160); p_y = readNumConfig(WINPOS_GRP, WINPOS_CONWIN_Y, desk.center().y()-55); } @@ -1475,7 +1475,7 @@ void PPPData::setWinPosConWin(int p_x, int p_y) { } void PPPData::winPosStatWin(int& p_x, int& p_y) { - QRect desk = KGlobalSettings::splashScreenDesktopGeometry(); + TQRect desk = KGlobalSettings::splashScreenDesktopGeometry(); p_x = readNumConfig(WINPOS_GRP, WINPOS_STATWIN_X, desk.center().x()-160); p_y = readNumConfig(WINPOS_GRP, WINPOS_STATWIN_Y, desk.center().y()-55); } -- cgit v1.2.1