author | benmeyer <benmeyer> | 2002-10-22 21:04:58 (UTC) |
---|---|---|
committer | benmeyer <benmeyer> | 2002-10-22 21:04:58 (UTC) |
commit | c306ba7e1c73ec200b1621d224fc77f45e798e13 (patch) (side-by-side diff) | |
tree | 1eb110c64b99c2e6ea2f8ab44c053f1e65f320f3 /noncore/settings | |
parent | 1e1b3e398d6b978a9c2bbd85d8f6b7aafbf72b2f (diff) | |
download | opie-c306ba7e1c73ec200b1621d224fc77f45e798e13.zip opie-c306ba7e1c73ec200b1621d224fc77f45e798e13.tar.gz opie-c306ba7e1c73ec200b1621d224fc77f45e798e13.tar.bz2 |
Fix segfault
-rw-r--r-- | noncore/settings/networksettings/TODO | 6 | ||||
-rw-r--r-- | noncore/settings/networksettings/interface.cpp | 4 | ||||
-rw-r--r-- | noncore/settings/networksettings/mainwindowimp.cpp | 2 | ||||
-rw-r--r-- | noncore/settings/networksettings/wlan/wextensions.cpp | 2 | ||||
-rw-r--r-- | noncore/settings/networksettings/wlan/wlanimp.cpp | 2 | ||||
-rw-r--r-- | noncore/settings/networksettings/wlan/wlanmodule.cpp | 20 |
6 files changed, 18 insertions, 18 deletions
diff --git a/noncore/settings/networksettings/TODO b/noncore/settings/networksettings/TODO index 7a71142..d61c510 100644 --- a/noncore/settings/networksettings/TODO +++ b/noncore/settings/networksettings/TODO @@ -1,5 +1,3 @@ WLAN needs to be re-written to not use Config --remove WLAN Config item --sub class out the wlan info --check if an interface supports wireless extensions before config. +WHERE Is DHCP info stored??? @@ -9,3 +7,3 @@ Write a class that parses /proc and not ifconfig -Possible other modules: ipsec, bluetooth +Possible other modules: ipsec, bluetooth, ipchains diff --git a/noncore/settings/networksettings/interface.cpp b/noncore/settings/networksettings/interface.cpp index a84b91f..929b3a1 100644 --- a/noncore/settings/networksettings/interface.cpp +++ b/noncore/settings/networksettings/interface.cpp @@ -8,3 +8,3 @@ #define IFCONFIG "/sbin/ifconfig" -#define HDCP_INFO_DIR "/etc/dhcpc" +#define DHCP_INFO_DIR "/etc/dhcpc" @@ -173,3 +173,3 @@ bool Interface::refresh(){ - QString dhcpDirectory(HDCP_INFO_DIR); + QString dhcpDirectory(DHCP_INFO_DIR); QDir d(dhcpDirectory); diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp index 9d81ab1..c86acdc 100644 --- a/noncore/settings/networksettings/mainwindowimp.cpp +++ b/noncore/settings/networksettings/mainwindowimp.cpp @@ -80,2 +80,3 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(par MainWindowImp::~MainWindowImp(){
+ qDebug("start Saving mainwindow");
// Save profiles.
@@ -98,2 +99,3 @@ MainWindowImp::~MainWindowImp(){ }
+ qDebug("done Saving mainwindow");
}
diff --git a/noncore/settings/networksettings/wlan/wextensions.cpp b/noncore/settings/networksettings/wlan/wextensions.cpp index ef4ba8f..e545bd1 100644 --- a/noncore/settings/networksettings/wlan/wextensions.cpp +++ b/noncore/settings/networksettings/wlan/wextensions.cpp @@ -159,3 +159,3 @@ bool WExtensions::stats(int &signal, int &noise, int &quality){ qDebug( "WIFIAPPLET: Doh! Noise %d > estimated max!\n", noise ); - qDebug(QString("q:%1, s:%2, n:%3").arg(quality).arg(signal).arg(noise).latin1()); + //qDebug(QString("q:%1, s:%2, n:%3").arg(quality).arg(signal).arg(noise).latin1()); signal = ( ( signal-IW_LOWER ) * 100 ) / IW_UPPER; diff --git a/noncore/settings/networksettings/wlan/wlanimp.cpp b/noncore/settings/networksettings/wlan/wlanimp.cpp index ea19207..94c7518 100644 --- a/noncore/settings/networksettings/wlan/wlanimp.cpp +++ b/noncore/settings/networksettings/wlan/wlanimp.cpp @@ -18,3 +18,3 @@ -WLANImp::WLANImp( QWidget* parent, const char* name):WLAN(parent, name){ +WLANImp::WLANImp( QWidget* parent, const char* name):WLAN(parent, name, Qt::WDestructiveClose){ config = new Config("wireless"); diff --git a/noncore/settings/networksettings/wlan/wlanmodule.cpp b/noncore/settings/networksettings/wlan/wlanmodule.cpp index 73e753c..7507c54 100644 --- a/noncore/settings/networksettings/wlan/wlanmodule.cpp +++ b/noncore/settings/networksettings/wlan/wlanmodule.cpp @@ -12,3 +12,2 @@ WLANModule::WLANModule() : Module() { - // get output from iwconfig } @@ -20,3 +19,3 @@ WLANModule::~WLANModule(){ for ( i=list.first(); i != 0; i=list.next() ) - delete i; + delete i; } @@ -49,8 +48,5 @@ bool WLANModule::isOwner(Interface *i){ - //if(i->getInterfaceName() == "eth0" || i->getInterfaceName() == "wlan0"){ - i->setHardwareName("802.11b"); - list.append(i); - return true; - //} - //return false; + i->setHardwareName("802.11b"); + list.append(i); + return true; } @@ -77,4 +73,4 @@ QWidget *WLANModule::information(Interface *i, QTabWidget **tabWidget){ return NULL; - - WlanInfo *info = new WlanInfo(0, "wireless info"); + + WlanInfo *info = new WlanInfo(0, "wireless info", Qt::WDestructiveClose); (*tabWidget) = info->tabWidget; @@ -94,2 +90,6 @@ QWidget *WLANModule::information(Interface *i, QTabWidget **tabWidget){ info->rateLabel->setText(QString("%1 Mb/s").arg(we.rate())); + //WlanInfo info (0, "wireless info", true); + //info.show(); + //return NULL; + return info; |