fix segfault

author: benmeyer <benmeyer> 2002-10-16 21:00:21 (UTC)
committer: benmeyer <benmeyer> 2002-10-16 21:00:21 (UTC)
commit: 8834d3ee866fe9f0c093bf50fa78b4e0f5d2018c (patch) (unidiff)
tree: 6b0468933071ea8a0398ca3aaeb18cf8e2c23d86
parent: 47769211862108250127a0c5c413c38c530c8fd8 (diff)
download: opie-8834d3ee866fe9f0c093bf50fa78b4e0f5d2018c.zip
opie-8834d3ee866fe9f0c093bf50fa78b4e0f5d2018c.tar.gz
opie-8834d3ee866fe9f0c093bf50fa78b4e0f5d2018c.tar.bz2
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
@@ -99,18 +99,18 @@ bool WLANImp::writeConfig()
    return writeWirelessOpts( config );
 //    return TRUE;
 }
 /**
 */
 void WLANImp::accept()
 {
-    if ( writeConfig() )
+  if ( writeConfig() )
-                QDialog::accept();
+    QDialog::accept();
 }
 void WLANImp::done ( int r )
 {
        QDialog::done ( r );
        close ( );
 }
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
@@ -30,18 +30,18 @@ bool WLANModule::isOwner(Interface *i){
 }
 /**
 * 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");
+  Config *cfg = new Config("wireless");
-  WLANImp *wlanconfig = new WLANImp(cfg);
+  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.
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
@@ -99,18 +99,18 @@ bool WLANImp::writeConfig()
    return writeWirelessOpts( config );
 //    return TRUE;
 }
 /**
 */
 void WLANImp::accept()
 {
-    if ( writeConfig() )
+  if ( writeConfig() )
-                QDialog::accept();
+    QDialog::accept();
 }
 void WLANImp::done ( int r )
 {
        QDialog::done ( r );
        close ( );
 }
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
@@ -30,18 +30,18 @@ bool WLANModule::isOwner(Interface *i){
 }
 /**
 * 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");
+  Config *cfg = new Config("wireless");
-  WLANImp *wlanconfig = new WLANImp(cfg);
+  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.
author	benmeyer <benmeyer>	2002-10-16 21:00:21 (UTC)
committer	benmeyer <benmeyer>	2002-10-16 21:00:21 (UTC)
commit	8834d3ee866fe9f0c093bf50fa78b4e0f5d2018c (patch) (unidiff)
tree	6b0468933071ea8a0398ca3aaeb18cf8e2c23d86
parent	47769211862108250127a0c5c413c38c530c8fd8 (diff)
download	opie-8834d3ee866fe9f0c093bf50fa78b4e0f5d2018c.zip opie-8834d3ee866fe9f0c093bf50fa78b4e0f5d2018c.tar.gz opie-8834d3ee866fe9f0c093bf50fa78b4e0f5d2018c.tar.bz2

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
@@ -99,18 +99,18 @@ bool WLANImp::writeConfig()
99	return writeWirelessOpts( config );	99	return writeWirelessOpts( config );
100	// return TRUE;	100	// return TRUE;
101	}	101	}
102		102
103	/**	103	/**
104	*/	104	*/
105	void WLANImp::accept()	105	void WLANImp::accept()
106	{	106	{
107	if ( writeConfig() )	107	if ( writeConfig() )
108	QDialog::accept();	108	QDialog::accept();
109	}	109	}
110		110
111	void WLANImp::done ( int r )	111	void WLANImp::done ( int r )
112	{	112	{
113	QDialog::done ( r );	113	QDialog::done ( r );
114	close ( );	114	close ( );
115	}	115	}
116		116


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
@@ -30,18 +30,18 @@ bool WLANModule::isOwner(Interface *i){
30	}	30	}
31		31
32	/**	32	/**
33	* Create, set tabWiget and return the WLANConfigure Module	33	* Create, set tabWiget and return the WLANConfigure Module
34	* @param tabWidget a pointer to the tab widget that this configure has.	34	* @param tabWidget a pointer to the tab widget that this configure has.
35	* @return QWidget* pointer to the tab widget in this modules configure.	35	* @return QWidget* pointer to the tab widget in this modules configure.
36	*/	36	*/
37	QWidget WLANModule::configure(QTabWidget *tabWidget){	37	QWidget WLANModule::configure(QTabWidget *tabWidget){
38	Config cfg("wireless");	38	Config *cfg = new Config("wireless");
39	WLANImp *wlanconfig = new WLANImp(cfg);	39	WLANImp wlanconfig = new WLANImp(cfg);
40	(*tabWidget) = wlanconfig->tabWidget;	40	(*tabWidget) = wlanconfig->tabWidget;
41	return wlanconfig;	41	return wlanconfig;
42	}	42	}
43		43
44	/**	44	/**
45	* Create, set tabWiget and return the Information Module	45	* Create, set tabWiget and return the Information Module
46	* @param tabWidget a pointer to the tab widget that this information has.	46	* @param tabWidget a pointer to the tab widget that this information has.
47	* @return QWidget* pointer to the tab widget in this modules info.	47	* @return QWidget* pointer to the tab widget in this modules info.


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
@@ -99,18 +99,18 @@ bool WLANImp::writeConfig()
99	return writeWirelessOpts( config );	99	return writeWirelessOpts( config );
100	// return TRUE;	100	// return TRUE;
101	}	101	}
102		102
103	/**	103	/**
104	*/	104	*/
105	void WLANImp::accept()	105	void WLANImp::accept()
106	{	106	{
107	if ( writeConfig() )	107	if ( writeConfig() )
108	QDialog::accept();	108	QDialog::accept();
109	}	109	}
110		110
111	void WLANImp::done ( int r )	111	void WLANImp::done ( int r )
112	{	112	{
113	QDialog::done ( r );	113	QDialog::done ( r );
114	close ( );	114	close ( );
115	}	115	}
116		116


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
@@ -30,18 +30,18 @@ bool WLANModule::isOwner(Interface *i){
30	}	30	}
31		31
32	/**	32	/**
33	* Create, set tabWiget and return the WLANConfigure Module	33	* Create, set tabWiget and return the WLANConfigure Module
34	* @param tabWidget a pointer to the tab widget that this configure has.	34	* @param tabWidget a pointer to the tab widget that this configure has.
35	* @return QWidget* pointer to the tab widget in this modules configure.	35	* @return QWidget* pointer to the tab widget in this modules configure.
36	*/	36	*/
37	QWidget WLANModule::configure(QTabWidget *tabWidget){	37	QWidget WLANModule::configure(QTabWidget *tabWidget){
38	Config cfg("wireless");	38	Config *cfg = new Config("wireless");
39	WLANImp *wlanconfig = new WLANImp(cfg);	39	WLANImp wlanconfig = new WLANImp(cfg);
40	(*tabWidget) = wlanconfig->tabWidget;	40	(*tabWidget) = wlanconfig->tabWidget;
41	return wlanconfig;	41	return wlanconfig;
42	}	42	}
43		43
44	/**	44	/**
45	* Create, set tabWiget and return the Information Module	45	* Create, set tabWiget and return the Information Module
46	* @param tabWidget a pointer to the tab widget that this information has.	46	* @param tabWidget a pointer to the tab widget that this information has.
47	* @return QWidget* pointer to the tab widget in this modules info.	47	* @return QWidget* pointer to the tab widget in this modules info.