Diffstat (limited to 'noncore/settings/networksettings2/lancard') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/networksettings2/lancard/lancardrun.cpp | 8 | ||||
-rw-r--r-- | noncore/settings/networksettings2/lancard/lancardrun.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/noncore/settings/networksettings2/lancard/lancardrun.cpp b/noncore/settings/networksettings2/lancard/lancardrun.cpp index 8157dce..8a71aa9 100644 --- a/noncore/settings/networksettings2/lancard/lancardrun.cpp +++ b/noncore/settings/networksettings2/lancard/lancardrun.cpp | |||
@@ -7,13 +7,13 @@ | |||
7 | State_t LanCardRun::detectState( void ) { | 7 | State_t LanCardRun::detectState( void ) { |
8 | 8 | ||
9 | // unavailable : no card found | 9 | // unavailable : no card found |
10 | // available : card found and assigned to us or free | 10 | // available : card found and assigned to us or free |
11 | // up : card found and assigned to us and up | 11 | // up : card found and assigned to us and up |
12 | 12 | ||
13 | NodeCollection * NC = nodeCollection(); | 13 | NetworkSetup * NC = networkSetup(); |
14 | QString S = QString( "/tmp/profile-%1.up" ). | 14 | QString S = QString( "/tmp/profile-%1.up" ). |
15 | arg( NC->number()); | 15 | arg( NC->number()); |
16 | System & Sys = NSResources->system(); | 16 | System & Sys = NSResources->system(); |
17 | InterfaceInfo * Run; | 17 | InterfaceInfo * Run; |
18 | 18 | ||
19 | QFile F( S ); | 19 | QFile F( S ); |
@@ -67,13 +67,13 @@ State_t LanCardRun::detectState( void ) { | |||
67 | } | 67 | } |
68 | // no free found | 68 | // no free found |
69 | 69 | ||
70 | return Unavailable; | 70 | return Unavailable; |
71 | } | 71 | } |
72 | 72 | ||
73 | QString LanCardRun::setMyState( NodeCollection * NC, Action_t A, bool ) { | 73 | QString LanCardRun::setMyState( NetworkSetup * NC, Action_t A, bool ) { |
74 | 74 | ||
75 | if( A == Activate ) { | 75 | if( A == Activate ) { |
76 | InterfaceInfo * N = getInterface(); | 76 | InterfaceInfo * N = getInterface(); |
77 | 77 | ||
78 | if( ! N ) { | 78 | if( ! N ) { |
79 | // no interface available | 79 | // no interface available |
@@ -111,16 +111,16 @@ InterfaceInfo * LanCardRun::getInterface( void ) { | |||
111 | #ifdef ARPHRD_IEEE1394 | 111 | #ifdef ARPHRD_IEEE1394 |
112 | || Run->CardType == ARPHRD_IEEE1394 | 112 | || Run->CardType == ARPHRD_IEEE1394 |
113 | #endif | 113 | #endif |
114 | ) | 114 | ) |
115 | ) { | 115 | ) { |
116 | // this is a LAN card | 116 | // this is a LAN card |
117 | if( Run->assignedConnection() == netNode()->connection() ) { | 117 | if( Run->assignedToNetworkSetup() == netNode()->networkSetup() ) { |
118 | // assigned to us | 118 | // assigned to us |
119 | return Run; | 119 | return Run; |
120 | } else if( Run->assignedConnection() == 0 ) { | 120 | } else if( Run->assignedToNetworkSetup() == 0 ) { |
121 | // free | 121 | // free |
122 | best = Run; | 122 | best = Run; |
123 | } | 123 | } |
124 | } | 124 | } |
125 | } | 125 | } |
126 | return best; // can be 0 | 126 | return best; // can be 0 |
diff --git a/noncore/settings/networksettings2/lancard/lancardrun.h b/noncore/settings/networksettings2/lancard/lancardrun.h index 57ef3fb..dfd3d62 100644 --- a/noncore/settings/networksettings2/lancard/lancardrun.h +++ b/noncore/settings/networksettings2/lancard/lancardrun.h | |||
@@ -22,13 +22,13 @@ public : | |||
22 | bool handlesInterface( const InterfaceInfo & II ); | 22 | bool handlesInterface( const InterfaceInfo & II ); |
23 | 23 | ||
24 | State_t detectState( void ); | 24 | State_t detectState( void ); |
25 | 25 | ||
26 | protected : | 26 | protected : |
27 | 27 | ||
28 | QString setMyState( NodeCollection * , Action_t, bool ); | 28 | QString setMyState( NetworkSetup * , Action_t, bool ); |
29 | 29 | ||
30 | private : | 30 | private : |
31 | 31 | ||
32 | InterfaceInfo * getInterface( void ); | 32 | InterfaceInfo * getInterface( void ); |
33 | QRegExp Pat; | 33 | QRegExp Pat; |
34 | LanCardData * Data; | 34 | LanCardData * Data; |