summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/networksettings/ppp/accounts.cpp110
-rw-r--r--noncore/settings/networksettings/ppp/connect.cpp180
-rw-r--r--noncore/settings/networksettings/ppp/conwindow.cpp26
-rw-r--r--noncore/settings/networksettings/ppp/debug.cpp2
-rw-r--r--noncore/settings/networksettings/ppp/edit.cpp242
-rw-r--r--noncore/settings/networksettings/ppp/general.cpp42
-rw-r--r--noncore/settings/networksettings/ppp/kpppwidget.cpp150
-rw-r--r--noncore/settings/networksettings/ppp/modem.cpp30
-rw-r--r--noncore/settings/networksettings/ppp/modemcmds.cpp111
-rw-r--r--noncore/settings/networksettings/ppp/newwidget.cpp17
-rw-r--r--noncore/settings/networksettings/ppp/newwidget.h19
-rw-r--r--noncore/settings/networksettings/ppp/ppp.pro4
-rw-r--r--noncore/settings/networksettings/ppp/pppconfig.cpp4
-rw-r--r--noncore/settings/networksettings/ppp/pppdargs.cpp10
-rw-r--r--noncore/settings/networksettings/ppp/pppdata.cpp229
-rw-r--r--noncore/settings/networksettings/ppp/pppdata.h78
-rw-r--r--noncore/settings/networksettings/ppp/pppmodule.cpp3
17 files changed, 615 insertions, 642 deletions
diff --git a/noncore/settings/networksettings/ppp/accounts.cpp b/noncore/settings/networksettings/ppp/accounts.cpp
index d902517..19db9ef 100644
--- a/noncore/settings/networksettings/ppp/accounts.cpp
+++ b/noncore/settings/networksettings/ppp/accounts.cpp
@@ -54,5 +54,5 @@ AccountWidget::AccountWidget( QWidget *parent, const char *name )
: QWidget( parent, name )
{
- int min = 0;
+// int min = 0;
QVBoxLayout *l1 = new QVBoxLayout(this, 10, 10);
@@ -62,5 +62,5 @@ AccountWidget::AccountWidget( QWidget *parent, const char *name )
accountlist_l = new QListBox(this);
- accountlist_l->setMinimumSize(160, 128);
+// accountlist_l->setMinimumSize(160, 128);
connect(accountlist_l, SIGNAL(highlighted(int)),
this, SLOT(slotListBoxSelect(int)));
@@ -75,7 +75,7 @@ AccountWidget::AccountWidget( QWidget *parent, const char *name )
QWhatsThis::add(edit_b, i18n("Allows you to modify the selected account"));
- min = edit_b->sizeHint().width();
- min = QMAX(70,min);
- edit_b->setMinimumWidth(min);
+// min = edit_b->sizeHint().width();
+// min = QMAX(70,min);
+// edit_b->setMinimumWidth(min);
l1->addWidget(edit_b);
@@ -166,8 +166,8 @@ AccountWidget::AccountWidget( QWidget *parent, const char *name )
//load up account list from gppdata to the list box
- if(gpppdata.count() > 0) {
- for(int i=0; i <= gpppdata.count()-1; i++) {
- gpppdata.setAccountbyIndex(i);
- accountlist_l->insertItem(gpppdata.accname());
+ if(PPPData::data()->count() > 0) {
+ for(int i=0; i <= PPPData::data()->count()-1; i++) {
+ PPPData::data()->setAccountbyIndex(i);
+ accountlist_l->insertItem(PPPData::data()->accname());
}
}
@@ -185,6 +185,6 @@ void AccountWidget::slotListBoxSelect(int idx) {
copy_b->setEnabled((bool)(idx != -1));
if(idx!=-1) {
- QString account = gpppdata.accname();
- gpppdata.setAccountbyIndex(accountlist_l->currentItem());
+ QString account = PPPData::data()->accname();
+ PPPData::data()->setAccountbyIndex(accountlist_l->currentItem());
// reset->setEnabled(TRUE);
// costlabel->setEnabled(TRUE);
@@ -194,7 +194,7 @@ void AccountWidget::slotListBoxSelect(int idx) {
// vollabel->setEnabled(TRUE);
// voledit->setEnabled(TRUE);
- int bytes = gpppdata.totalBytes();
+// int bytes = PPPData::data()->totalBytes();
// voledit->setText(prettyPrintVolume(bytes));
- gpppdata.setAccount(account);
+ PPPData::data()->setAccount(account);
} else{
// reset->setEnabled(FALSE);
@@ -241,12 +241,12 @@ void AccountWidget::slotListBoxSelect(int idx) {
void AccountWidget::editaccount() {
- gpppdata.setAccount(accountlist_l->text(accountlist_l->currentItem()));
+ PPPData::data()->setAccount(accountlist_l->text(accountlist_l->currentItem()));
int result = doTab();
if(result == QDialog::Accepted) {
- accountlist_l->changeItem(gpppdata.accname(),accountlist_l->currentItem());
+ accountlist_l->changeItem(PPPData::data()->accname(),accountlist_l->currentItem());
// emit resetaccounts();
- gpppdata.save();
+ PPPData::data()->save();
}
}
@@ -272,5 +272,5 @@ void AccountWidget::newaccount() {
// case QMessageBox::Yes:
// {
-// if (gpppdata.newaccount() == -1)
+// if (PPPData::data()->newaccount() == -1)
// return;
// // ProviderDB pdb(this);
@@ -279,6 +279,6 @@ void AccountWidget::newaccount() {
// }
// case QMessageBox::No:
- if (gpppdata.newaccount() == -1){
- qDebug("gpppdata.newaccount() == -1");
+ if (PPPData::data()->newaccount() == -1){
+ qDebug("PPPData::data()->newaccount() == -1");
return;
}
@@ -290,11 +290,11 @@ void AccountWidget::newaccount() {
if(result == QDialog::Accepted) {
- accountlist_l->insertItem(gpppdata.accname());
- accountlist_l->setSelected(accountlist_l->findItem(gpppdata.accname()),
+ accountlist_l->insertItem(PPPData::data()->accname());
+ accountlist_l->setSelected(accountlist_l->findItem(PPPData::data()->accname()),
true);
// emit resetaccounts();
- gpppdata.save();
+ PPPData::data()->save();
} else
- gpppdata.deleteAccount();
+ PPPData::data()->deleteAccount();
}
@@ -311,9 +311,9 @@ void AccountWidget::copyaccount() {
}
- gpppdata.copyaccount(accountlist_l->currentItem());
+ PPPData::data()->copyaccount(accountlist_l->currentItem());
- accountlist_l->insertItem(gpppdata.accname());
+ accountlist_l->insertItem(PPPData::data()->accname());
// emit resetaccounts();
- gpppdata.save();
+ PPPData::data()->save();
}
@@ -327,9 +327,9 @@ void AccountWidget::deleteaccount() {
return;
- if(gpppdata.deleteAccount(accountlist_l->text(accountlist_l->currentItem())))
+ if(PPPData::data()->deleteAccount(accountlist_l->text(accountlist_l->currentItem())))
accountlist_l->removeItem(accountlist_l->currentItem());
emit resetaccounts();
- gpppdata.save();
+ PPPData::data()->save();
slotListBoxSelect(accountlist_l->currentItem());
@@ -339,34 +339,36 @@ void AccountWidget::deleteaccount() {
int AccountWidget::doTab(){
- QDialog *dlg = new QDialog( this );
- tabWindow = new QTabWidget( dlg );
- // tabWindow = new KDialogBase( KDialogBase::Tabbed, QString::null,
-// KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok,
-// 0, 0, true);
-// KWin::setIcons(tabWindow->winId(), kapp->icon(), kapp->miniIcon());
+ QDialog *dlg = new QDialog( this, "newAccount", true );
+ QVBoxLayout *layout = new QVBoxLayout( dlg );
+ layout->setSpacing( 0 );
+ layout->setMargin( 1 );
+
+ tabWindow = new QTabWidget( dlg, "tabWindow" );
+ layout->addWidget( tabWindow );
+
bool isnewaccount;
- if(gpppdata.accname().isEmpty()) {
- tabWindow->setCaption(i18n("New Account"));
- isnewaccount = true;
+ if(PPPData::data()->accname().isEmpty()) {
+ dlg->setCaption(i18n("New Account"));
+ isnewaccount = true;
} else {
- QString tit = i18n("Edit Account: ");
- tit += gpppdata.accname();
- tabWindow->setCaption(tit);
- isnewaccount = false;
+ QString tit = i18n("Edit Account: ");
+ tit += PPPData::data()->accname();
+ dlg->setCaption(tit);
+ isnewaccount = false;
}
- dial_w = new DialWidget( tabWindow );
- tabWindow->addTab( dial_w, i18n("Dial") );//, i18n("Dial Setup")), isnewaccount);
- ip_w = new IPWidget( tabWindow );
- tabWindow->addTab( ip_w, i18n("IP") );//, i18n("IP Setup")), isnewaccount);
- gateway_w = new GatewayWidget( tabWindow );
- tabWindow->addTab( gateway_w, i18n("Gateway") );//, i18n("Gateway Setup")), isnewaccount);
- dns_w = new DNSWidget( tabWindow );
- tabWindow->addTab( dns_w, i18n("DNS") );//, i18n("DNS Servers")), isnewaccount);
- script_w = new ScriptWidget( tabWindow );
- tabWindow->addTab( script_w, i18n("Login Script") ); //, i18n("Edit Login Script")), isnewaccount);
- ExecWidget *exec_w = new ExecWidget( tabWindow );
- tabWindow->addTab( exec_w, i18n("Execute") );//, i18n("Execute Programs")), isnewaccount);
+ dial_w = new DialWidget( tabWindow, isnewaccount, "Dial Setup");
+ tabWindow->addTab( dial_w, i18n("Dial") );
+ ip_w = new IPWidget( tabWindow, isnewaccount, i18n("IP Setup"));
+ tabWindow->addTab( ip_w, i18n("IP") );
+ gateway_w = new GatewayWidget( tabWindow, isnewaccount, i18n("Gateway Setup"));
+ tabWindow->addTab( gateway_w, i18n("Gateway") );
+ dns_w = new DNSWidget( tabWindow, isnewaccount, i18n("DNS Servers") );
+ tabWindow->addTab( dns_w, i18n("DNS") );
+ script_w = new ScriptWidget( tabWindow, isnewaccount, i18n("Edit Login Script"));
+ tabWindow->addTab( script_w, i18n("Login Script") );
+ ExecWidget *exec_w = new ExecWidget( tabWindow, isnewaccount, i18n("Execute Programs"));
+ tabWindow->addTab( exec_w, i18n("Execute") );
// acct = new AccountingSelector( tabWindow, isnewaccount );
// tabWindow->addTab( acct, i18n("Accounting"));
@@ -374,4 +376,6 @@ int AccountWidget::doTab(){
int result = 0;
bool ok = false;
+ qDebug("AccountWidget::doTab dlg->showMinimized");
+ dlg->showMinimized();
while (!ok){
diff --git a/noncore/settings/networksettings/ppp/connect.cpp b/noncore/settings/networksettings/ppp/connect.cpp
index b7e229e..a3eda9d 100644
--- a/noncore/settings/networksettings/ppp/connect.cpp
+++ b/noncore/settings/networksettings/ppp/connect.cpp
@@ -180,5 +180,5 @@ void ConnectWidget::preinit() {
void ConnectWidget::init() {
- gpppdata.setpppdError(0);
+ PPPData::data()->setpppdError(0);
inittimer->stop();
vmain = 0;
@@ -197,10 +197,10 @@ void ConnectWidget::init() {
p_kppp->con_speed = "";
-// p_kppp->setQuitOnDisconnect (p_kppp->quitOnDisconnect() || gpppdata.quit_on_disconnect());
+// p_kppp->setQuitOnDisconnect (p_kppp->quitOnDisconnect() || PPPData::data()->quit_on_disconnect());
- comlist = &gpppdata.scriptType();
- arglist = &gpppdata.script();
+ comlist = &PPPData::data()->scriptType();
+ arglist = &PPPData::data()->script();
- QString tit = i18n("Connecting to: %1").arg(gpppdata.accname());
+ QString tit = i18n("Connecting to: %1").arg(PPPData::data()->accname());
setCaption(tit);
@@ -208,5 +208,5 @@ void ConnectWidget::init() {
// run the "before-connect" command
- if (!gpppdata.command_before_connect().isEmpty()) {
+ if (!PPPData::data()->command_before_connect().isEmpty()) {
messg->setText(i18n("Running pre-startup command..."));
emit debugMessage(i18n("Running pre-startup command..."));
@@ -214,5 +214,5 @@ void ConnectWidget::init() {
qApp->processEvents();
QApplication::flushX();
- pid_t id = execute_command(gpppdata.command_before_connect());
+ pid_t id = execute_command(PPPData::data()->command_before_connect());
// int i, status;
@@ -251,5 +251,5 @@ void ConnectWidget::init() {
// if we are stuck anywhere we will time out
- timeout_timer->start(gpppdata.modemTimeout()*1000);
+ timeout_timer->start(PPPData::data()->modemTimeout()*1000);
// this timer will run the script etc.
@@ -285,16 +285,16 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
}
- QString initStr = gpppdata.modemInitStr(substate);
+ QString initStr = PPPData::data()->modemInitStr(substate);
if (!initStr.isEmpty()) {
// send a carriage return and then wait a bit so that the modem will
// let us issue commands.
- if(gpppdata.modemPreInitDelay() > 0) {
- usleep(gpppdata.modemPreInitDelay() * 5000);
+ if(PPPData::data()->modemPreInitDelay() > 0) {
+ usleep(PPPData::data()->modemPreInitDelay() * 5000);
writeline("");
- usleep(gpppdata.modemPreInitDelay() * 5000);
+ usleep(PPPData::data()->modemPreInitDelay() * 5000);
}
- setExpect(gpppdata.modemInitResp());
+ setExpect(PPPData::data()->modemInitResp());
writeline(initStr);
- usleep(gpppdata.modemInitDelay() * 10000); // 0.01 - 3.0 sec
+ usleep(PPPData::data()->modemInitDelay() * 10000); // 0.01 - 3.0 sec
}
@@ -307,5 +307,5 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
* a "Modem Query"
*/
- if (MODEM_TONEDURATION != gpppdata.modemToneDuration())
+ if (MODEM_TONEDURATION != PPPData::data()->modemToneDuration())
vmain = 5;
else
@@ -317,9 +317,9 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
if (vmain == 5) {
if(!expecting) {
- QString sToneDuration = "ATS11=" + QString::number(gpppdata.modemToneDuration());
+ QString sToneDuration = "ATS11=" + QString::number(PPPData::data()->modemToneDuration());
QString msg = i18n("Setting ") + sToneDuration;
messg->setText(msg);
emit debugMessage(msg);
- setExpect(gpppdata.modemInitResp());
+ setExpect(PPPData::data()->modemInitResp());
writeline(sToneDuration);
}
@@ -337,5 +337,5 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
substate = -1;
// skip setting the volume if command is empty
- if(gpppdata.volumeInitString().isEmpty()) {
+ if(PPPData::data()->volumeInitString().isEmpty()) {
vmain = 4;
return;
@@ -344,9 +344,9 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
emit debugMessage(i18n("Setting speaker volume..."));
- setExpect(gpppdata.modemInitResp());
+ setExpect(PPPData::data()->modemInitResp());
QString vol("AT");
- vol += gpppdata.volumeInitString();
+ vol += PPPData::data()->volumeInitString();
writeline(vol);
- usleep(gpppdata.modemInitDelay() * 10000); // 0.01 - 3.0 sec
+ usleep(PPPData::data()->modemInitDelay() * 10000); // 0.01 - 3.0 sec
vmain = 4;
return;
@@ -356,10 +356,10 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
if(vmain == 4) {
if(!expecting) {
- if(!gpppdata.waitForDialTone()) {
+ if(!PPPData::data()->waitForDialTone()) {
QString msg = i18n("Turning off dial tone waiting...");
messg->setText(msg);
emit debugMessage(msg);
- setExpect(gpppdata.modemInitResp());
- writeline(gpppdata.modemNoDialToneDetectionStr());
+ setExpect(PPPData::data()->modemInitResp());
+ writeline(PPPData::data()->modemNoDialToneDetectionStr());
}
vmain = 1;
@@ -373,8 +373,8 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
timeout_timer->stop();
- timeout_timer->start(gpppdata.modemTimeout()*1000);
+ timeout_timer->start(PPPData::data()->modemTimeout()*1000);
- QStringList &plist = gpppdata.phonenumbers();
- QString bmarg= gpppdata.dialPrefix();
+ QStringList &plist = PPPData::data()->phonenumbers();
+ QString bmarg= PPPData::data()->dialPrefix();
bmarg += *plist.at(dialnumber);
QString bm = i18n("Dialing %1").arg(bmarg);
@@ -382,6 +382,6 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
emit debugMessage(bm);
- QString pn = gpppdata.modemDialStr();
- pn += gpppdata.dialPrefix();
+ QString pn = PPPData::data()->modemDialStr();
+ pn += PPPData::data()->dialPrefix();
pn += *plist.at(dialnumber);
if(++dialnumber >= plist.count())
@@ -389,5 +389,5 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
writeline(pn);
- setExpect(gpppdata.modemConnectResp());
+ setExpect(PPPData::data()->modemConnectResp());
vmain = 100;
return;
@@ -399,5 +399,5 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
if(vmain == 100) {
if(!expecting) {
- myreadbuffer = gpppdata.modemConnectResp();
+ myreadbuffer = PPPData::data()->modemConnectResp();
setExpect("\n");
vmain = 101;
@@ -405,7 +405,7 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
}
- if(readbuffer.contains(gpppdata.modemBusyResp())) {
+ if(readbuffer.contains(PPPData::data()->modemBusyResp())) {
timeout_timer->stop();
- timeout_timer->start(gpppdata.modemTimeout()*1000);
+ timeout_timer->start(PPPData::data()->modemTimeout()*1000);
messg->setText(i18n("Line busy. Hanging up..."));
@@ -413,6 +413,6 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
Modem::modem->hangup();
- if(gpppdata.busyWait() > 0) {
- QString bm = i18n("Line busy. Waiting: %1 seconds").arg(gpppdata.busyWait());
+ if(PPPData::data()->busyWait() > 0) {
+ QString bm = i18n("Line busy. Waiting: %1 seconds").arg(PPPData::data()->busyWait());
messg->setText(bm);
emit debugMessage(bm);
@@ -420,5 +420,5 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
pausing = true;
- pausetimer->start(gpppdata.busyWait()*1000, true);
+ pausetimer->start(PPPData::data()->busyWait()*1000, true);
timeout_timer->stop();
}
@@ -430,5 +430,5 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
}
- if(readbuffer.contains(gpppdata.modemNoDialtoneResp())) {
+ if(readbuffer.contains(PPPData::data()->modemNoDialtoneResp())) {
timeout_timer->stop();
@@ -439,5 +439,5 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
}
- if(readbuffer.contains(gpppdata.modemNoCarrierResp())) {
+ if(readbuffer.contains(PPPData::data()->modemNoCarrierResp())) {
timeout_timer->stop();
@@ -458,5 +458,5 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
vmain = 2;
- scriptTimeout=gpppdata.modemTimeout()*1000;
+ scriptTimeout=PPPData::data()->modemTimeout()*1000;
return;
}
@@ -495,8 +495,8 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
if (scriptArgument.lower() == "password") {
- gpppdata.setPassword(scanvar);
+ PPPData::data()->setPassword(scanvar);
p_kppp->setPW_Edit(scanvar);
- if(gpppdata.storePassword())
- gpppdata.setStoredPassword(scanvar);
+ if(PPPData::data()->storePassword())
+ PPPData::data()->setStoredPassword(scanvar);
firstrunPW = true;
}
@@ -514,6 +514,6 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
QRegExp re1("%USERNAME%");
QRegExp re2("%PASSWORD%");
- arg = arg.replace(re1, gpppdata.storedUsername());
- arg = arg.replace(re2, gpppdata.storedPassword());
+ arg = arg.replace(re1, PPPData::data()->storedUsername());
+ arg = arg.replace(re2, PPPData::data()->storedPassword());
if (scriptCommand == "Send")
@@ -579,6 +579,6 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
emit debugMessage(i18n("Hangup"));
- writeline(gpppdata.modemHangupStr());
- setExpect(gpppdata.modemHangupResp());
+ writeline(PPPData::data()->modemHangupStr());
+ setExpect(PPPData::data()->modemHangupResp());
scriptindex++;
@@ -593,5 +593,5 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
emit debugMessage(i18n("Answer"));
- setExpect(gpppdata.modemRingResp());
+ setExpect(PPPData::data()->modemRingResp());
vmain = 150;
return;
@@ -603,5 +603,5 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
emit debugMessage(bm);
- QString idstring = gpppdata.storedUsername();
+ QString idstring = PPPData::data()->storedUsername();
if(!idstring.isEmpty() && firstrunID) {
@@ -639,5 +639,5 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
emit debugMessage(bm);
- QString pwstring = gpppdata.password();
+ QString pwstring = PPPData::data()->password();
if(!pwstring.isEmpty() && firstrunPW) {
@@ -786,6 +786,6 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
if(vmain == 150) {
if(!expecting) {
- writeline(gpppdata.modemAnswerStr());
- setExpect(gpppdata.modemAnswerResp());
+ writeline(PPPData::data()->modemAnswerStr());
+ setExpect(PPPData::data()->modemAnswerResp());
vmain = 2;
@@ -815,5 +815,5 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
Modem::modem->stop();
- if(gpppdata.authMethod() == AUTH_TERMINAL) {
+ if(PPPData::data()->authMethod() == AUTH_TERMINAL) {
// if (termwindow) {
// delete termwindow;
@@ -836,6 +836,6 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
killTimer( main_timer_ID );
- if_timeout_timer->start(gpppdata.pppdTimeout()*1000);
- qDebug( "started if timeout timer with %i", gpppdata.pppdTimeout()*1000);
+ if_timeout_timer->start(PPPData::data()->pppdTimeout()*1000);
+ qDebug( "started if timeout timer with %i", PPPData::data()->pppdTimeout()*1000);
// find out PPP interface and notify the stats module
@@ -850,5 +850,5 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
if(result) {
- if(!gpppdata.autoDNS())
+ if(!PPPData::data()->autoDNS())
adddns();
@@ -1064,5 +1064,5 @@ void ConnectWidget::if_waiting_timed_out() {
qDebug("if_waiting_timed_out()");
- gpppdata.setpppdError(E_IF_TIMEOUT);
+ PPPData::data()->setpppdError(E_IF_TIMEOUT);
// let's kill the stuck pppd
@@ -1089,5 +1089,5 @@ void ConnectWidget::if_waiting_slot() {
// if(!stats->ifIsUp()) {
-// if(gpppdata.pppdError() != 0) {
+// if(PPPData::data()->pppdError() != 0) {
// // we are here if pppd died immediately after starting it.
// pppdDied();
@@ -1106,5 +1106,5 @@ void ConnectWidget::if_waiting_slot() {
usleep(200000);
- if(gpppdata.autoDNS())
+ if(PPPData::data()->autoDNS())
addpeerdns();
@@ -1115,10 +1115,10 @@ void ConnectWidget::if_waiting_slot() {
auto_hostname();
- if(!gpppdata.command_on_connect().isEmpty()) {
+ if(!PPPData::data()->command_on_connect().isEmpty()) {
messg->setText(i18n("Running startup command..."));
// make sure that we don't get any async errors
qApp->flushX();
- execute_command(gpppdata.command_on_connect());
+ execute_command(PPPData::data()->command_on_connect());
messg->setText(i18n("Done"));
}
@@ -1142,5 +1142,5 @@ void ConnectWidget::if_waiting_slot() {
// p_kppp->con_win->accounting(false);
- if (gpppdata.get_dock_into_panel()) {
+ if (PPPData::data()->get_dock_into_panel()) {
// DockWidget::dock_widget->show();
// DockWidget::dock_widget->take_stats();
@@ -1150,5 +1150,5 @@ void ConnectWidget::if_waiting_slot() {
// p_kppp->con_win->show();
- if(gpppdata.get_iconify_on_connect()) {
+ if(PPPData::data()->get_iconify_on_connect()) {
// p_kppp->con_win->showMinimized();
}
@@ -1169,15 +1169,15 @@ bool ConnectWidget::execppp() {
// which is the serial port we connected stdin/stdout to in opener.cpp.
// command += " ";
- // command += gpppdata.modemDevice();
+ // command += PPPData::data()->modemDevice();
- command += " " + gpppdata.speed();
+ command += " " + PPPData::data()->speed();
command += " -detach";
- if(gpppdata.ipaddr() != "0.0.0.0" ||
- gpppdata.gateway() != "0.0.0.0") {
- if(gpppdata.ipaddr() != "0.0.0.0") {
+ if(PPPData::data()->ipaddr() != "0.0.0.0" ||
+ PPPData::data()->gateway() != "0.0.0.0") {
+ if(PPPData::data()->ipaddr() != "0.0.0.0") {
command += " ";
- command += gpppdata.ipaddr();
+ command += PPPData::data()->ipaddr();
command += ":";
}
@@ -1187,13 +1187,13 @@ bool ConnectWidget::execppp() {
}
- if(gpppdata.gateway() != "0.0.0.0")
- command += gpppdata.gateway();
+ if(PPPData::data()->gateway() != "0.0.0.0")
+ command += PPPData::data()->gateway();
}
- if(gpppdata.subnetmask() != "0.0.0.0")
- command += " netmask " + gpppdata.subnetmask();
+ if(PPPData::data()->subnetmask() != "0.0.0.0")
+ command += " netmask " + PPPData::data()->subnetmask();
- if(gpppdata.flowcontrol() != "None") {
- if(gpppdata.flowcontrol() == "CRTSCTS")
+ if(PPPData::data()->flowcontrol() != "None") {
+ if(PPPData::data()->flowcontrol() == "CRTSCTS")
command += " crtscts";
else
@@ -1201,11 +1201,11 @@ bool ConnectWidget::execppp() {
}
- if(gpppdata.defaultroute())
+ if(PPPData::data()->defaultroute())
command += " defaultroute";
- if(gpppdata.autoDNS())
+ if(PPPData::data()->autoDNS())
command += " usepeerdns";
- QStringList &arglist = gpppdata.pppdArgument();
+ QStringList &arglist = PPPData::data()->pppdArgument();
for ( QStringList::Iterator it = arglist.begin();
it != arglist.end();
@@ -1216,23 +1216,23 @@ bool ConnectWidget::execppp() {
// PAP settings
- if(gpppdata.authMethod() == AUTH_PAP) {
+ if(PPPData::data()->authMethod() == AUTH_PAP) {
command += " -chap user ";
- command = command + "\"" + gpppdata.storedUsername() + "\"";
+ command = command + "\"" + PPPData::data()->storedUsername() + "\"";
}
// CHAP settings
- if(gpppdata.authMethod() == AUTH_CHAP) {
+ if(PPPData::data()->authMethod() == AUTH_CHAP) {
command += " -pap user ";
- command = command + "\"" + gpppdata.storedUsername() + "\"";
+ command = command + "\"" + PPPData::data()->storedUsername() + "\"";
}
// PAP/CHAP settings
- if(gpppdata.authMethod() == AUTH_PAPCHAP) {
+ if(PPPData::data()->authMethod() == AUTH_PAPCHAP) {
command += " user ";
- command = command + "\"" + gpppdata.storedUsername() + "\"";
+ command = command + "\"" + PPPData::data()->storedUsername() + "\"";
}
// check for debug
- if(gpppdata.getPPPDebug())
+ if(PPPData::data()->getPPPDebug())
command += " debug";
@@ -1278,6 +1278,6 @@ void auto_hostname() {
old_hostname=tmp_str; // copy to QString
- // if (!p_kppp->stats->local_ip_address.isEmpty() && gpppdata.autoname()) {
- if ( gpppdata.autoname()) {
+ // if (!p_kppp->stats->local_ip_address.isEmpty() && PPPData::data()->autoname()) {
+ if ( PPPData::data()->autoname()) {
// local_ip.s_addr=inet_addr(p_kppp->stats->local_ip_address.ascii());
hostname_entry=gethostbyaddr((const char *)&local_ip,sizeof(in_addr),AF_INET);
@@ -1333,5 +1333,5 @@ void add_domain(const QString &domain) {
( resolv[j].contains("nameserver")
&& !resolv[j].contains("#kppp temp entry")
- && gpppdata.exDNSDisabled()))
+ && PPPData::data()->exDNSDisabled()))
&& !resolv[j].contains("#entry disabled by kppp")) {
QCString tmp = "# " + resolv[j].local8Bit() +
@@ -1356,5 +1356,5 @@ void adddns()
if ((fd = Modem::modem->openResolv(O_WRONLY|O_APPEND)) >= 0) {
- QStringList &dnslist = gpppdata.dns();
+ QStringList &dnslist = PPPData::data()->dns();
for ( QStringList::Iterator it = dnslist.begin();
it != dnslist.end();
@@ -1367,5 +1367,5 @@ void adddns()
close(fd);
}
- add_domain(gpppdata.domain());
+ add_domain(PPPData::data()->domain());
}
@@ -1388,5 +1388,5 @@ void addpeerdns() {
close(fd);
}
- add_domain(gpppdata.domain());
+ add_domain(PPPData::data()->domain());
}
diff --git a/noncore/settings/networksettings/ppp/conwindow.cpp b/noncore/settings/networksettings/ppp/conwindow.cpp
index d6b3fbe..ad89005 100644
--- a/noncore/settings/networksettings/ppp/conwindow.cpp
+++ b/noncore/settings/networksettings/ppp/conwindow.cpp
@@ -76,7 +76,7 @@ ConWindow::ConWindow(QWidget *parent, const char *name, QDialog *mainwidget )
// read window position from config file
- int p_x, p_y;
- gpppdata.winPosConWin(p_x, p_y);
- setGeometry(p_x, p_y, 320, 110);
+// int p_x, p_y;
+// PPPData::data()->winPosConWin(p_x, p_y);
+// setGeometry(p_x, p_y, 320, 110);
}
@@ -89,5 +89,5 @@ bool ConWindow::event(QEvent *e) {
if (e->type() == QEvent::Hide)
{
- gpppdata.setWinPosConWin(x(), y());
+// PPPData::data()->setWinPosConWin(x(), y());
return true;
}
@@ -119,5 +119,5 @@ void ConWindow::accounting(bool on) {
// cache accounting settings
accountingEnabled = on;
- volumeAccountingEnabled = gpppdata.VolAcctEnabled();
+ volumeAccountingEnabled = PPPData::data()->VolAcctEnabled();
// delete old layout
@@ -134,5 +134,5 @@ void ConWindow::accounting(bool on) {
int vol_lines = 0;
- if(gpppdata.VolAcctEnabled())
+ if(PPPData::data()->VolAcctEnabled())
vol_lines = 1;
@@ -240,7 +240,7 @@ void ConWindow::startClock() {
QString title ;
- title = gpppdata.accname();
+ title = PPPData::data()->accname();
- if(gpppdata.get_show_clock_on_caption()){
+ if(PPPData::data()->get_show_clock_on_caption()){
title += " 00:00" ;
}
@@ -266,5 +266,5 @@ void ConWindow::timeclick() {
"Connected at: %2\n"
"Time connected: %3")
- .arg(gpppdata.accname()).arg(info2->text())
+ .arg(PPPData::data()->accname()).arg(info2->text())
.arg(time_string2);
@@ -276,5 +276,5 @@ void ConWindow::timeclick() {
volinfo->setEnabled(TRUE);
- int bytes = gpppdata.totalBytes();
+ int bytes = PPPData::data()->totalBytes();
volinfo->setText(prettyPrintVolume(bytes));
}
@@ -306,5 +306,5 @@ void ConWindow::timeclick() {
time_string2.sprintf("%02d:%02d:%02d",hours,minutes,seconds);
- caption_string = gpppdata.accname();
+ caption_string = PPPData::data()->accname();
caption_string += " ";
caption_string += time_string;
@@ -313,5 +313,5 @@ void ConWindow::timeclick() {
timelabel2->setText(time_string2);
- if(gpppdata.get_show_clock_on_caption() && (seconds == 1)){
+ if(PPPData::data()->get_show_clock_on_caption() && (seconds == 1)){
// we update the Caption only once per minute not every second
// otherwise I get a flickering icon
@@ -329,5 +329,5 @@ void ConWindow::closeEvent( QCloseEvent *e ){
e->ignore();
- if(gpppdata.get_dock_into_panel())
+ if(PPPData::data()->get_dock_into_panel())
dock();
}
diff --git a/noncore/settings/networksettings/ppp/debug.cpp b/noncore/settings/networksettings/ppp/debug.cpp
index 8652931..447ccf2 100644
--- a/noncore/settings/networksettings/ppp/debug.cpp
+++ b/noncore/settings/networksettings/ppp/debug.cpp
@@ -134,5 +134,5 @@ void DebugWidget::toggleVisibility() {
bool showlog = isVisible();
- gpppdata.set_show_log_window(showlog);
+ PPPData::data()->set_show_log_window(showlog);
}
diff --git a/noncore/settings/networksettings/ppp/edit.cpp b/noncore/settings/networksettings/ppp/edit.cpp
index 961047b..6132b80 100644
--- a/noncore/settings/networksettings/ppp/edit.cpp
+++ b/noncore/settings/networksettings/ppp/edit.cpp
@@ -42,5 +42,5 @@
#include "edit.h"
#include "pppdata.h"
-#include "newwidget.h"
+//#include "newwidget.h"
#include "iplined.h"
#include "auth.h"
@@ -51,11 +51,11 @@ DialWidget::DialWidget( QWidget *parent, bool isnewaccount, const char *name )
const int GRIDROWS = 6;
- QGridLayout *tl = new QGridLayout(parent, GRIDROWS, 2, 0 );//, KDialog::spacingHint());
+ QGridLayout *tl = new QGridLayout(this, GRIDROWS, 2, 0 );//, KDialog::spacingHint());
- connect_label = new QLabel(i18n("Connection name:"), parent);
+ connect_label = new QLabel(i18n("Connection name:"), this);
tl->addWidget(connect_label, 0, 0);
- connectname_l = new QLineEdit(parent);
- connectname_l->setMaxLength(ACCNAME_SIZE);
+ connectname_l = new QLineEdit(this);
+// connectname_l->setMaxLength(ACCNAME_SIZE);
tl->addWidget(connectname_l, 0, 1);
QString tmp = i18n("Type in a unique name for this connection");
@@ -65,5 +65,5 @@ DialWidget::DialWidget( QWidget *parent, bool isnewaccount, const char *name )
- number_label = new QLabel(i18n("Phone number:"), parent);
+ number_label = new QLabel(i18n("Phone number:"), this);
number_label->setAlignment(AlignTop|AlignLeft);
tl->addWidget(number_label, 1, 0);
@@ -71,16 +71,16 @@ DialWidget::DialWidget( QWidget *parent, bool isnewaccount, const char *name )
QHBoxLayout *lpn = new QHBoxLayout(5);
tl->addLayout(lpn, 1, 1);
- numbers = new QListBox(parent);
+ numbers = new QListBox(this);
numbers->setMinimumSize(120, 70);
lpn->addWidget(numbers);
QVBoxLayout *lpn1 = new QVBoxLayout;
lpn->addLayout(lpn1);
- add = new QPushButton(i18n("&Add..."), parent);
- del = new QPushButton(i18n("&Remove"), parent);
+ add = new QPushButton(i18n("&Add..."), this);
+ del = new QPushButton(i18n("&Remove"), this);
- up = new QPushButton(parent);
+ up = new QPushButton(this);
//FIXME: QPixmap pm = BarIcon("up");
// up->setPixmap(pm);
- down = new QPushButton(parent);
+ down = new QPushButton(this);
//FIXME: pm = BarIcon("down");
// down->setPixmap(pm);
@@ -113,8 +113,8 @@ DialWidget::DialWidget( QWidget *parent, bool isnewaccount, const char *name )
QWhatsThis::add(numbers,tmp);
- auth_l = new QLabel(i18n("Authentication:"), parent);
+ auth_l = new QLabel(i18n("Authentication:"), this);
tl->addWidget(auth_l, 3, 0);
- auth = new QComboBox(parent);
+ auth = new QComboBox(this);
auth->insertItem(i18n("Script-based"));
auth->insertItem(i18n("PAP"));
@@ -136,5 +136,5 @@ DialWidget::DialWidget( QWidget *parent, bool isnewaccount, const char *name )
QWhatsThis::add(auth,tmp);
- store_password = new QCheckBox(i18n("Store password"), parent);
+ store_password = new QCheckBox(i18n("Store password"), this);
store_password->setChecked(true);
tl->addMultiCellWidget(store_password, 4, 4, 0, 1, AlignRight);
@@ -149,5 +149,5 @@ DialWidget::DialWidget( QWidget *parent, bool isnewaccount, const char *name )
"gains access to this file!"));
- pppdargs = new QPushButton(i18n("Customize pppd Arguments..."), parent);
+ pppdargs = new QPushButton(i18n("Customize pppd Arguments..."), this);
connect(pppdargs, SIGNAL(clicked()), SLOT(pppdargsbutton()));
tl->addMultiCellWidget(pppdargs, 5, 5, 0, 1, AlignCenter);
@@ -155,8 +155,8 @@ DialWidget::DialWidget( QWidget *parent, bool isnewaccount, const char *name )
// Set defaults if editing an existing connection
if(!isnewaccount) {
- connectname_l->setText(gpppdata.accname());
+ connectname_l->setText(PPPData::data()->accname());
// insert the phone numbers into the listbox
- QString n = gpppdata.phonenumber();
+ QString n = PPPData::data()->phonenumber();
QString tmp = "";
uint idx = 0;
@@ -173,6 +173,6 @@ DialWidget::DialWidget( QWidget *parent, bool isnewaccount, const char *name )
numbers->insertItem(tmp);
- auth->setCurrentItem(gpppdata.authMethod());
- store_password->setChecked(gpppdata.storePassword());
+ auth->setCurrentItem(PPPData::data()->authMethod());
+ store_password->setChecked(PPPData::data()->storePassword());
} else {
// select PAP/CHAP as default
@@ -188,8 +188,8 @@ bool DialWidget::save() {
//first check to make sure that the account name is unique!
if(connectname_l->text().isEmpty() ||
- !gpppdata.isUniqueAccname(connectname_l->text())) {
+ !PPPData::data()->isUniqueAccname(connectname_l->text())) {
return false;
} else {
- gpppdata.setAccname(connectname_l->text());
+ PPPData::data()->setAccname(connectname_l->text());
QString number = "";
@@ -200,7 +200,7 @@ bool DialWidget::save() {
}
- gpppdata.setPhonenumber(number);
- gpppdata.setAuthMethod(auth->currentItem());
- gpppdata.setStorePassword(store_password->isChecked());
+ PPPData::data()->setPhonenumber(number);
+ PPPData::data()->setAuthMethod(auth->currentItem());
+ PPPData::data()->setStorePassword(store_password->isChecked());
return true;
}
@@ -223,9 +223,9 @@ void DialWidget::selectionChanged(int) {
void DialWidget::addNumber() {
- PhoneNumberDialog dlg(this);
- if(dlg.exec()) {
- numbers->insertItem(dlg.phoneNumber());
- numbersChanged();
- }
+ PhoneNumberDialog dlg(this);
+ if(dlg.exec()) {
+ numbers->insertItem(dlg.phoneNumber());
+ numbersChanged();
+ }
}
@@ -276,5 +276,5 @@ ExecWidget::ExecWidget(QWidget *parent, bool isnewaccount, const char *name) :
QWidget(parent, name)
{
- QVBoxLayout *tl = new QVBoxLayout(parent, 0 );//, KDialog::spacingHint());
+ QVBoxLayout *tl = new QVBoxLayout(this, 0 );//, KDialog::spacingHint());
QLabel *l = new QLabel(\
@@ -284,6 +284,6 @@ i18n("Here you can select commands to run at certain stages of the\n"
"(unless, of course, you are root).\n\n"
"Be sure to supply the whole path to the program otherwise\n"
- "kppp might be unable to find it."), parent);
- l->setMinimumHeight(l->sizeHint().height());
+ "kppp might be unable to find it."), this);
+// l->setMinimumHeight(l->sizeHint().height());
tl->addWidget(l);
tl->addStretch(1);
@@ -294,9 +294,9 @@ i18n("Here you can select commands to run at certain stages of the\n"
l1->setColStretch(1, 1);
- before_connect_l = new QLabel(i18n("Before connect:"), parent);
+ before_connect_l = new QLabel(i18n("Before connect:"), this);
before_connect_l->setAlignment(AlignVCenter);
l1->addWidget(before_connect_l, 0, 0);
- before_connect = new QLineEdit(parent);
- before_connect->setMaxLength(COMMAND_SIZE);
+ before_connect = new QLineEdit(this);
+// before_connect->setMaxLength(COMMAND_SIZE);
l1->addWidget(before_connect, 0, 1);
QString tmp = i18n("Allows you to run a program <b>before</b> a connection\n"
@@ -309,9 +309,9 @@ i18n("Here you can select commands to run at certain stages of the\n"
QWhatsThis::add(before_connect,tmp);
- command_label = new QLabel(i18n("Upon connect:"), parent);
+ command_label = new QLabel(i18n("Upon connect:"), this);
command_label->setAlignment(AlignVCenter);
l1->addWidget(command_label, 1, 0);
- command = new QLineEdit(parent);
- command->setMaxLength(COMMAND_SIZE);
+ command = new QLineEdit(this);
+// command->setMaxLength(COMMAND_SIZE);
l1->addWidget(command, 1, 1);
tmp = i18n("Allows you to run a program <b>after</b> a connection\n"
@@ -325,9 +325,9 @@ i18n("Here you can select commands to run at certain stages of the\n"
predisconnect_label = new QLabel(i18n("Before disconnect:"),
- parent);
+ this);
predisconnect_label->setAlignment(AlignVCenter);
l1->addWidget(predisconnect_label, 2, 0);
- predisconnect = new QLineEdit(parent);
- predisconnect->setMaxLength(COMMAND_SIZE);
+ predisconnect = new QLineEdit(this);
+// predisconnect->setMaxLength(COMMAND_SIZE);
l1->addWidget(predisconnect, 2, 1);
tmp = i18n("Allows you to run a program <b>before</b> a connection\n"
@@ -339,10 +339,10 @@ i18n("Here you can select commands to run at certain stages of the\n"
discommand_label = new QLabel(i18n("Upon disconnect:"),
- parent);
+ this);
discommand_label->setAlignment(AlignVCenter);
l1->addWidget(discommand_label, 3, 0);
- discommand = new QLineEdit(parent);
- discommand->setMaxLength(COMMAND_SIZE);
+ discommand = new QLineEdit(this);
+// discommand->setMaxLength(COMMAND_SIZE);
l1->addWidget(discommand, 3, 1);
tmp = i18n("Allows you to run a program <b>after</b> a connection\n"
@@ -361,8 +361,8 @@ i18n("Here you can select commands to run at certain stages of the\n"
// Set defaults if editing an existing connection
if(!isnewaccount) {
- before_connect->setText(gpppdata.command_before_connect());
- command->setText(gpppdata.command_on_connect());
- discommand->setText(gpppdata.command_on_disconnect());
- predisconnect->setText(gpppdata.command_before_disconnect());
+ before_connect->setText(PPPData::data()->command_before_connect());
+ command->setText(PPPData::data()->command_on_connect());
+ discommand->setText(PPPData::data()->command_on_disconnect());
+ predisconnect->setText(PPPData::data()->command_before_disconnect());
}
}
@@ -370,8 +370,8 @@ i18n("Here you can select commands to run at certain stages of the\n"
bool ExecWidget::save() {
- gpppdata.setCommand_before_connect(before_connect->text());
- gpppdata.setCommand_on_connect(command->text());
- gpppdata.setCommand_before_disconnect(predisconnect->text());
- gpppdata.setCommand_on_disconnect(discommand->text());
+ PPPData::data()->setCommand_before_connect(before_connect->text());
+ PPPData::data()->setCommand_on_connect(command->text());
+ PPPData::data()->setCommand_before_disconnect(predisconnect->text());
+ PPPData::data()->setCommand_on_disconnect(discommand->text());
return true;
}
@@ -387,11 +387,11 @@ IPWidget::IPWidget( QWidget *parent, bool isnewaccount, const char *name )
: QWidget(parent, name)
{
- QVBoxLayout *topLayout = new QVBoxLayout(parent);
+ QVBoxLayout *topLayout = new QVBoxLayout(this);
topLayout->setSpacing( 3 );//KDialog::spacingHint());
- box = new QVGroupBox(i18n("Configuration"), parent);
+ box = new QVGroupBox(i18n("Configuration"), this);
// box->setInsideSpacing( 1 );//KDialog::spacingHint());
- rb = new QButtonGroup(parent);
+ rb = new QButtonGroup(this);
rb->hide();
connect(rb, SIGNAL(clicked(int)),
@@ -449,6 +449,6 @@ IPWidget::IPWidget( QWidget *parent, bool isnewaccount, const char *name )
QWhatsThis::add(subnetmask_l,tmp);
- autoname = new QCheckBox(i18n("Auto-configure hostname from this IP"), parent);
- autoname->setChecked(gpppdata.autoname());
+ autoname = new QCheckBox(i18n("Auto-configure hostname from this IP"), this);
+ autoname->setChecked(PPPData::data()->autoname());
connect(autoname,SIGNAL(toggled(bool)),
this,SLOT(autoname_t(bool)));
@@ -470,13 +470,13 @@ IPWidget::IPWidget( QWidget *parent, bool isnewaccount, const char *name )
//load info from gpppdata
if(!isnewaccount) {
- if(gpppdata.ipaddr() == "0.0.0.0" &&
- gpppdata.subnetmask() == "0.0.0.0") {
+ if(PPPData::data()->ipaddr() == "0.0.0.0" &&
+ PPPData::data()->subnetmask() == "0.0.0.0") {
dynamicadd_rb->setChecked(true);
hitIPSelect(0);
- autoname->setChecked(gpppdata.autoname());
+ autoname->setChecked(PPPData::data()->autoname());
}
else {
- ipaddress_l->setText(gpppdata.ipaddr());
- subnetmask_l->setText(gpppdata.subnetmask());
+ ipaddress_l->setText(PPPData::data()->ipaddr());
+ subnetmask_l->setText(PPPData::data()->subnetmask());
staticadd_rb->setChecked(true);
autoname->setChecked(false);
@@ -511,11 +511,11 @@ void IPWidget::autoname_t(bool on) {
void IPWidget::save() {
if(dynamicadd_rb->isChecked()) {
- gpppdata.setIpaddr("0.0.0.0");
- gpppdata.setSubnetmask("0.0.0.0");
+ PPPData::data()->setIpaddr("0.0.0.0");
+ PPPData::data()->setSubnetmask("0.0.0.0");
} else {
- gpppdata.setIpaddr(ipaddress_l->text());
- gpppdata.setSubnetmask(subnetmask_l->text());
+ PPPData::data()->setIpaddr(ipaddress_l->text());
+ PPPData::data()->setSubnetmask(subnetmask_l->text());
}
- gpppdata.setAutoname(autoname->isChecked());
+ PPPData::data()->setAutoname(autoname->isChecked());
}
@@ -541,12 +541,12 @@ DNSWidget::DNSWidget( QWidget *parent, bool isnewaccount, const char *name )
: QWidget(parent, name)
{
- // box = new QGroupBox(parent);
- QGridLayout *tl = new QGridLayout(parent, 7, 2, 0 );//, KDialog::spacingHint());
+ // box = new QGroupBox(this);
+ QGridLayout *tl = new QGridLayout(this, 7, 2, 0 );//, KDialog::spacingHint());
- dnsdomain_label = new QLabel(i18n("Domain name:"), parent);
+ dnsdomain_label = new QLabel(i18n("Domain name:"), this);
tl->addWidget(dnsdomain_label, 0, 0);
- dnsdomain = new QLineEdit(parent);
- dnsdomain->setMaxLength(DOMAIN_SIZE);
+ dnsdomain = new QLineEdit(this);
+// dnsdomain->setMaxLength(DOMAIN_SIZE);
tl->addWidget(dnsdomain, 0, 1);
QString tmp = i18n("If you enter a domain name here, this domain\n"
@@ -562,5 +562,5 @@ DNSWidget::DNSWidget( QWidget *parent, bool isnewaccount, const char *name )
QWhatsThis::add(dnsdomain,tmp);
- conf_label = new QLabel(i18n("Configuration:"), parent);
+ conf_label = new QLabel(i18n("Configuration:"), this);
tl->addWidget(conf_label, 1, 0);
@@ -569,21 +569,21 @@ DNSWidget::DNSWidget( QWidget *parent, bool isnewaccount, const char *name )
bg->hide();
- autodns = new QRadioButton(i18n("Automatic"), parent);
+ autodns = new QRadioButton(i18n("Automatic"), this);
bg->insert(autodns, 0);
tl->addWidget(autodns, 1, 1);
// no automatic DNS detection for pppd < 2.3.7
- if(!gpppdata.pppdVersionMin(2, 3, 7))
+ if(!PPPData::data()->pppdVersionMin(2, 3, 7))
autodns->setEnabled(false);
- mandns = new QRadioButton(i18n("Manual"), parent);
+ mandns = new QRadioButton(i18n("Manual"), this);
bg->insert(mandns, 1);
tl->addWidget(mandns, 2, 1);
- dns_label = new QLabel(i18n("DNS IP address:"), parent);
+ dns_label = new QLabel(i18n("DNS IP address:"), this);
tl->addWidget(dns_label, 3, 0);
QHBoxLayout *l2 = new QHBoxLayout;
tl->addLayout(l2, 3, 1);
- dnsipaddr = new IPLineEdit(parent);
+ dnsipaddr = new IPLineEdit(this);
connect(dnsipaddr, SIGNAL(returnPressed()),
SLOT(adddns()));
@@ -605,9 +605,9 @@ DNSWidget::DNSWidget( QWidget *parent, bool isnewaccount, const char *name )
QHBoxLayout *l1 = new QHBoxLayout;
tl->addLayout(l1, 4, 1);
- add = new QPushButton(i18n("Add"), parent);
+ add = new QPushButton(i18n("Add"), this);
connect(add, SIGNAL(clicked()), SLOT(adddns()));
- int width = add->sizeHint().width();
- width = QMAX(width,60);
- add->setMinimumWidth(width);
+// int width = add->sizeHint().width();
+// width = QMAX(width,60);
+// add->setMinimumWidth(width);
l1->addWidget(add);
l1->addStretch(1);
@@ -617,9 +617,9 @@ DNSWidget::DNSWidget( QWidget *parent, bool isnewaccount, const char *name )
"will then be added to the list below"));
- remove = new QPushButton(i18n("Remove"), parent);
+ remove = new QPushButton(i18n("Remove"), this);
connect(remove, SIGNAL(clicked()), SLOT(removedns()));
- width = remove->sizeHint().width();
- width = QMAX(width,60);
- remove->setMinimumWidth(width);
+// width = remove->sizeHint().width();
+// width = QMAX(width,60);
+// remove->setMinimumWidth(width);
l1->addWidget(remove);
QWhatsThis::add(remove,
@@ -627,9 +627,9 @@ DNSWidget::DNSWidget( QWidget *parent, bool isnewaccount, const char *name )
"server entry from the list below"));
- servers_label = new QLabel(i18n("DNS address list:"), parent);
+ servers_label = new QLabel(i18n("DNS address list:"), this);
servers_label->setAlignment(AlignTop|AlignLeft);
tl->addWidget(servers_label, 5, 0);
- dnsservers = new QListBox(parent);
+ dnsservers = new QListBox(this);
dnsservers->setMinimumSize(150, 80);
connect(dnsservers, SIGNAL(highlighted(int)),
@@ -645,6 +645,6 @@ DNSWidget::DNSWidget( QWidget *parent, bool isnewaccount, const char *name )
exdnsdisabled_toggle = new QCheckBox(i18n( \
"Disable existing DNS servers during connection"),
- parent);
- exdnsdisabled_toggle->setChecked(gpppdata.exDNSDisabled());
+ this);
+ exdnsdisabled_toggle->setChecked(PPPData::data()->exDNSDisabled());
tl->addMultiCellWidget(exdnsdisabled_toggle, 6, 6, 0, 1, AlignCenter);
QWhatsThis::add(exdnsdisabled_toggle,
@@ -662,9 +662,9 @@ DNSWidget::DNSWidget( QWidget *parent, bool isnewaccount, const char *name )
// restore data if editing
if(!isnewaccount) {
- dnsservers->insertStringList(gpppdata.dns());
- dnsdomain->setText(gpppdata.domain());
+ dnsservers->insertStringList(PPPData::data()->dns());
+ dnsdomain->setText(PPPData::data()->domain());
}
- int mode = gpppdata.autoDNS() ? 0 : 1;
+ int mode = PPPData::data()->autoDNS() ? 0 : 1;
bg->setButton(mode);
DNS_Mode_Selected(mode);
@@ -696,18 +696,18 @@ void DNSWidget::DNS_Mode_Selected(int mode) {
void DNSWidget::save() {
- gpppdata.setAutoDNS(bg->id(bg->selected()) == 0);
+ PPPData::data()->setAutoDNS(bg->id(bg->selected()) == 0);
QStringList serverlist;
for(uint i=0; i < dnsservers->count(); i++)
serverlist.append(dnsservers->text(i));
- gpppdata.setDns(serverlist);
+ PPPData::data()->setDns(serverlist);
// strip leading dot
QString s(dnsdomain->text());
if(s.left(1) == ".")
- gpppdata.setDomain(s.mid(1));
+ PPPData::data()->setDomain(s.mid(1));
else
- gpppdata.setDomain(dnsdomain->text());
+ PPPData::data()->setDomain(dnsdomain->text());
- gpppdata.setExDNSDisabled(exdnsdisabled_toggle->isChecked());
+ PPPData::data()->setExDNSDisabled(exdnsdisabled_toggle->isChecked());
}
@@ -736,11 +736,11 @@ GatewayWidget::GatewayWidget( QWidget *parent, bool isnewaccount, const char *na
: QWidget(parent, name)
{
- QVBoxLayout *topLayout = new QVBoxLayout(parent);
+ QVBoxLayout *topLayout = new QVBoxLayout(this);
topLayout->setSpacing( 2 );//KDialog::spacingHint());
- box = new QVGroupBox(i18n("Configuration"), parent);
+ box = new QVGroupBox(i18n("Configuration"), this);
// box->setInsideSpacing( 2 );//KDialog::spacingHint());
- rb = new QButtonGroup(parent);
+ rb = new QButtonGroup(this);
rb->hide();
connect(rb, SIGNAL(clicked(int)), SLOT(hitGatewaySelect(int)));
@@ -772,5 +772,5 @@ GatewayWidget::GatewayWidget( QWidget *parent, bool isnewaccount, const char *na
defaultroute = new QCheckBox(i18n("Assign the default route to this gateway"),
- parent);
+ this);
QWhatsThis::add(defaultroute,
i18n("If this option is enabled, all packets not\n"
@@ -786,13 +786,13 @@ GatewayWidget::GatewayWidget( QWidget *parent, bool isnewaccount, const char *na
//load info from gpppdata
if(!isnewaccount) {
- if(gpppdata.gateway() == "0.0.0.0") {
+ if(PPPData::data()->gateway() == "0.0.0.0") {
defaultgateway->setChecked(true);
hitGatewaySelect(0);
}
else {
- gatewayaddr->setText(gpppdata.gateway());
+ gatewayaddr->setText(PPPData::data()->gateway());
staticgateway->setChecked(true);
}
- defaultroute->setChecked(gpppdata.defaultroute());
+ defaultroute->setChecked(PPPData::data()->defaultroute());
}
else {
@@ -804,6 +804,6 @@ GatewayWidget::GatewayWidget( QWidget *parent, bool isnewaccount, const char *na
void GatewayWidget::save() {
- gpppdata.setGateway(gatewayaddr->text());
- gpppdata.setDefaultroute(defaultroute->isChecked());
+ PPPData::data()->setGateway(gatewayaddr->text());
+ PPPData::data()->setDefaultroute(defaultroute->isChecked());
}
@@ -827,11 +827,11 @@ ScriptWidget::ScriptWidget( QWidget *parent, bool isnewaccount, const char *name
: QWidget(parent, name)
{
- QVBoxLayout *tl = new QVBoxLayout(parent, 0 );//, KDialog::spacingHint());
- se = new ScriptEdit(parent);
+ QVBoxLayout *tl = new QVBoxLayout(this, 0 );//, KDialog::spacingHint());
+ se = new ScriptEdit(this);
connect(se, SIGNAL(returnPressed()), SLOT(addButton()));
tl->addWidget(se);
// insert equal-sized buttons
- QButtonGroup *bbox = new QButtonGroup(parent);
+ QButtonGroup *bbox = new QButtonGroup(this);
add = new QPushButton( bbox, i18n("Add") );
bbox->insert(add);
@@ -850,16 +850,16 @@ ScriptWidget::ScriptWidget( QWidget *parent, bool isnewaccount, const char *name
QHBoxLayout *l12 = new QHBoxLayout(0);
tl->addLayout(l12);
- stl = new QListBox(parent);
+ stl = new QListBox(this);
stl->setVScrollBarMode( QScrollView::AlwaysOff );
connect(stl, SIGNAL(highlighted(int)), SLOT(stlhighlighted(int)));
stl->setMinimumSize(QSize(70, 140));
- sl = new QListBox(parent);
+ sl = new QListBox(this);
sl->setVScrollBarMode( QScrollView::AlwaysOff );
connect(sl, SIGNAL(highlighted(int)), SLOT(slhighlighted(int)));
sl->setMinimumSize(QSize(150, 140));
- slb = new QScrollBar(parent);
- slb->setFixedWidth(slb->sizeHint().width());
+ slb = new QScrollBar(this);
+// slb->setFixedWidth(slb->sizeHint().width());
connect(slb, SIGNAL(valueChanged(int)), SLOT(scrolling(int)));
@@ -870,6 +870,6 @@ ScriptWidget::ScriptWidget( QWidget *parent, bool isnewaccount, const char *name
//load data from gpppdata
if(!isnewaccount) {
- QStringList &comlist = gpppdata.scriptType();
- QStringList &arglist = gpppdata.script();
+ QStringList &comlist = PPPData::data()->scriptType();
+ QStringList &arglist = PPPData::data()->script();
QStringList::Iterator itcom = comlist.begin();
QStringList::Iterator itarg = arglist.begin();
@@ -917,6 +917,6 @@ void ScriptWidget::save() {
arglist.append(sl->text(i));
}
- gpppdata.setScriptType(typelist);
- gpppdata.setScript(arglist);
+ PPPData::data()->setScriptType(typelist);
+ PPPData::data()->setScript(arglist);
}
@@ -1155,5 +1155,5 @@ void ScriptWidget::removeButton() {
/////////////////////////////////////////////////////////////////////////////
PhoneNumberDialog::PhoneNumberDialog(QWidget *parent)
- : QDialog(parent, 0, true ) {
+ : QDialog(parent,"PhoneNumberDialog",true) {
setCaption( i18n("Add Phone Number") );
// KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon());
@@ -1166,6 +1166,6 @@ PhoneNumberDialog::PhoneNumberDialog(QWidget *parent)
new QLabel(i18n("Enter a phone number:"), hbox);
- le = newLineEdit(14, hbox);
- le->setMinimumWidth(125);
+ le = new QLineEdit(hbox);
+// le->setMinimumWidth(125);
connect(le, SIGNAL(textChanged(const QString &)),
diff --git a/noncore/settings/networksettings/ppp/general.cpp b/noncore/settings/networksettings/ppp/general.cpp
index f803628..a02ee35 100644
--- a/noncore/settings/networksettings/ppp/general.cpp
+++ b/noncore/settings/networksettings/ppp/general.cpp
@@ -165,5 +165,5 @@ ModemWidget::ModemWidget( QWidget *parent, const char *name)
for(int i=0; i <= enter->count()-1; i++) {
- if(gpppdata.enter() == enter->text(i))
+ if(PPPData::data()->enter() == enter->text(i))
enter->setCurrentItem(i);
}
@@ -174,5 +174,5 @@ ModemWidget::ModemWidget( QWidget *parent, const char *name)
modemlockfile = new QCheckBox(i18n("&Use lock file"), this);
- modemlockfile->setChecked(gpppdata.modemLockFile());
+ modemlockfile->setChecked(PPPData::data()->modemLockFile());
connect(modemlockfile, SIGNAL(toggled(bool)),
SLOT(modemlockfilechanged(bool)));
@@ -192,5 +192,5 @@ ModemWidget::ModemWidget( QWidget *parent, const char *name)
// Modem Timeout Line Edit Box
- modemtimeout = new KIntNumInput(gpppdata.modemTimeout(), this);
+ modemtimeout = new KIntNumInput(PPPData::data()->modemTimeout(), this);
modemtimeout->setLabel(i18n("Modem &timeout:"));
modemtimeout->setRange(1, 120, 1);
@@ -207,15 +207,15 @@ ModemWidget::ModemWidget( QWidget *parent, const char *name)
//set stuff from gpppdata
for(int i=0; i <= enter->count()-1; i++) {
- if(gpppdata.enter() == enter->text(i))
+ if(PPPData::data()->enter() == enter->text(i))
enter->setCurrentItem(i);
}
for(int i=0; i <= modemdevice->count()-1; i++) {
- if(gpppdata.modemDevice() == modemdevice->text(i))
+ if(PPPData::data()->modemDevice() == modemdevice->text(i))
modemdevice->setCurrentItem(i);
}
for(int i=0; i <= flowcontrol->count()-1; i++) {
- if(gpppdata.flowcontrol() == flowcontrol->text(i))
+ if(PPPData::data()->flowcontrol() == flowcontrol->text(i))
flowcontrol->setCurrentItem(i);
}
@@ -223,5 +223,5 @@ ModemWidget::ModemWidget( QWidget *parent, const char *name)
//set the modem speed
for(int i=0; i < baud_c->count(); i++)
- if(baud_c->text(i) == gpppdata.speed())
+ if(baud_c->text(i) == PPPData::data()->speed())
baud_c->setCurrentItem(i);
@@ -231,30 +231,30 @@ ModemWidget::ModemWidget( QWidget *parent, const char *name)
void ModemWidget::speed_selection(int) {
- gpppdata.setSpeed(baud_c->text(baud_c->currentItem()));
+ PPPData::data()->setSpeed(baud_c->text(baud_c->currentItem()));
}
void ModemWidget::setenter(int ) {
- gpppdata.setEnter(enter->text(enter->currentItem()));
+ PPPData::data()->setEnter(enter->text(enter->currentItem()));
}
void ModemWidget::setmodemdc(int i) {
- gpppdata.setModemDevice(modemdevice->text(i));
+ PPPData::data()->setModemDevice(modemdevice->text(i));
}
void ModemWidget::setflowcontrol(int i) {
- gpppdata.setFlowcontrol(flowcontrol->text(i));
+ PPPData::data()->setFlowcontrol(flowcontrol->text(i));
}
void ModemWidget::modemlockfilechanged(bool set) {
- gpppdata.setModemLockFile(set);
+ PPPData::data()->setModemLockFile(set);
}
void ModemWidget::modemtimeoutchanged(int n) {
- gpppdata.setModemTimeout(n);
+ PPPData::data()->setModemTimeout(n);
}
@@ -267,5 +267,5 @@ ModemWidget2::ModemWidget2( QWidget *parent, const char *name)
waitfordt = new QCheckBox(i18n("&Wait for dial tone before dialing"), this);
- waitfordt->setChecked(gpppdata.waitForDialTone());
+ waitfordt->setChecked(PPPData::data()->waitForDialTone());
connect(waitfordt, SIGNAL(toggled(bool)), SLOT(waitfordtchanged(bool)));
l1->addWidget(waitfordt);
@@ -279,5 +279,5 @@ ModemWidget2::ModemWidget2( QWidget *parent, const char *name)
"<b>Default:</b>: On"));
- busywait = new KIntNumInput(gpppdata.busyWait(), this);
+ busywait = new KIntNumInput(PPPData::data()->busyWait(), this);
busywait->setLabel(i18n("B&usy wait:"));
busywait->setRange(0, 300, 5, true);
@@ -302,5 +302,5 @@ ModemWidget2::ModemWidget2( QWidget *parent, const char *name)
QLabel *volumeLabel = new QLabel(i18n("Modem &volume:"), this);
hbl->addWidget(volumeLabel);
- volume = new QSlider(0, 2, 1, gpppdata.volume(), QSlider::Horizontal, this);
+ volume = new QSlider(0, 2, 1, PPPData::data()->volume(), QSlider::Horizontal, this);
volumeLabel->setBuddy(volume);
volume->setTickmarks(QSlider::Below);
@@ -326,5 +326,5 @@ ModemWidget2::ModemWidget2( QWidget *parent, const char *name)
#if 0
chkbox1 = new QCheckBox(i18n("Modem asserts CD line"), this);
- chkbox1->setChecked(gpppdata.UseCDLine());
+ chkbox1->setChecked(PPPData::data()->UseCDLine());
connect(chkbox1,SIGNAL(toggled(bool)),
this,SLOT(use_cdline_toggled(bool)));
@@ -403,19 +403,19 @@ void ModemWidget2::query_modem() {
#if 0
void ModemWidget2::use_cdline_toggled(bool on) {
- gpppdata.setUseCDLine(on);
+ PPPData::data()->setUseCDLine(on);
}
#endif
void ModemWidget2::waitfordtchanged(bool b) {
- gpppdata.setWaitForDialTone((int)b);
+ PPPData::data()->setWaitForDialTone((int)b);
}
void ModemWidget2::busywaitchanged(int n) {
- gpppdata.setbusyWait(n);
+ PPPData::data()->setbusyWait(n);
}
void ModemWidget2::volumeChanged(int v) {
- gpppdata.setVolume(v);
+ PPPData::data()->setVolume(v);
}
diff --git a/noncore/settings/networksettings/ppp/kpppwidget.cpp b/noncore/settings/networksettings/ppp/kpppwidget.cpp
index 2f9feda..8d70cd4 100644
--- a/noncore/settings/networksettings/ppp/kpppwidget.cpp
+++ b/noncore/settings/networksettings/ppp/kpppwidget.cpp
@@ -159,5 +159,5 @@ KPPPWidget::KPPPWidget( QWidget *parent, const char *name, bool modal, WFlags fl
// connect(log, SIGNAL(toggled(bool)),
// this, SLOT(log_window_toggled(bool)));
-// log->setChecked(gpppdata.get_show_log_window());
+// log->setChecked(PPPData::data()->get_show_log_window());
// l3->addWidget(log);
@@ -192,5 +192,5 @@ KPPPWidget::KPPPWidget( QWidget *parent, const char *name, bool modal, WFlags fl
-// if(gpppdata.access() != KConfig::ReadWrite)
+// if(PPPData::data()->access() != KConfig::ReadWrite)
// setup_b->setEnabled(false);
@@ -292,5 +292,5 @@ KPPPWidget::KPPPWidget( QWidget *parent, const char *name, bool modal, WFlags fl
// if(m_bCmdlAccount){
-// bool result = gpppdata.setAccount(m_strCmdlAccount);
+// bool result = PPPData::data()->setAccount(m_strCmdlAccount);
// if (!result){
// QString string;
@@ -364,5 +364,5 @@ void KPPPWidget::enterPressedInPW() {
// triggered by the session manager
void KPPPWidget::saveMyself() {
- gpppdata.save();
+ PPPData::data()->save();
}
@@ -373,5 +373,5 @@ void KPPPWidget::shutDown() {
void KPPPWidget::log_window_toggled(bool on) {
- gpppdata.set_show_log_window(on);
+ PPPData::data()->set_show_log_window(on);
}
@@ -382,5 +382,5 @@ void KPPPWidget::log_window_toggled(bool on) {
// connectto_c->clear();
-// int count = gpppdata.count();
+// int count = PPPData::data()->count();
// // enable/disable controls
@@ -393,25 +393,25 @@ void KPPPWidget::log_window_toggled(bool on) {
// //load the accounts
// for(int i=0; i < count; i++) {
-// gpppdata.setAccountbyIndex(i);
-// connectto_c->insertItem(gpppdata.accname());
+// PPPData::data()->setAccountbyIndex(i);
+// connectto_c->insertItem(PPPData::data()->accname());
// }
// //set the default account
-// if(!gpppdata.defaultAccount().isEmpty()) {
+// if(!PPPData::data()->defaultAccount().isEmpty()) {
// for(int i=0; i < count; i++)
-// if(gpppdata.defaultAccount() == connectto_c->text(i)) {
+// if(PPPData::data()->defaultAccount() == connectto_c->text(i)) {
// connectto_c->setCurrentItem(i);
-// gpppdata.setAccountbyIndex(i);
+// PPPData::data()->setAccountbyIndex(i);
-// ID_Edit->setText(gpppdata.storedUsername());
-// PW_Edit->setText(gpppdata.storedPassword());
+// ID_Edit->setText(PPPData::data()->storedUsername());
+// PW_Edit->setText(PPPData::data()->storedPassword());
// }
// }
// else
// if(count > 0) {
-// gpppdata.setDefaultAccount(connectto_c->text(0));
-// gpppdata.save();
-// ID_Edit->setText(gpppdata.storedUsername());
-// PW_Edit->setText(gpppdata.storedPassword());
+// PPPData::data()->setDefaultAccount(connectto_c->text(0));
+// PPPData::data()->save();
+// ID_Edit->setText(PPPData::data()->storedUsername());
+// PW_Edit->setText(PPPData::data()->storedPassword());
// }
@@ -435,5 +435,5 @@ void KPPPWidget::interruptConnection() {
// disconnect if online
- if (gpppdata.pppdRunning())
+ if (PPPData::data()->pppdRunning())
emit disconnect();
}
@@ -446,5 +446,5 @@ void KPPPWidget::sigPPPDDied() {
// in the followin line to make sure that we don't raise a false alarm
// such as would be the case when the log file viewer exits.
- if(gpppdata.pppdRunning() || gpppdata.pppdError()) {
+ if(PPPData::data()->pppdRunning() || PPPData::data()->pppdError()) {
qDebug( "It was pppd that died" );
@@ -458,9 +458,9 @@ void KPPPWidget::sigPPPDDied() {
Modem::modem->removeSecret(AUTH_CHAP);
- gpppdata.setpppdRunning(false);
+ PPPData::data()->setpppdRunning(false);
qDebug( "Executing command on disconnect since pppd has died." );
QApplication::flushX();
- execute_command(gpppdata.command_on_disconnect());
+ execute_command(PPPData::data()->command_on_disconnect());
// stopAccounting();
@@ -470,11 +470,11 @@ void KPPPWidget::sigPPPDDied() {
// DockWidget::dock_widget->hide();
- if(!gpppdata.pppdError())
- gpppdata.setpppdError(E_PPPD_DIED);
+ if(!PPPData::data()->pppdError())
+ PPPData::data()->setpppdError(E_PPPD_DIED);
removedns();
Modem::modem->unlockdevice();
// con->pppdDied();
- if(!gpppdata.automatic_redial()) {
+ if(!PPPData::data()->automatic_redial()) {
quit_b->setFocus();
show();
@@ -484,8 +484,8 @@ void KPPPWidget::sigPPPDDied() {
// con->hide();
- gpppdata.setpppdRunning(false);
+ PPPData::data()->setpppdRunning(false);
// // not in a signal handler !!! KNotifyClient::beep();
QString msg;
- if (gpppdata.pppdError() == E_IF_TIMEOUT)
+ if (PPPData::data()->pppdError() == E_IF_TIMEOUT)
msg = i18n("Timeout expired while waiting for the PPP interface "
"to come up!");
@@ -508,20 +508,20 @@ void KPPPWidget::sigPPPDDied() {
qDebug( "Trying to reconnect... " );
- if(gpppdata.authMethod() == AUTH_PAP ||
- gpppdata.authMethod() == AUTH_CHAP ||
- gpppdata.authMethod() == AUTH_PAPCHAP)
- Modem::modem->setSecret(gpppdata.authMethod(),
- encodeWord(gpppdata.storedUsername()),
- encodeWord(gpppdata.password()));
+ if(PPPData::data()->authMethod() == AUTH_PAP ||
+ PPPData::data()->authMethod() == AUTH_CHAP ||
+ PPPData::data()->authMethod() == AUTH_PAPCHAP)
+ Modem::modem->setSecret(PPPData::data()->authMethod(),
+ encodeWord(PPPData::data()->storedUsername()),
+ encodeWord(PPPData::data()->password()));
// con_win->hide();
// con_win->stopClock();
// stopAccounting();
- gpppdata.setpppdRunning(false);
+ PPPData::data()->setpppdRunning(false);
// not in a signal handler !!! KNotifyClient::beep();
emit cmdl_start();
}
}
- gpppdata.setpppdError(0);
+ PPPData::data()->setpppdError(0);
}
}
@@ -544,8 +544,8 @@ void KPPPWidget::sigPPPDDied() {
void KPPPWidget::newdefaultaccount(int i) {
- gpppdata.setDefaultAccount(connectto_c->text(i));
- gpppdata.save();
- ID_Edit->setText(gpppdata.storedUsername());
- PW_Edit->setText(gpppdata.storedPassword());
+ PPPData::data()->setDefaultAccount(connectto_c->text(i));
+ PPPData::data()->save();
+ ID_Edit->setText(PPPData::data()->storedUsername());
+ PW_Edit->setText(PPPData::data()->storedPassword());
}
@@ -557,8 +557,8 @@ void KPPPWidget::beginConnect() {
// (exeption: an account given by a command line argument)
// if(!m_bCmdlAccount) {
-// gpppdata.setAccount(connectto_c->currentText());
-// gpppdata.setPassword(PW_Edit->text());
+// PPPData::data()->setAccount(connectto_c->currentText());
+// PPPData::data()->setPassword(PW_Edit->text());
// } else {
- gpppdata.setPassword(gpppdata.storedPassword());
+ PPPData::data()->setPassword(PPPData::data()->storedPassword());
// }
@@ -578,5 +578,5 @@ void KPPPWidget::beginConnect() {
"Please make sure that you have given kppp "
"setuid permission and that "
- "pppd is executable.").arg(gpppdata.pppdPath());
+ "pppd is executable.").arg(PPPData::data()->pppdPath());
KMessageBox::error(this, string);
return;
@@ -585,5 +585,5 @@ void KPPPWidget::beginConnect() {
#endif
- QFileInfo info2(gpppdata.modemDevice());
+ QFileInfo info2(PPPData::data()->modemDevice());
if(!info2.exists()){
@@ -593,5 +593,5 @@ void KPPPWidget::beginConnect() {
"and/or adjust the location of the modem device on "
"the modem tab of "
- "the setup dialog.").arg(gpppdata.modemDevice());
+ "the setup dialog.").arg(PPPData::data()->modemDevice());
QMessageBox::warning(this, "error", string);
return;
@@ -600,7 +600,7 @@ void KPPPWidget::beginConnect() {
// if this is a PAP or CHAP account, ensure that username is
// supplied
- if(gpppdata.authMethod() == AUTH_PAP ||
- gpppdata.authMethod() == AUTH_CHAP ||
- gpppdata.authMethod() == AUTH_PAPCHAP ) {
+ if(PPPData::data()->authMethod() == AUTH_PAP ||
+ PPPData::data()->authMethod() == AUTH_CHAP ||
+ PPPData::data()->authMethod() == AUTH_PAPCHAP ) {
if(ID_Edit->text().isEmpty()) {
QMessageBox::warning(this,"error",
@@ -611,7 +611,7 @@ void KPPPWidget::beginConnect() {
return;
} else {
- if(!Modem::modem->setSecret(gpppdata.authMethod(),
- encodeWord(gpppdata.storedUsername()),
- encodeWord(gpppdata.password()))) {
+ if(!Modem::modem->setSecret(PPPData::data()->authMethod(),
+ encodeWord(PPPData::data()->storedUsername()),
+ encodeWord(PPPData::data()->password()))) {
QString s;
s = i18n("Cannot create PAP/CHAP authentication\n"
@@ -623,5 +623,5 @@ void KPPPWidget::beginConnect() {
}
- if (gpppdata.phonenumber().isEmpty()) {
+ if (PPPData::data()->phonenumber().isEmpty()) {
QString s = i18n("You must specify a telephone number!");
QMessageBox::warning(this, "error", s);
@@ -631,10 +631,10 @@ void KPPPWidget::beginConnect() {
this->hide();
- QString tit = i18n("Connecting to: %1").arg(gpppdata.accname());
+ QString tit = i18n("Connecting to: %1").arg(PPPData::data()->accname());
// con->setCaption(tit);
// con->show();
- bool show_debug = gpppdata.get_show_log_window();
+ bool show_debug = PPPData::data()->get_show_log_window();
// con->debug->setOn(show_debug); // toggle button
debugwindow->clear();
@@ -651,5 +651,5 @@ void KPPPWidget::beginConnect() {
void KPPPWidget::disconnect() {
- if (!gpppdata.command_before_disconnect().isEmpty()) {
+ if (!PPPData::data()->command_before_disconnect().isEmpty()) {
// con_win->hide();
// con->show();
@@ -660,5 +660,5 @@ void KPPPWidget::disconnect() {
QApplication::flushX();
// pid_t id =
- execute_command(gpppdata.command_before_disconnect());
+ execute_command(PPPData::data()->command_before_disconnect());
// int i, status;
@@ -678,5 +678,5 @@ void KPPPWidget::disconnect() {
QApplication::flushX();
- execute_command(gpppdata.command_on_disconnect());
+ execute_command(PPPData::data()->command_on_disconnect());
Modem::modem->removeSecret(AUTH_PAP);
@@ -708,5 +708,5 @@ void KPPPWidget::disconnect() {
void KPPPWidget::quitbutton() {
- if(gpppdata.pppdRunning()) {
+ if(PPPData::data()->pppdRunning()) {
int ok = QMessageBox::warning(this,
i18n("Exiting kPPP will close your PPP Session."),
@@ -715,13 +715,13 @@ void KPPPWidget::quitbutton() {
Modem::modem->killPPPDaemon();
QApplication::flushX();
- execute_command(gpppdata.command_on_disconnect());
+ execute_command(PPPData::data()->command_on_disconnect());
removedns();
Modem::modem->unlockdevice();
}
} else {
- if (!gpppdata.accname().isEmpty() && !gpppdata.storePassword())
- gpppdata.setStoredPassword("");
+ if (!PPPData::data()->accname().isEmpty() && !PPPData::data()->storePassword())
+ PPPData::data()->setStoredPassword("");
}
- gpppdata.save();
+ PPPData::data()->save();
qApp->quit();
}
@@ -737,11 +737,11 @@ void KPPPWidget::quitbutton() {
// stats->totalbytes = 0;
-// kdDebug() << "AcctEnabled: " << gpppdata.AcctEnabled() << endl;
+// kdDebug() << "AcctEnabled: " << PPPData::data()->AcctEnabled() << endl;
// // load the ruleset
-// if(!gpppdata.AcctEnabled())
+// if(!PPPData::data()->AcctEnabled())
// return;
-// QString d = AccountingBase::getAccountingFile(gpppdata.accountingFile());
+// QString d = AccountingBase::getAccountingFile(PPPData::data()->accountingFile());
// // if(::access(d.data(), X_OK) != 0)
// acct = new Accounting(this, stats);
@@ -753,7 +753,7 @@ void KPPPWidget::quitbutton() {
// con_win, SLOT(slotAccounting(QString, QString)));
-// // if(!acct->loadRuleSet(gpppdata.accountingFile())) {
+// // if(!acct->loadRuleSet(PPPData::data()->accountingFile())) {
// // QString s= i18n("Can not load the accounting "
-// // "ruleset \"%1\"!").arg(gpppdata.accountingFile());
+// // "ruleset \"%1\"!").arg(PPPData::data()->accountingFile());
// // starting the messagebox with a timer will prevent us
@@ -770,7 +770,7 @@ void KPPPWidget::quitbutton() {
// // store volume accounting
// // if(stats->totalbytes != 0)
-// // gpppdata.setTotalBytes(stats->totalbytes);
+// // PPPData::data()->setTotalBytes(stats->totalbytes);
-// if(!gpppdata.AcctEnabled())
+// if(!PPPData::data()->AcctEnabled())
// return;
@@ -793,5 +793,5 @@ void KPPPWidget::quitbutton() {
void KPPPWidget::usernameChanged(const QString &) {
// store username for later use
- gpppdata.setStoredUsername(ID_Edit->text());
+ PPPData::data()->setStoredUsername(ID_Edit->text());
}
@@ -799,8 +799,8 @@ void KPPPWidget::usernameChanged(const QString &) {
void KPPPWidget::passwordChanged(const QString &) {
// store the password if so requested
- if(gpppdata.storePassword())
- gpppdata.setStoredPassword(PW_Edit->text());
+ if(PPPData::data()->storePassword())
+ PPPData::data()->setStoredPassword(PW_Edit->text());
else
- gpppdata.setStoredPassword("");
+ PPPData::data()->setStoredPassword("");
}
@@ -842,5 +842,5 @@ void KPPPWidget::showNews() {
*/
#define QUICKHELP_HINT "Hint_QuickHelp"
- if(gpppdata.readNumConfig(GENERAL_GRP, QUICKHELP_HINT, 0) == 0) {
+ if(PPPData::data()->readNumConfig(GENERAL_GRP, QUICKHELP_HINT, 0) == 0) {
QDialog dlg(0, 0, true);
dlg.setCaption(i18n("Recent Changes in KPPP"));
@@ -894,6 +894,6 @@ void KPPPWidget::showNews() {
dlg.exec();
if(cb->isChecked()) {
- gpppdata.writeConfig(GENERAL_GRP, QUICKHELP_HINT, 1);
- gpppdata.save();
+ PPPData::data()->writeConfig(GENERAL_GRP, QUICKHELP_HINT, 1);
+ PPPData::data()->save();
}
}
diff --git a/noncore/settings/networksettings/ppp/modem.cpp b/noncore/settings/networksettings/ppp/modem.cpp
index a2f77c5..cd5d21c 100644
--- a/noncore/settings/networksettings/ppp/modem.cpp
+++ b/noncore/settings/networksettings/ppp/modem.cpp
@@ -102,5 +102,5 @@ speed_t Modem::modemspeed() {
// to set the modem. The constants here should all be ifdef'd because
// other systems may not have them
- int i = gpppdata.speed().toInt()/100;
+ int i = PPPData::data()->speed().toInt()/100;
switch(i) {
@@ -152,5 +152,5 @@ bool Modem::opentty() {
//begin if((modemfd = Requester::rq->openModem(gpppdata.modemDevice()))<0) {
close(modemfd);
-// device = "/dev/modem";//deviceByIndex(request.modem.deviceNum);
+ device = PPPData::data()->modemDevice();
if ((modemfd = open(device, O_RDWR|O_NDELAY|O_NOCTTY)) == -1) {
qDebug("error opening modem device !");
@@ -162,5 +162,5 @@ bool Modem::opentty() {
#if 0
- if(gpppdata.UseCDLine()) {
+ if(PPPData::data()->UseCDLine()) {
if(ioctl(modemfd, TIOCMGET, &flags) == -1) {
errmsg = i18n("Unable to detect state of CD line.");
@@ -210,6 +210,6 @@ bool Modem::opentty() {
- if(gpppdata.flowcontrol() != "None") {
- if(gpppdata.flowcontrol() == "CRTSCTS") {
+ if(PPPData::data()->flowcontrol() != "None") {
+ if(PPPData::data()->flowcontrol() == "CRTSCTS") {
tty.c_cflag |= CRTSCTS;
}
@@ -340,5 +340,5 @@ bool Modem::writeLine(const char *buf) {
memcpy(b, buf, len);
// different modems seem to need different line terminations
- QString term = gpppdata.enter();
+ QString term = PPPData::data()->enter();
if(term == "LF")
b[len++]='\n';
@@ -380,7 +380,7 @@ bool Modem::hangup() {
// Then hangup command
- writeLine(gpppdata.modemHangupStr().local8Bit());
+ writeLine(PPPData::data()->modemHangupStr().local8Bit());
- usleep(gpppdata.modemInitDelay() * 10000); // 0.01 - 3.0 sec
+ usleep(PPPData::data()->modemInitDelay() * 10000); // 0.01 - 3.0 sec
#ifndef DEBUG_WO_DIALING
@@ -418,5 +418,5 @@ bool Modem::hangup() {
#endif
- usleep(gpppdata.modemInitDelay() * 10000); // 0.01 - 3.0 secs
+ usleep(PPPData::data()->modemInitDelay() * 10000); // 0.01 - 3.0 secs
cfsetospeed(&temptty, modemspeed());
@@ -441,9 +441,9 @@ void Modem::escape_to_command_mode() {
// +3 because quiet time must be greater than guard time.
- usleep((gpppdata.modemEscapeGuardTime()+3)*20000);
- QCString tmp = gpppdata.modemEscapeStr().local8Bit();
+ usleep((PPPData::data()->modemEscapeGuardTime()+3)*20000);
+ QCString tmp = PPPData::data()->modemEscapeStr().local8Bit();
write(modemfd, tmp.data(), tmp.length());
tcflush(modemfd, TCIOFLUSH);
- usleep((gpppdata.modemEscapeGuardTime()+3)*20000);
+ usleep((PPPData::data()->modemEscapeGuardTime()+3)*20000);
data_mode = false;
@@ -561,5 +561,5 @@ int Modem::lockdevice() {
char newlock[80]=""; // safe
- if(!gpppdata.modemLockFile()) {
+ if(!PPPData::data()->modemLockFile()) {
qDebug("The user doesn't want a lockfile.");
return 0;
@@ -570,5 +570,5 @@ int Modem::lockdevice() {
QString lockfile = LOCK_DIR"/LCK..";
- lockfile += gpppdata.modemDevice().mid(5); // append everything after /dev/
+ lockfile += PPPData::data()->modemDevice().mid(5); // append everything after /dev/
if(access(QFile::encodeName(lockfile), F_OK) == 0) {
@@ -601,5 +601,5 @@ if ((fd = openLockfile(QFile::encodeName(lockfile), O_RDONLY)) >= 0) {
}
- fd = openLockfile(gpppdata.modemDevice(),O_WRONLY|O_TRUNC|O_CREAT);
+ fd = openLockfile(PPPData::data()->modemDevice(),O_WRONLY|O_TRUNC|O_CREAT);
if(fd >= 0) {
sprintf(newlock,"%010d\n", getpid());
diff --git a/noncore/settings/networksettings/ppp/modemcmds.cpp b/noncore/settings/networksettings/ppp/modemcmds.cpp
index 766ba0f..65032e8 100644
--- a/noncore/settings/networksettings/ppp/modemcmds.cpp
+++ b/noncore/settings/networksettings/ppp/modemcmds.cpp
@@ -45,7 +45,4 @@ ModemCommands::ModemCommands(QWidget *parent, const char *name)
{
setCaption(i18n("Edit Modem Commands"));
-// KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon());
- QWidget *dummyWidget = new QWidget(this);
-// setMainWidget(dummyWidget);
const int GRIDROWS = 22;
@@ -244,71 +241,71 @@ ModemCommands::ModemCommands(QWidget *parent, const char *name)
//set stuff from gpppdata
- preinitslider->setValue(gpppdata.modemPreInitDelay());
- lpreinitslider->setNum(gpppdata.modemPreInitDelay());
+ preinitslider->setValue(PPPData::data()->modemPreInitDelay());
+ lpreinitslider->setNum(PPPData::data()->modemPreInitDelay());
for(int i = 0; i < PPPData::NumInitStrings; i++)
- initstr[i]->setText(gpppdata.modemInitStr(i));
- initslider->setValue(gpppdata.modemInitDelay());
- linitslider->setNum(gpppdata.modemInitDelay());
- initresp->setText(gpppdata.modemInitResp());
+ initstr[i]->setText(PPPData::data()->modemInitStr(i));
+ initslider->setValue(PPPData::data()->modemInitDelay());
+ linitslider->setNum(PPPData::data()->modemInitDelay());
+ initresp->setText(PPPData::data()->modemInitResp());
- durationslider->setValue(gpppdata.modemToneDuration());
- ldurationslider->setNum(gpppdata.modemToneDuration());
+ durationslider->setValue(PPPData::data()->modemToneDuration());
+ ldurationslider->setNum(PPPData::data()->modemToneDuration());
- nodetectdialtone->setText(gpppdata.modemNoDialToneDetectionStr());
- dialstr->setText(gpppdata.modemDialStr());
- connectresp->setText(gpppdata.modemConnectResp());
- busyresp->setText(gpppdata.modemBusyResp());
- nocarrierresp->setText(gpppdata.modemNoCarrierResp());
- nodialtoneresp->setText(gpppdata.modemNoDialtoneResp());
+ nodetectdialtone->setText(PPPData::data()->modemNoDialToneDetectionStr());
+ dialstr->setText(PPPData::data()->modemDialStr());
+ connectresp->setText(PPPData::data()->modemConnectResp());
+ busyresp->setText(PPPData::data()->modemBusyResp());
+ nocarrierresp->setText(PPPData::data()->modemNoCarrierResp());
+ nodialtoneresp->setText(PPPData::data()->modemNoDialtoneResp());
- escapestr->setText(gpppdata.modemEscapeStr());
- escaperesp->setText(gpppdata.modemEscapeResp());
+ escapestr->setText(PPPData::data()->modemEscapeStr());
+ escaperesp->setText(PPPData::data()->modemEscapeResp());
- hangupstr->setText(gpppdata.modemHangupStr());
- hangupresp->setText(gpppdata.modemHangupResp());
+ hangupstr->setText(PPPData::data()->modemHangupStr());
+ hangupresp->setText(PPPData::data()->modemHangupResp());
- answerstr->setText(gpppdata.modemAnswerStr());
- ringresp->setText(gpppdata.modemRingResp());
- answerresp->setText(gpppdata.modemAnswerResp());
+ answerstr->setText(PPPData::data()->modemAnswerStr());
+ ringresp->setText(PPPData::data()->modemRingResp());
+ answerresp->setText(PPPData::data()->modemAnswerResp());
- slider->setValue(gpppdata.modemEscapeGuardTime());
- lslider->setNum(gpppdata.modemEscapeGuardTime());
+ slider->setValue(PPPData::data()->modemEscapeGuardTime());
+ lslider->setNum(PPPData::data()->modemEscapeGuardTime());
- volume_off->setText(gpppdata.volumeOff());
- volume_medium->setText(gpppdata.volumeMedium());
- volume_high->setText(gpppdata.volumeHigh());
+ volume_off->setText(PPPData::data()->volumeOff());
+ volume_medium->setText(PPPData::data()->volumeMedium());
+ volume_high->setText(PPPData::data()->volumeHigh());
}
void ModemCommands::slotOk() {
- gpppdata.setModemPreInitDelay(lpreinitslider->text().toInt());
+ PPPData::data()->setModemPreInitDelay(lpreinitslider->text().toInt());
for(int i = 0; i < PPPData::NumInitStrings; i++)
- gpppdata.setModemInitStr(i, initstr[i]->text());
- gpppdata.setModemInitResp(initresp->text());
- gpppdata.setModemInitDelay(linitslider->text().toInt());
-
- gpppdata.setModemToneDuration(ldurationslider->text().toInt());
- gpppdata.setModemNoDialToneDetectionStr(nodetectdialtone->text());
- gpppdata.setModemDialStr(dialstr->text());
- gpppdata.setModemConnectResp(connectresp->text());
- gpppdata.setModemBusyResp(busyresp->text());
- gpppdata.setModemNoCarrierResp(nocarrierresp->text());
- gpppdata.setModemNoDialtoneResp(nodialtoneresp->text());
-
- gpppdata.setModemEscapeStr(escapestr->text());
- gpppdata.setModemEscapeResp(escaperesp->text());
- gpppdata.setModemEscapeGuardTime(lslider->text().toInt());
- gpppdata.setModemHangupStr(hangupstr->text());
- gpppdata.setModemHangupResp(hangupresp->text());
-
- gpppdata.setModemAnswerStr(answerstr->text());
- gpppdata.setModemRingResp(ringresp->text());
- gpppdata.setModemAnswerResp(answerresp->text());
-
- gpppdata.setVolumeHigh(volume_high->text());
- gpppdata.setVolumeMedium(volume_medium->text());
- gpppdata.setVolumeOff(volume_off->text());
-
- gpppdata.save();
+ PPPData::data()->setModemInitStr(i, initstr[i]->text());
+ PPPData::data()->setModemInitResp(initresp->text());
+ PPPData::data()->setModemInitDelay(linitslider->text().toInt());
+
+ PPPData::data()->setModemToneDuration(ldurationslider->text().toInt());
+ PPPData::data()->setModemNoDialToneDetectionStr(nodetectdialtone->text());
+ PPPData::data()->setModemDialStr(dialstr->text());
+ PPPData::data()->setModemConnectResp(connectresp->text());
+ PPPData::data()->setModemBusyResp(busyresp->text());
+ PPPData::data()->setModemNoCarrierResp(nocarrierresp->text());
+ PPPData::data()->setModemNoDialtoneResp(nodialtoneresp->text());
+
+ PPPData::data()->setModemEscapeStr(escapestr->text());
+ PPPData::data()->setModemEscapeResp(escaperesp->text());
+ PPPData::data()->setModemEscapeGuardTime(lslider->text().toInt());
+ PPPData::data()->setModemHangupStr(hangupstr->text());
+ PPPData::data()->setModemHangupResp(hangupresp->text());
+
+ PPPData::data()->setModemAnswerStr(answerstr->text());
+ PPPData::data()->setModemRingResp(ringresp->text());
+ PPPData::data()->setModemAnswerResp(answerresp->text());
+
+ PPPData::data()->setVolumeHigh(volume_high->text());
+ PPPData::data()->setVolumeMedium(volume_medium->text());
+ PPPData::data()->setVolumeOff(volume_off->text());
+
+ PPPData::data()->save();
accept();
}
diff --git a/noncore/settings/networksettings/ppp/newwidget.cpp b/noncore/settings/networksettings/ppp/newwidget.cpp
deleted file mode 100644
index d2182fb..0000000
--- a/noncore/settings/networksettings/ppp/newwidget.cpp
+++ b/dev/null
@@ -1,17 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-//
-// functions generating layout-aware widgets
-//
-/////////////////////////////////////////////////////////////////////////////
-
-#include "newwidget.h"
-
-QLineEdit *newLineEdit(int visiblewidth, QWidget *parent) {
- QLineEdit *l = new QLineEdit(parent);
- if(visiblewidth == 0)
- l->setMinimumWidth(l->sizeHint().width());
- else
- l->setFixedWidth(l->fontMetrics().width('H') * visiblewidth);
-
- return l;
-}
diff --git a/noncore/settings/networksettings/ppp/newwidget.h b/noncore/settings/networksettings/ppp/newwidget.h
deleted file mode 100644
index 52f2ec7..0000000
--- a/noncore/settings/networksettings/ppp/newwidget.h
+++ b/dev/null
@@ -1,19 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-//
-// functions generating layout-aware widgets
-//
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __NEWWIDGET__H__
-#define __NEWWIDGET__H__
-
-#include <qwidget.h>
-#include <qlineedit.h>
-
-#define L_FIXEDW 1
-#define L_FIXEDH 2
-#define L_FIXED (L_FIXEDW | L_FIXEDH)
-
-QLineEdit *newLineEdit(int visiblewidth, QWidget *parent);
-
-#endif
diff --git a/noncore/settings/networksettings/ppp/ppp.pro b/noncore/settings/networksettings/ppp/ppp.pro
index a456427..ebfc713 100644
--- a/noncore/settings/networksettings/ppp/ppp.pro
+++ b/noncore/settings/networksettings/ppp/ppp.pro
@@ -5,6 +5,6 @@ TEMPLATE = lib
CONFIG += qt warn_on debug
DESTDIR = $(OPIEDIR)/plugins/networksettings
-HEADERS = pppmodule.h devices.h modem.h modeminfo.h pppdata.h kpppconfig.h pppdata.h runtests.h general.h modemcmds.h knuminput.h knumvalidator.h kpppwidget.h conwindow.h debug.h accounts.h connect.h edit.h scriptedit.h pppdargs.h newwidget.h iplined.h pwentry.h pppconfig.h
-SOURCES = pppmodule.cpp modem.cpp modeminfo.cpp pppdata.cpp runtests.cpp general.cpp modemcmds.cpp knuminput.cpp knumvalidator.cpp kpppwidget.cpp conwindow.cpp debug.cpp accounts.cpp connect.cpp edit.cpp scriptedit.cpp pppdargs.cpp newwidget.cpp iplined.cpp pwentry.cpp pppconfig.cpp
+HEADERS = pppmodule.h devices.h modem.h modeminfo.h pppdata.h kpppconfig.h pppdata.h runtests.h general.h modemcmds.h knuminput.h knumvalidator.h kpppwidget.h conwindow.h debug.h accounts.h connect.h edit.h scriptedit.h pppdargs.h iplined.h pwentry.h pppconfig.h
+SOURCES = pppmodule.cpp modem.cpp modeminfo.cpp pppdata.cpp runtests.cpp general.cpp modemcmds.cpp knuminput.cpp knumvalidator.cpp kpppwidget.cpp conwindow.cpp debug.cpp accounts.cpp connect.cpp edit.cpp scriptedit.cpp pppdargs.cpp iplined.cpp pwentry.cpp pppconfig.cpp
INCLUDEPATH += $(OPIEDIR)/include ../ ../interfaces/
DEPENDPATH += $(OPIEDIR)/include
diff --git a/noncore/settings/networksettings/ppp/pppconfig.cpp b/noncore/settings/networksettings/ppp/pppconfig.cpp
index 7b2b21b..c0f1fef 100644
--- a/noncore/settings/networksettings/ppp/pppconfig.cpp
+++ b/noncore/settings/networksettings/ppp/pppconfig.cpp
@@ -51,5 +51,5 @@ PPPConfigWidget::~PPPConfigWidget()
void PPPConfigWidget::accept()
{
- gpppdata.save();
+ PPPData::data()->save();
QDialog::accept();
}
@@ -58,5 +58,5 @@ void PPPConfigWidget::accept()
void PPPConfigWidget::reject()
{
- gpppdata.cancel();
+ PPPData::data()->cancel();
QDialog::reject();
}
diff --git a/noncore/settings/networksettings/ppp/pppdargs.cpp b/noncore/settings/networksettings/ppp/pppdargs.cpp
index 04d0dd0..b7fca3f 100644
--- a/noncore/settings/networksettings/ppp/pppdargs.cpp
+++ b/noncore/settings/networksettings/ppp/pppdargs.cpp
@@ -122,12 +122,12 @@ void PPPdArguments::defaultsbutton() {
// all of this is a hack
// save current list
- QStringList arglist(gpppdata.pppdArgument());
+ QStringList arglist(PPPData::data()->pppdArgument());
// get defaults
- gpppdata.setpppdArgumentDefaults();
+ PPPData::data()->setpppdArgumentDefaults();
init();
// restore old list
- gpppdata.setpppdArgument(arglist);
+ PPPData::data()->setpppdArgument(arglist);
}
@@ -137,5 +137,5 @@ void PPPdArguments::closebutton() {
for(uint i=0; i < arguments->count(); i++)
arglist.append(arguments->text(i));
- gpppdata.setpppdArgument(arglist);
+ PPPData::data()->setpppdArgument(arglist);
done(0);
@@ -147,5 +147,5 @@ void PPPdArguments::init() {
arguments->removeItem(0);
- QStringList &arglist = gpppdata.pppdArgument();
+ QStringList &arglist = PPPData::data()->pppdArgument();
for ( QStringList::Iterator it = arglist.begin();
it != arglist.end();
diff --git a/noncore/settings/networksettings/ppp/pppdata.cpp b/noncore/settings/networksettings/ppp/pppdata.cpp
index f2386fc..646facd 100644
--- a/noncore/settings/networksettings/ppp/pppdata.cpp
+++ b/noncore/settings/networksettings/ppp/pppdata.cpp
@@ -39,9 +39,22 @@
#include <assert.h>
-PPPData gpppdata;
+PPPData *PPPData::_data = 0;
+Config *PPPData::config = 0;
+PPPData* PPPData::data()
+{
+ if (!_data){
+ qDebug("PPPData::data() creates new Instance");
+ _data = new PPPData();
+ }
+ if (!_data->config){
+ qDebug("PPPData::data() opens conffile");
+ _data->open();
+ }
+ return _data;
+}
PPPData::PPPData()
- : config(0L),
+ : //config(0L),
highcount(-1), // start out with no entries
caccount(-1), // set the current account index also
@@ -57,23 +70,7 @@ PPPData::PPPData()
//
bool PPPData::open() {
-
- config = new Config("NetworkSetup");
- /*
- config = kapp->config();
-
- if (config->getConfigState() == KConfig::NoAccess) {
- KMessageBox::error(0L,
- i18n("The application-specific config file could not "
- "be opened in either read-write or read-only mode.\n"
- "The superuser might have to change its ownership "
- "by issuing the following command in your home directory:\n"
- "chown {YourUsername} .kde/share/config/kppprc"),
- kapp->name());
- return false;
- }
-
- // don't expand shell variables
- config->setDollarExpansion(false);
- */
+ qDebug("opening configfile NetworkSetupPPP");
+ if (config) return true;
+ config = new Config("NetworkSetupPPP");
highcount = readNumConfig(GENERAL_GRP, NUMACCOUNTS_KEY, 0) - 1;
@@ -105,5 +102,11 @@ void PPPData::save() {
if (config) {
writeConfig(GENERAL_GRP, NUMACCOUNTS_KEY, count());
-// config->sync();
+ delete config;
+ config = 0;
+ qDebug("worte confi NetworkSetupPPP");
+ }
+ if (_data){
+ delete _data;
+ _data = 0;
}
@@ -124,9 +127,9 @@ void PPPData::cancel() {
-// currently differentiates between READWRITE and NONE only
-int PPPData::access() const {
+// // currently differentiates between READWRITE and NONE only
+// int PPPData::access() const {
- return 0;//config->getConfigState();
-}
+// return 1;//config->getConfigState();
+// }
@@ -135,4 +138,5 @@ QString PPPData::readConfig(const QString &group, const QString &key,
const QString &defvalue = "")
{
+// qDebug("PPPData::readConfig key >%s< group >%s<",key.latin1(), group.latin1());
if (config) {
config->setGroup(group);
@@ -719,12 +723,12 @@ bool PPPData::isUniqueAccname(const QString &n) {
bool PPPData::deleteAccount() {
- if(caccount < 0)
- return false;
+ //FIXME:
+// if(caccount < 0)
+ return false;
// QMap <QString, QString> map;
// QMap <QString, QString>::Iterator it;
- // set all entries of the current account to ""
-// tille: do not handle the accounts here... (?)
+// // set all entries of the current account to ""
// map = config->entryMap(cgroup);
// it = map.begin();
@@ -757,11 +761,11 @@ bool PPPData::deleteAccount() {
// }
- highcount--;
- if(caccount > highcount)
- caccount = highcount;
+// highcount--;
+// if(caccount > highcount)
+// caccount = highcount;
- setAccountbyIndex(caccount);
+// setAccountbyIndex(caccount);
- return true;
+// return true;
}
@@ -779,6 +783,7 @@ bool PPPData::deleteAccount(const QString &aname) {
int PPPData::newaccount() {
- if(!config || highcount >= MAX_ACCOUNTS)
- return -1;
+ qDebug("PPPData::newaccount highcount %i/%i",highcount,MAX_ACCOUNTS);
+ if(!config) open();
+ if (highcount >= MAX_ACCOUNTS) return -1;
highcount++;
@@ -786,5 +791,5 @@ int PPPData::newaccount() {
setpppdArgumentDefaults();
-
+ qDebug("PPPData::newaccount -> %i",caccount);
return caccount;
}
@@ -792,24 +797,24 @@ int PPPData::newaccount() {
int PPPData::copyaccount(int i) {
- if(highcount >= MAX_ACCOUNTS)
+// if(highcount >= MAX_ACCOUNTS)
return -1;
- setAccountbyIndex(i);
+// setAccountbyIndex(i);
-// QMap <QString, QString> map = config->entryMap(cgroup);
-// QMap <QString, QString>::ConstIterator it = map.begin();
+// QMap <QString, QString> map = config->entryMap(cgroup);
+// QMap <QString, QString>::ConstIterator it = map.begin();
- QString newname = i18n("%1_copy").arg(accname());
+// QString newname = i18n("%1_copy").arg(accname());
- newaccount();
+// newaccount();
-// while (it != map.end()) {
-// config->writeEntry(it.key(), *it);
-// it++;
-// }
+// while (it != map.end()) {
+// config->writeEntry(it.key(), *it);
+// it++;
+// }
- setAccname(newname);
+// setAccname(newname);
- return caccount;
+// return caccount;
}
@@ -830,5 +835,5 @@ void PPPData::setAccname(const QString &n) {
-#define SEPARATOR_CHAR ':'
+#define SEPARATOR_CHAR '&'
QStringList &PPPData::phonenumbers() {
@@ -1012,5 +1017,5 @@ void PPPData::setDefaultroute(bool set) {
bool PPPData::autoDNS() {
bool set = (bool) readNumConfig(cgroup, AUTODNS_KEY, true);
- return (set && gpppdata.pppdVersionMin(2, 3, 7));
+ return (set && PPPData::data()->pppdVersionMin(2, 3, 7));
}
@@ -1140,47 +1145,47 @@ void PPPData::setpppdArgumentDefaults() {
-// graphing widget
-void PPPData::setGraphingOptions(bool enable,
- QColor bg,
- QColor text,
- QColor in,
- QColor out)
-{
- if(config) {
- config->setGroup(GRAPH_GRP);
- config->writeEntry(GENABLED, enable);
-// config->writeEntry(GCOLOR_BG, bg);
-// config->writeEntry(GCOLOR_TEXT, text);
-// config->writeEntry(GCOLOR_IN, in);
-// config->writeEntry(GCOLOR_OUT, out);
- }
-}
-
-void PPPData::graphingOptions(bool &enable,
- QColor &bg,
- QColor &text,
- QColor &in,
- QColor &out)
-{
- QColor c;
-
- if(config) {
- config->setGroup(GRAPH_GRP);
- enable = config->readBoolEntry(GENABLED, true);
- bg = Qt::white;
- //bg = config->readColorEntry(GCOLOR_BG, &c);
- text = Qt::black;
- //text = config->readColorEntry(GCOLOR_TEXT, &c);
- in = Qt::blue;
- //in = config->readColorEntry(GCOLOR_IN, &c);
- out = Qt::red;
- //out = config->readColorEntry(GCOLOR_OUT, &c);
- }
-}
+// // graphing widget
+// void PPPData::setGraphingOptions(bool enable,
+// QColor bg,
+// QColor text,
+// QColor in,
+// QColor out)
+// {
+// if(config) {
+// config->setGroup(GRAPH_GRP);
+// config->writeEntry(GENABLED, enable);
+// // config->writeEntry(GCOLOR_BG, bg);
+// // config->writeEntry(GCOLOR_TEXT, text);
+// // config->writeEntry(GCOLOR_IN, in);
+// // config->writeEntry(GCOLOR_OUT, out);
+// }
+// }
+
+// void PPPData::graphingOptions(bool &enable,
+// QColor &bg,
+// QColor &text,
+// QColor &in,
+// QColor &out)
+// {
+// QColor c;
+
+// if(config) {
+// config->setGroup(GRAPH_GRP);
+// enable = config->readBoolEntry(GENABLED, true);
+// bg = Qt::white;
+// //bg = config->readColorEntry(GCOLOR_BG, &c);
+// text = Qt::black;
+// //text = config->readColorEntry(GCOLOR_TEXT, &c);
+// in = Qt::blue;
+// //in = config->readColorEntry(GCOLOR_IN, &c);
+// out = Qt::red;
+// //out = config->readColorEntry(GCOLOR_OUT, &c);
+// }
+// }
-bool PPPData::graphingEnabled() {
- return (bool) readNumConfig(GRAPH_GRP, GENABLED, true);
-}
+// bool PPPData::graphingEnabled() {
+// return (bool) readNumConfig(GRAPH_GRP, GENABLED, true);
+// }
@@ -1206,24 +1211,24 @@ void PPPData::setpppdError(int err) {
-//
-// window position
-//
-void PPPData::winPosConWin(int& p_x, int& p_y) {
- p_x = readNumConfig(WINPOS_GRP, WINPOS_CONWIN_X, QApplication::desktop()->width()/2-160);
- p_y = readNumConfig(WINPOS_GRP, WINPOS_CONWIN_Y, QApplication::desktop()->height()/2-55);
-}
+// //
+// // window position
+// //
+// void PPPData::winPosConWin(int& p_x, int& p_y) {
+// p_x = readNumConfig(WINPOS_GRP, WINPOS_CONWIN_X, QApplication::desktop()->width()/2-160);
+// p_y = readNumConfig(WINPOS_GRP, WINPOS_CONWIN_Y, QApplication::desktop()->height()/2-55);
+// }
-void PPPData::setWinPosConWin(int p_x, int p_y) {
- writeConfig(WINPOS_GRP, WINPOS_CONWIN_X, p_x);
- writeConfig(WINPOS_GRP, WINPOS_CONWIN_Y, p_y);
-}
+// void PPPData::setWinPosConWin(int p_x, int p_y) {
+// writeConfig(WINPOS_GRP, WINPOS_CONWIN_X, p_x);
+// writeConfig(WINPOS_GRP, WINPOS_CONWIN_Y, p_y);
+// }
-void PPPData::winPosStatWin(int& p_x, int& p_y) {
- p_x = readNumConfig(WINPOS_GRP, WINPOS_STATWIN_X, QApplication::desktop()->width()/2-160);
- p_y = readNumConfig(WINPOS_GRP, WINPOS_STATWIN_Y, QApplication::desktop()->height()/2-55);
-}
+// void PPPData::winPosStatWin(int& p_x, int& p_y) {
+// p_x = readNumConfig(WINPOS_GRP, WINPOS_STATWIN_X, QApplication::desktop()->width()/2-160);
+// p_y = readNumConfig(WINPOS_GRP, WINPOS_STATWIN_Y, QApplication::desktop()->height()/2-55);
+// }
-void PPPData::setWinPosStatWin(int p_x, int p_y) {
- writeConfig(WINPOS_GRP, WINPOS_STATWIN_X, p_x);
- writeConfig(WINPOS_GRP, WINPOS_STATWIN_Y, p_y);
-}
+// void PPPData::setWinPosStatWin(int p_x, int p_y) {
+// writeConfig(WINPOS_GRP, WINPOS_STATWIN_X, p_x);
+// writeConfig(WINPOS_GRP, WINPOS_STATWIN_Y, p_y);
+// }
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
diff --git a/noncore/settings/networksettings/ppp/pppmodule.cpp b/noncore/settings/networksettings/ppp/pppmodule.cpp
index d6ca88a..da17e26 100644
--- a/noncore/settings/networksettings/ppp/pppmodule.cpp
+++ b/noncore/settings/networksettings/ppp/pppmodule.cpp
@@ -1,5 +1,5 @@
#include "pppconfig.h"
#include "pppmodule.h"
-//#include "pppimp.h"
+#include "pppdata.h"
#include "kpppwidget.h"
#include "interfaceinformationimp.h"
@@ -99,4 +99,5 @@ Interface *PPPModule::addNewInterface(const QString &newInterface){
qDebug("ACCEPTED");
return new Interface( 0, newInterface );
+ PPPData::data()->save();
}
return NULL;