summaryrefslogtreecommitdiff
path: root/noncore/settings/networksettings/wlan
Unidiff
Diffstat (limited to 'noncore/settings/networksettings/wlan') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/networksettings/wlan/infoimp.h2
-rw-r--r--noncore/settings/networksettings/wlan/wextensions.cpp3
-rw-r--r--noncore/settings/networksettings/wlan/wlanimp.cpp2
-rw-r--r--noncore/settings/networksettings/wlan/wlanimp.h2
-rw-r--r--noncore/settings/networksettings/wlan/wlanmodule.cpp4
-rw-r--r--noncore/settings/networksettings/wlan/wlanmodule.h18
6 files changed, 15 insertions, 16 deletions
diff --git a/noncore/settings/networksettings/wlan/infoimp.h b/noncore/settings/networksettings/wlan/infoimp.h
index 5311bea..8f7f0d6 100644
--- a/noncore/settings/networksettings/wlan/infoimp.h
+++ b/noncore/settings/networksettings/wlan/infoimp.h
@@ -1,13 +1,13 @@
1#ifndef INFOIMP_H 1#ifndef INFOIMP_H
2#define INFOIMP_H 2#define INFOIMP_H
3 3
4#include "info.h" 4#include "info.h"
5 5
6class QTimer; 6class QTimer;
7class WExtensions; 7//class WExtensions;
8 8
9class WlanInfoImp : public WlanInfo { 9class WlanInfoImp : public WlanInfo {
10 Q_OBJECT 10 Q_OBJECT
11 11
12public: 12public:
13 WlanInfoImp( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); 13 WlanInfoImp( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
diff --git a/noncore/settings/networksettings/wlan/wextensions.cpp b/noncore/settings/networksettings/wlan/wextensions.cpp
index eb6fc42..6335ebc 100644
--- a/noncore/settings/networksettings/wlan/wextensions.cpp
+++ b/noncore/settings/networksettings/wlan/wextensions.cpp
@@ -13,14 +13,13 @@
13#define IW_LOWER 0 13#define IW_LOWER 0
14#define IW_UPPER 256 14#define IW_UPPER 256
15 15
16/** 16/**
17 * Constructor. Sets hasWirelessExtensions 17 * Constructor. Sets hasWirelessExtensions
18 */ 18 */
19WExtensions::WExtensions(QString interfaceName): hasWirelessExtensions(false){ 19WExtensions::WExtensions(QString interfaceName): hasWirelessExtensions(false), interface(interfaceName) {
20 interface = interfaceName;
21 fd = socket( AF_INET, SOCK_DGRAM, 0 ); 20 fd = socket( AF_INET, SOCK_DGRAM, 0 );
22 if(fd == -1) 21 if(fd == -1)
23 return; 22 return;
24 23
25 const char* buffer[200]; 24 const char* buffer[200];
26 memset( &iwr, 0, sizeof( iwr ) ); 25 memset( &iwr, 0, sizeof( iwr ) );
diff --git a/noncore/settings/networksettings/wlan/wlanimp.cpp b/noncore/settings/networksettings/wlan/wlanimp.cpp
index 689eae2..d4b4af9 100644
--- a/noncore/settings/networksettings/wlan/wlanimp.cpp
+++ b/noncore/settings/networksettings/wlan/wlanimp.cpp
@@ -41,13 +41,13 @@ WLANImp::WLANImp( QWidget* parent, const char* name, Interface *i, bool modal, W
41 qDebug(QString("WLANImp: Can't open file: %1 for reading.").arg(wlanFile).latin1()); 41 qDebug(QString("WLANImp: Can't open file: %1 for reading.").arg(wlanFile).latin1());
42} 42}
43 43
44/** 44/**
45 * Change the profile for both wireless settings and network settings. 45 * Change the profile for both wireless settings and network settings.
46 */ 46 */
47void WLANImp::setProfile(QString &profile){ 47void WLANImp::setProfile(const QString &profile){
48 interfaceSetup->setProfile(profile); 48 interfaceSetup->setProfile(profile);
49 parseSettingFile(); 49 parseSettingFile();
50} 50}
51 51
52/** 52/**
53 * Parses the settings file that was read in and gets any setting from it. 53 * Parses the settings file that was read in and gets any setting from it.
diff --git a/noncore/settings/networksettings/wlan/wlanimp.h b/noncore/settings/networksettings/wlan/wlanimp.h
index f88e550..df599af 100644
--- a/noncore/settings/networksettings/wlan/wlanimp.h
+++ b/noncore/settings/networksettings/wlan/wlanimp.h
@@ -10,13 +10,13 @@ class Config;
10 10
11class WLANImp : public WLAN { 11class WLANImp : public WLAN {
12 Q_OBJECT 12 Q_OBJECT
13 13
14public: 14public:
15 WLANImp( QWidget* parent = 0, const char* name = 0, Interface *i=0, bool modal = FALSE, WFlags fl = 0 ); 15 WLANImp( QWidget* parent = 0, const char* name = 0, Interface *i=0, bool modal = FALSE, WFlags fl = 0 );
16 void setProfile(QString &profile); 16 void setProfile(const QString &profile);
17 17
18protected: 18protected:
19 void accept(); 19 void accept();
20 20
21private: 21private:
22 void parseSettingFile(); 22 void parseSettingFile();
diff --git a/noncore/settings/networksettings/wlan/wlanmodule.cpp b/noncore/settings/networksettings/wlan/wlanmodule.cpp
index b14fc0a..3979e60 100644
--- a/noncore/settings/networksettings/wlan/wlanmodule.cpp
+++ b/noncore/settings/networksettings/wlan/wlanmodule.cpp
@@ -23,13 +23,13 @@ WLANModule::~WLANModule(){
23 delete i; 23 delete i;
24} 24}
25 25
26/** 26/**
27 * Change the current profile 27 * Change the current profile
28 */ 28 */
29void WLANModule::setProfile(QString newProfile){ 29void WLANModule::setProfile(const QString &newProfile){
30 profile = newProfile; 30 profile = newProfile;
31} 31}
32 32
33/** 33/**
34 * get the icon name for this device. 34 * get the icon name for this device.
35 * @param Interface* can be used in determining the icon. 35 * @param Interface* can be used in determining the icon.
@@ -91,13 +91,13 @@ QList<Interface> WLANModule::getInterfaces(){
91/** 91/**
92 * Attempt to add a new interface as defined by name 92 * Attempt to add a new interface as defined by name
93 * @param name the name of the type of interface that should be created given 93 * @param name the name of the type of interface that should be created given
94 * by possibleNewInterfaces(); 94 * by possibleNewInterfaces();
95 * @return Interface* NULL if it was unable to be created. 95 * @return Interface* NULL if it was unable to be created.
96 */ 96 */
97Interface *WLANModule::addNewInterface(QString ){ 97Interface *WLANModule::addNewInterface(const QString &){
98 // We can't add a 802.11 interface, either the hardware will be there 98 // We can't add a 802.11 interface, either the hardware will be there
99 // or it wont. 99 // or it wont.
100 return NULL; 100 return NULL;
101} 101}
102 102
103/** 103/**
diff --git a/noncore/settings/networksettings/wlan/wlanmodule.h b/noncore/settings/networksettings/wlan/wlanmodule.h
index a81ccff..3a54de6 100644
--- a/noncore/settings/networksettings/wlan/wlanmodule.h
+++ b/noncore/settings/networksettings/wlan/wlanmodule.h
@@ -9,21 +9,21 @@ signals:
9 void updateInterface(Interface *i); 9 void updateInterface(Interface *i);
10 10
11public: 11public:
12 WLANModule(); 12 WLANModule();
13 ~WLANModule(); 13 ~WLANModule();
14 14
15 virtual void setProfile(QString newProfile); 15 void setProfile(const QString &newProfile);
16 virtual bool isOwner(Interface *); 16 bool isOwner(Interface *);
17 virtual QWidget *configure(Interface *i); 17 QWidget *configure(Interface *i);
18 virtual QWidget *information(Interface *i); 18 QWidget *information(Interface *i);
19 virtual QList<Interface> getInterfaces(); 19 QList<Interface> getInterfaces();
20 virtual void possibleNewInterfaces(QMap<QString, QString> &){}; 20 void possibleNewInterfaces(QMap<QString, QString> &){};
21 virtual Interface *addNewInterface(QString name); 21 Interface *addNewInterface(const QString &name);
22 virtual bool remove(Interface* i); 22 bool remove(Interface* i);
23 virtual QString getPixmapName(Interface* i); 23 QString getPixmapName(Interface* i);
24 24
25private: 25private:
26 QList<Interface> list; 26 QList<Interface> list;
27 QString profile; 27 QString profile;
28 28
29}; 29};