summaryrefslogtreecommitdiff
path: root/noncore/settings/networksettings/ppp
Side-by-side diff
Diffstat (limited to 'noncore/settings/networksettings/ppp') (more/less context) (show whitespace changes)
-rw-r--r--noncore/settings/networksettings/ppp/accounts.cpp80
-rw-r--r--noncore/settings/networksettings/ppp/general.cpp62
-rw-r--r--noncore/settings/networksettings/ppp/modeminfo.cpp65
-rw-r--r--noncore/settings/networksettings/ppp/pppmodule.cpp103
4 files changed, 198 insertions, 112 deletions
diff --git a/noncore/settings/networksettings/ppp/accounts.cpp b/noncore/settings/networksettings/ppp/accounts.cpp
index 28d8732..b8a1925a 100644
--- a/noncore/settings/networksettings/ppp/accounts.cpp
+++ b/noncore/settings/networksettings/ppp/accounts.cpp
@@ -24,23 +24,28 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include "accounts.h"
+#include "authwidget.h"
+#include "pppdata.h"
+#include "edit.h"
+
+/* OPIE */
+#include <qpe/qpeapplication.h>
+
+/* QT */
#include <qdir.h>
-#include <stdlib.h>
#include <qlayout.h>
#include <qtabwidget.h>
#include <qtabdialog.h>
#include <qwhatsthis.h>
#include <qmessagebox.h>
-
#include <qapplication.h>
#include <qbuttongroup.h>
#include <qmessagebox.h>
#include <qvgroupbox.h>
-#include "accounts.h"
-#include "authwidget.h"
-#include "pppdata.h"
-#include "edit.h"
+/* STD */
+#include <stdlib.h>
void parseargs(char* buf, char** args);
@@ -68,7 +73,8 @@ AccountWidget::AccountWidget( PPPData *pd, QWidget *parent, const char *name, WF
listListbox->insertStringList(_pppdata->getAccountList());
- for (uint i = 0; i < listListbox->count(); i++){
+ for (uint i = 0; i < listListbox->count(); i++)
+ {
if ( listListbox->text(i) == _pppdata->accname() )
listListbox->setCurrentItem( i );
}
@@ -76,7 +82,8 @@ AccountWidget::AccountWidget( PPPData *pd, QWidget *parent, const char *name, WF
-void AccountWidget::slotListBoxSelect(int idx) {
+void AccountWidget::slotListBoxSelect(int idx)
+{
bool ok = _pppdata->setAccount( listListbox->text(idx) );
ok = (bool)(idx != -1);
delete_b->setEnabled(ok);
@@ -84,12 +91,14 @@ void AccountWidget::slotListBoxSelect(int idx) {
//FIXME copy_b->setEnabled(ok);
}
-void AccountWidget::edit() {
+void AccountWidget::edit()
+{
_pppdata->setAccount(listListbox->text(listListbox->currentItem()));
int result = doTab();
- if(result == QDialog::Accepted) {
+ if(result == QDialog::Accepted)
+ {
listListbox->changeItem(_pppdata->accname(),listListbox->currentItem());
// emit resetaccounts();
_pppdata->save();
@@ -97,7 +106,8 @@ void AccountWidget::edit() {
}
-void AccountWidget::create() {
+void AccountWidget::create()
+{
// if(listListbox->count() == MAX_ACCOUNTS) {
// QMessageBox::information(this, "sorry",
@@ -106,29 +116,34 @@ void AccountWidget::create() {
// }
int result;
- if (_pppdata->newaccount() == -1){
+ if (_pppdata->newaccount() == -1)
+ {
qDebug("_pppdata->newaccount() == -1");
return;
}
result = doTab();
- if(result == QDialog::Accepted) {
+ if(result == QDialog::Accepted)
+ {
listListbox->insertItem(_pppdata->accname());
listListbox->setSelected(listListbox->findItem(_pppdata->accname()),true);
_pppdata->save();
- } else
+ }
+ else
_pppdata->deleteAccount();
}
-void AccountWidget::copy() {
+void AccountWidget::copy()
+{
// if(listListbox->count() == MAX_ACCOUNTS) {
// QMessageBox::information(this, "sorry", tr("Maximum number of accounts reached."));
// return;
// }
- if(listListbox->currentItem()<0) {
+ if(listListbox->currentItem()<0)
+ {
QMessageBox::information(this, "sorry", tr("No account selected."));
return;
}
@@ -141,7 +156,8 @@ void AccountWidget::copy() {
}
-void AccountWidget::remove() {
+void AccountWidget::remove()
+{
QString s = tr("Are you sure you want to delete\nthe account \"%1\"?")
.arg(listListbox->text(listListbox->currentItem()));
@@ -164,7 +180,8 @@ void AccountWidget::remove() {
}
-int AccountWidget::doTab(){
+int AccountWidget::doTab()
+{
QDialog *dlg = new QDialog( 0, "newAccount", true, Qt::WStyle_ContextHelp );
QVBoxLayout *layout = new QVBoxLayout( dlg );
layout->setSpacing( 0 );
@@ -175,10 +192,13 @@ int AccountWidget::doTab(){
bool isnewaccount;
- if(_pppdata->accname().isEmpty()) {
+ if(_pppdata->accname().isEmpty())
+ {
dlg->setCaption(tr("New Account"));
isnewaccount = true;
- } else {
+ }
+ else
+ {
QString tit = tr("Edit Account: ");
tit += _pppdata->accname();
dlg->setCaption(tit);
@@ -212,18 +232,24 @@ int AccountWidget::doTab(){
int result = 0;
bool ok = false;
- while (!ok){
- dlg->showMaximized();
- result = dlg->exec();
+ while (!ok)
+ {
+ result = QPEApplication::execDialog( dlg );
ok = true;
- if(result == QDialog::Accepted) {
- if (!auth_w->check()){
+ if(result == QDialog::Accepted)
+ {
+ if (!auth_w->check())
+ {
ok = false;
- } else if(!dial_w->save()) {
+ }
+ else if(!dial_w->save())
+ {
QMessageBox::critical(this, "error", tr( "You must enter a unique account name"));
ok = false;
- }else{
+ }
+ else
+ {
ip_w->save();
dns_w->save();
gateway_w->save();
diff --git a/noncore/settings/networksettings/ppp/general.cpp b/noncore/settings/networksettings/ppp/general.cpp
index 5540946..ff1b11b 100644
--- a/noncore/settings/networksettings/ppp/general.cpp
+++ b/noncore/settings/networksettings/ppp/general.cpp
@@ -24,9 +24,17 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <termios.h>
-#include <string.h>
+#include "general.h"
+#include "interfaceppp.h"
+#include "modeminfo.h"
+#include "modemcmds.h"
+#include "pppdata.h"
+/* OPIE */
+#include <qpe/config.h>
+#include <qpe/qpeapplication.h>
+
+/* QT */
#include <qcheckbox.h>
#include <qcombobox.h>
#include <qlabel.h>
@@ -35,20 +43,10 @@
#include <qslider.h>
#include <qspinbox.h>
#include <qwhatsthis.h>
-#include <qpe/config.h>
-// #include <qgroupbox.h>
-
-
-#include "general.h"
-#include "interfaceppp.h"
-//#include "miniterm.h"
-#include "modeminfo.h"
-#include "modemcmds.h"
-//#include "devices.h"
-#include "pppdata.h"
-//#include <klocale.h>
-
+/* STD */
+#include <termios.h>
+#include <string.h>
ModemWidget::ModemWidget( PPPData *pd, QWidget *parent, const char *name )
@@ -148,7 +146,8 @@ ModemWidget::ModemWidget( PPPData *pd, QWidget *parent, const char *name )
baud_c = new QComboBox(this);
baud_label->setBuddy(baud_c);
- static const char *baudrates[] = {
+ static const char *baudrates[] =
+ {
#ifdef B460800
"460800",
@@ -170,7 +169,8 @@ ModemWidget::ModemWidget( PPPData *pd, QWidget *parent, const char *name )
"19200",
"9600",
"2400",
- 0};
+ 0
+ };
for(k = 0; baudrates[k]; k++)
baud_c->insertItem(baudrates[k]);
@@ -190,7 +190,8 @@ ModemWidget::ModemWidget( PPPData *pd, QWidget *parent, const char *name )
QWhatsThis::add(baud_label,tmp);
QWhatsThis::add(baud_c,tmp);
- for(int i=0; i <= enter->count()-1; i++) {
+ for(int i=0; i <= enter->count()-1; i++)
+ {
if(_pppdata->enter() == enter->text(i))
enter->setCurrentItem(i);
}
@@ -237,17 +238,20 @@ ModemWidget::ModemWidget( PPPData *pd, QWidget *parent, const char *name )
"recommended value is 30 seconds."));
//set stuff from gpppdata
- for(int i=0; i <= enter->count()-1; i++) {
+ for(int i=0; i <= enter->count()-1; i++)
+ {
if(_pppdata->enter() == enter->text(i))
enter->setCurrentItem(i);
}
- for(int i=0; i <= modemdevice->count()-1; i++) {
+ for(int i=0; i <= modemdevice->count()-1; i++)
+ {
if(_pppdata->modemDevice() == modemdevice->text(i))
modemdevice->setCurrentItem(i);
}
- for(int i=0; i <= flowcontrol->count()-1; i++) {
+ for(int i=0; i <= flowcontrol->count()-1; i++)
+ {
if(_pppdata->flowcontrol() == flowcontrol->text(i))
flowcontrol->setCurrentItem(i);
}
@@ -273,9 +277,11 @@ ModemWidget::~ModemWidget()
QString edited = modemdevice->currentText();
- if ( !( edited ).isEmpty() ) {
+ if ( !( edited ).isEmpty() )
+ {
edited.simplifyWhiteSpace();
- if ( devs.contains( edited ) == 0 ) {
+ if ( devs.contains( edited ) == 0 )
+ {
devs << edited;
}
_pppdata->setModemDevice( edited );
@@ -470,14 +476,16 @@ ModemWidget2::ModemWidget2( PPPData *pd, InterfacePPP *ip, QWidget *parent,
}
-void ModemWidget2::modemcmdsbutton() {
+void ModemWidget2::modemcmdsbutton()
+{
ModemCommands mc(_ifaceppp->data(), this, "commands" , true, Qt::WStyle_ContextHelp);
- mc.showMaximized();
- mc.exec();
+
+ QPEApplication::execDialog( &mc );
}
-void ModemWidget2::query_modem() {
+void ModemWidget2::query_modem()
+{
ModemTransfer mt(_ifaceppp->modem(), this);
mt.exec();
}
diff --git a/noncore/settings/networksettings/ppp/modeminfo.cpp b/noncore/settings/networksettings/ppp/modeminfo.cpp
index dbb26db..df0bf9b 100644
--- a/noncore/settings/networksettings/ppp/modeminfo.cpp
+++ b/noncore/settings/networksettings/ppp/modeminfo.cpp
@@ -24,16 +24,20 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <unistd.h>
+#include "modeminfo.h"
+#include "modem.h"
+
+/* OPIE */
+#include <qpe/qpeapplication.h>
+
+/* QT */
#include <qregexp.h>
#include <qlayout.h>
-// #include <kwin.h>
-// #include <kmessagebox.h>
-// #include <kapplication.h>
#include <qmessagebox.h>
#include <qapplication.h>
-#include "modeminfo.h"
-#include "modem.h"
+
+/* STD */
+#include <unistd.h>
ModemTransfer::ModemTransfer(Modem *mo, QWidget *parent, const char *name)
: QDialog(parent, name,TRUE, WStyle_Customize|WStyle_NormalBorder),
@@ -93,7 +97,8 @@ ModemTransfer::ModemTransfer(Modem *mo, QWidget *parent, const char *name)
}
-void ModemTransfer::ati_done() {
+void ModemTransfer::ati_done()
+{
scripttimer->stop();
timeout_timer->stop();
_modem->closetty();
@@ -104,15 +109,16 @@ void ModemTransfer::ati_done() {
ModemInfo *mi = new ModemInfo(this);
for(int i = 0; i < NUM_OF_ATI; i++)
mi->setAtiString(i, ati_query_strings[i]);
- mi->showMaximized();
- mi->exec();
+
+ QPEApplication::execDialog( mi );
delete mi;
accept();
}
-void ModemTransfer::time_out_slot() {
+void ModemTransfer::time_out_slot()
+{
timeout_timer->stop();
scripttimer->stop();
@@ -121,26 +127,31 @@ void ModemTransfer::time_out_slot() {
}
-void ModemTransfer::init() {
+void ModemTransfer::init()
+{
qApp->processEvents();
int lock = _modem->lockdevice();
- if (lock == 1) {
+ if (lock == 1)
+ {
statusBar->setText(QObject::tr("Modem device is locked."));
return;
}
- if (lock == -1) {
+ if (lock == -1)
+ {
statusBar->setText(QObject::tr("Unable to create modem lock file."));
return;
}
- if(_modem->opentty()) {
- if(_modem->hangup()) {
+ if(_modem->opentty())
+ {
+ if(_modem->hangup())
+ {
usleep(100000); // wait 0.1 secs
_modem->writeLine("ATE0Q1V1"); // E0 don't echo the commands I send ...
@@ -165,11 +176,13 @@ void ModemTransfer::init() {
}
-void ModemTransfer::do_script() {
+void ModemTransfer::do_script()
+{
QString msg;
QString query;
- switch(step) {
+ switch(step)
+ {
case 0:
readtty();
statusBar->setText("ATI...");
@@ -199,12 +212,14 @@ void ModemTransfer::do_script() {
step++;
}
-void ModemTransfer::readChar(unsigned char c) {
+void ModemTransfer::readChar(unsigned char c)
+{
if(readbuffer.length() < 255)
readbuffer += c;
}
-void ModemTransfer::readtty() {
+void ModemTransfer::readtty()
+{
if (step == 0)
return;
@@ -220,7 +235,8 @@ void ModemTransfer::readtty() {
}
-void ModemTransfer::cancelbutton() {
+void ModemTransfer::cancelbutton()
+{
scripttimer->stop();
_modem->stop();
timeout_timer->stop();
@@ -236,7 +252,8 @@ void ModemTransfer::cancelbutton() {
}
-void ModemTransfer::closeEvent( QCloseEvent *e ) {
+void ModemTransfer::closeEvent( QCloseEvent *e )
+{
cancelbutton();
e->accept();
}
@@ -254,7 +271,8 @@ ModemInfo::ModemInfo(QWidget *parent, const char* name)
QGridLayout *l1 = new QGridLayout(NUM_OF_ATI, 2, 5);
tl->addLayout(l1, 1);
- for(int i = 0 ; i < NUM_OF_ATI ; i++) {
+ for(int i = 0 ; i < NUM_OF_ATI ; i++)
+ {
label_text = "";
if ( i == 0)
@@ -286,7 +304,8 @@ ModemInfo::ModemInfo(QWidget *parent, const char* name)
}
-void ModemInfo::setAtiString(int i, QString s) {
+void ModemInfo::setAtiString(int i, QString s)
+{
if(i < NUM_OF_ATI)
ati_label_result[i]->setText(s);
}
diff --git a/noncore/settings/networksettings/ppp/pppmodule.cpp b/noncore/settings/networksettings/ppp/pppmodule.cpp
index f7dacf6..a7caffe 100644
--- a/noncore/settings/networksettings/ppp/pppmodule.cpp
+++ b/noncore/settings/networksettings/ppp/pppmodule.cpp
@@ -1,8 +1,3 @@
-#include <errno.h>
-#include <signal.h>
-
-
-#include <qpe/config.h>
#include "modem.h"
#include "pppconfig.h"
@@ -11,19 +6,32 @@
#include "interfaceinformationppp.h"
#include "interfaceppp.h"
+/* OPIE */
+#include <qpe/config.h>
+#include <qpe/qpeapplication.h>
+
+/* QT */
+
+/* STD */
+#include <errno.h>
+#include <signal.h>
+
// don't polute global namespace
-namespace {
+namespace
+{
/*
* If network settings is qutting and we've ppp
* devices open we need to save the pid_t the PPData
* and the interface number
*/
- struct Connection {
+ struct Connection
+ {
pid_t pid;
QString device;
QString name;
};
- class InterfaceKeeper {
+ class InterfaceKeeper
+ {
public:
InterfaceKeeper();
~InterfaceKeeper();
@@ -53,14 +61,16 @@ PPPModule::PPPModule() : Module()
QMap<QString,QString>::Iterator it;
InterfacePPP *iface;
qDebug("getting interfaces");
- for( it = ifaces.begin(); it != ifaces.end(); ++it ){
+ for( it = ifaces.begin(); it != ifaces.end(); ++it )
+ {
qDebug("ifaces %s %s", it.key().latin1(), it.data().latin1() );
iface = new InterfacePPP( 0, it.key() );
iface->setHardwareName( it.data() );
list.append( (Interface*)iface );
// check if (*it) is one of the running ifaces
- if ( running.contains( it.data() ) ) {
+ if ( running.contains( it.data() ) )
+ {
qDebug("iface is running %s", it.key().latin1() );
handledInterfaceNames << running[it.data()].device;
iface->setStatus( true );
@@ -76,14 +86,17 @@ PPPModule::PPPModule() : Module()
/**
* Delete any interfaces that we own.
*/
-PPPModule::~PPPModule(){
+PPPModule::~PPPModule()
+{
qDebug("PPPModule::~PPPModule() " );
QMap<QString,QString> ifaces;
InterfaceKeeper keeper;
Interface *i;
- for ( i=list.first(); i != 0; i=list.next() ){
+ for ( i=list.first(); i != 0; i=list.next() )
+ {
/* if online save the state */
- if ( i->getStatus() ) {
+ if ( i->getStatus() )
+ {
qDebug("Iface %s is still up", i->getHardwareName().latin1() );
InterfacePPP* ppp = static_cast<InterfacePPP*>(i);
keeper.addInterface( ppp->pppPID(), ppp->pppDev(), ppp->getHardwareName() );
@@ -97,7 +110,8 @@ PPPModule::~PPPModule(){
/**
* Change the current profile
*/
-void PPPModule::setProfile(const QString &newProfile){
+void PPPModule::setProfile(const QString &newProfile)
+{
profile = newProfile;
}
@@ -106,7 +120,8 @@ void PPPModule::setProfile(const QString &newProfile){
* @param Interface* can be used in determining the icon.
* @return QString the icon name (minus .png, .gif etc)
*/
-QString PPPModule::getPixmapName(Interface* ){
+QString PPPModule::getPixmapName(Interface* )
+{
return "ppp";
}
@@ -115,7 +130,8 @@ QString PPPModule::getPixmapName(Interface* ){
* @param Interface* interface to check against
* @return bool true if i is owned by this module, false otherwise.
*/
-bool PPPModule::isOwner(Interface *i){
+bool PPPModule::isOwner(Interface *i)
+{
return list.find( i ) != -1;
}
@@ -123,7 +139,8 @@ bool PPPModule::isOwner(Interface *i){
* Create, and return the WLANConfigure Module
* @return QWidget* pointer to this modules configure.
*/
-QWidget *PPPModule::configure(Interface *i){
+QWidget *PPPModule::configure(Interface *i)
+{
qDebug("return ModemWidget");
PPPConfigWidget *pppconfig = new PPPConfigWidget( (InterfacePPP*)i,
0, "PPPConfig", false,
@@ -135,7 +152,8 @@ QWidget *PPPModule::configure(Interface *i){
* Create, and return the Information Module
* @return QWidget* pointer to this modules info.
*/
-QWidget *PPPModule::information(Interface *i){
+QWidget *PPPModule::information(Interface *i)
+{
// We don't have any advanced pppd information widget yet :-D
// TODO ^
@@ -147,7 +165,8 @@ QWidget *PPPModule::information(Interface *i){
* @return QList<Interface> A list of interfaces that exsist that havn't
* been called by isOwner()
*/
-QList<Interface> PPPModule::getInterfaces(){
+QList<Interface> PPPModule::getInterfaces()
+{
// List all of the files in the peer directory
qDebug("PPPModule::getInterfaces");
return list;
@@ -159,19 +178,23 @@ QList<Interface> PPPModule::getInterfaces(){
* by possibleNewInterfaces();
* @return Interface* NULL if it was unable to be created.
*/
-Interface *PPPModule::addNewInterface(const QString &newInterface){
+Interface *PPPModule::addNewInterface(const QString &newInterface)
+{
InterfacePPP *ifaceppp;
Interface *iface;
ifaceppp = new InterfacePPP();
PPPConfigWidget imp(ifaceppp, 0, "PPPConfigImp", true);
- imp.showMaximized();
- if(imp.exec() == QDialog::Accepted ){
+
+ if( QPEApplication::execDialog( &imp ) == QDialog::Accepted )
+ {
iface = (InterfacePPP*) ifaceppp;
iface->setModuleOwner( this );
list.append( iface );
return iface;
- }else {
+ }
+ else
+ {
delete ifaceppp;
iface = NULL;
}
@@ -182,7 +205,8 @@ Interface *PPPModule::addNewInterface(const QString &newInterface){
* Attempts to remove the interface, doesn't delete i
* @return bool true if successful, false otherwise.
*/
-bool PPPModule::remove(Interface *i){
+bool PPPModule::remove(Interface *i)
+{
return list.remove(i);
}
@@ -194,37 +218,44 @@ void PPPModule::possibleNewInterfaces(QMap<QString, QString> &newIfaces)
-namespace {
- InterfaceKeeper::InterfaceKeeper( ) {
- }
- InterfaceKeeper::~InterfaceKeeper() {
+namespace
+{
+ InterfaceKeeper::InterfaceKeeper( )
+ {}
+ InterfaceKeeper::~InterfaceKeeper()
+ {
Config cfg("ppp_plugin_keeper");
QStringList lst = cfg.groupList();
- for (QStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) {
+ for (QStringList::Iterator it = lst.begin(); it != lst.end(); ++it )
+ {
Connection con;
cfg.setGroup( (*it) );
cfg.clearGroup();
}
- for (QMap<QString, Connection>::Iterator it = m_interfaces.begin(); it != m_interfaces.end(); ++it ) {
+ for (QMap<QString, Connection>::Iterator it = m_interfaces.begin(); it != m_interfaces.end(); ++it )
+ {
Connection con = it.data();
cfg.setGroup( con.name );
cfg.writeEntry( "pid", con.pid );
cfg.writeEntry( "device", con.device );
}
}
- void InterfaceKeeper::addInterface(pid_t pid, const QString& dev, const QString& name ) {
+ void InterfaceKeeper::addInterface(pid_t pid, const QString& dev, const QString& name )
+ {
Connection con;
con.pid = pid;
con.device = dev;
con.name = name;
m_interfaces.insert( name, con );
}
- QMap<QString, Connection> InterfaceKeeper::interfaces()const {
+ QMap<QString, Connection> InterfaceKeeper::interfaces()const
+ {
Config cfg("ppp_plugin_keeper");
QMap<QString, Connection> ifaces;
QStringList lst = cfg.groupList();
- for (QStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) {
+ for (QStringList::Iterator it = lst.begin(); it != lst.end(); ++it )
+ {
Connection con;
cfg.setGroup( (*it) );
con.name = (*it);
@@ -237,8 +268,10 @@ namespace {
}
return ifaces;
}
- bool InterfaceKeeper::isAvailable( pid_t p)const {
- if (::kill(p, 0 ) == 0 || errno != ESRCH ) {
+ bool InterfaceKeeper::isAvailable( pid_t p)const
+ {
+ if (::kill(p, 0 ) == 0 || errno != ESRCH )
+ {
qDebug("isAvailable %d", p);
return true;
}