summaryrefslogtreecommitdiff
authorbenmeyer <benmeyer>2002-10-16 21:00:21 (UTC)
committer benmeyer <benmeyer>2002-10-16 21:00:21 (UTC)
commit8834d3ee866fe9f0c093bf50fa78b4e0f5d2018c (patch) (side-by-side diff)
tree6b0468933071ea8a0398ca3aaeb18cf8e2c23d86
parent47769211862108250127a0c5c413c38c530c8fd8 (diff)
downloadopie-8834d3ee866fe9f0c093bf50fa78b4e0f5d2018c.zip
opie-8834d3ee866fe9f0c093bf50fa78b4e0f5d2018c.tar.gz
opie-8834d3ee866fe9f0c093bf50fa78b4e0f5d2018c.tar.bz2
fix segfault
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/networksetup/wlan/wlanimp.cpp4
-rw-r--r--noncore/net/networksetup/wlan/wlanmodule.cpp4
-rw-r--r--noncore/settings/networksettings/wlan/wlanimp.cpp4
-rw-r--r--noncore/settings/networksettings/wlan/wlanmodule.cpp4
4 files changed, 8 insertions, 8 deletions
diff --git a/noncore/net/networksetup/wlan/wlanimp.cpp b/noncore/net/networksetup/wlan/wlanimp.cpp
index 60ffeeb..806643d 100644
--- a/noncore/net/networksetup/wlan/wlanimp.cpp
+++ b/noncore/net/networksetup/wlan/wlanimp.cpp
@@ -95,26 +95,26 @@ bool WLANImp::writeConfig()
config.writeEntry( "dot11WEPDefaultKey0", keyLineEdit0->text() );
config.writeEntry( "dot11WEPDefaultKey1", keyLineEdit1->text() );
config.writeEntry( "dot11WEPDefaultKey2", keyLineEdit2->text() );
config.writeEntry( "dot11WEPDefaultKey3", keyLineEdit3->text() );
return writeWirelessOpts( config );
// return TRUE;
}
/**
*/
void WLANImp::accept()
{
- if ( writeConfig() )
- QDialog::accept();
+ if ( writeConfig() )
+ QDialog::accept();
}
void WLANImp::done ( int r )
{
QDialog::done ( r );
close ( );
}
bool WLANImp::writeWirelessOpts( Config &config, QString scheme )
{
qWarning( "WLANImp::writeWirelessOpts entered." );
QString prev = "/etc/pcmcia/wireless.opts";
diff --git a/noncore/net/networksetup/wlan/wlanmodule.cpp b/noncore/net/networksetup/wlan/wlanmodule.cpp
index 321fa11..98d2eb6 100644
--- a/noncore/net/networksetup/wlan/wlanmodule.cpp
+++ b/noncore/net/networksetup/wlan/wlanmodule.cpp
@@ -26,26 +26,26 @@ QString WLANModule::getPixmapName(Interface* ){
bool WLANModule::isOwner(Interface *i){
if(i->getInterfaceName() == "eth0" || i->getInterfaceName() == "wlan0")
return true;
return false;
}
/**
* Create, set tabWiget and return the WLANConfigure Module
* @param tabWidget a pointer to the tab widget that this configure has.
* @return QWidget* pointer to the tab widget in this modules configure.
*/
QWidget *WLANModule::configure(QTabWidget **tabWidget){
- Config cfg("wireless");
- WLANImp *wlanconfig = new WLANImp(cfg);
+ Config *cfg = new Config("wireless");
+ WLANImp *wlanconfig = new WLANImp(*cfg);
(*tabWidget) = wlanconfig->tabWidget;
return wlanconfig;
}
/**
* Create, set tabWiget and return the Information Module
* @param tabWidget a pointer to the tab widget that this information has.
* @return QWidget* pointer to the tab widget in this modules info.
*/
QWidget *WLANModule::information(QTabWidget **tabWidget){
return NULL;
}
diff --git a/noncore/settings/networksettings/wlan/wlanimp.cpp b/noncore/settings/networksettings/wlan/wlanimp.cpp
index 60ffeeb..806643d 100644
--- a/noncore/settings/networksettings/wlan/wlanimp.cpp
+++ b/noncore/settings/networksettings/wlan/wlanimp.cpp
@@ -95,26 +95,26 @@ bool WLANImp::writeConfig()
config.writeEntry( "dot11WEPDefaultKey0", keyLineEdit0->text() );
config.writeEntry( "dot11WEPDefaultKey1", keyLineEdit1->text() );
config.writeEntry( "dot11WEPDefaultKey2", keyLineEdit2->text() );
config.writeEntry( "dot11WEPDefaultKey3", keyLineEdit3->text() );
return writeWirelessOpts( config );
// return TRUE;
}
/**
*/
void WLANImp::accept()
{
- if ( writeConfig() )
- QDialog::accept();
+ if ( writeConfig() )
+ QDialog::accept();
}
void WLANImp::done ( int r )
{
QDialog::done ( r );
close ( );
}
bool WLANImp::writeWirelessOpts( Config &config, QString scheme )
{
qWarning( "WLANImp::writeWirelessOpts entered." );
QString prev = "/etc/pcmcia/wireless.opts";
diff --git a/noncore/settings/networksettings/wlan/wlanmodule.cpp b/noncore/settings/networksettings/wlan/wlanmodule.cpp
index 321fa11..98d2eb6 100644
--- a/noncore/settings/networksettings/wlan/wlanmodule.cpp
+++ b/noncore/settings/networksettings/wlan/wlanmodule.cpp
@@ -26,26 +26,26 @@ QString WLANModule::getPixmapName(Interface* ){
bool WLANModule::isOwner(Interface *i){
if(i->getInterfaceName() == "eth0" || i->getInterfaceName() == "wlan0")
return true;
return false;
}
/**
* Create, set tabWiget and return the WLANConfigure Module
* @param tabWidget a pointer to the tab widget that this configure has.
* @return QWidget* pointer to the tab widget in this modules configure.
*/
QWidget *WLANModule::configure(QTabWidget **tabWidget){
- Config cfg("wireless");
- WLANImp *wlanconfig = new WLANImp(cfg);
+ Config *cfg = new Config("wireless");
+ WLANImp *wlanconfig = new WLANImp(*cfg);
(*tabWidget) = wlanconfig->tabWidget;
return wlanconfig;
}
/**
* Create, set tabWiget and return the Information Module
* @param tabWidget a pointer to the tab widget that this information has.
* @return QWidget* pointer to the tab widget in this modules info.
*/
QWidget *WLANModule::information(QTabWidget **tabWidget){
return NULL;
}