Diffstat (limited to 'noncore/settings/networksettings2/gprs') (more/less context) (ignore whitespace changes)
4 files changed, 13 insertions, 13 deletions
diff --git a/noncore/settings/networksettings2/gprs/GPRS_NN.cpp b/noncore/settings/networksettings2/gprs/GPRS_NN.cpp index e9553a6..374cf5a 100644 --- a/noncore/settings/networksettings2/gprs/GPRS_NN.cpp +++ b/noncore/settings/networksettings2/gprs/GPRS_NN.cpp | |||
@@ -13,5 +13,5 @@ static const char * GPRSNeeds[] = | |||
13 | 13 | ||
14 | static const char * GPRSProvides[] = | 14 | static const char * GPRSProvides[] = |
15 | { "connection", | 15 | { "NetworkSetup", |
16 | 0 | 16 | 0 |
17 | }; | 17 | }; |
diff --git a/noncore/settings/networksettings2/gprs/GPRS_NNI.cpp b/noncore/settings/networksettings2/gprs/GPRS_NNI.cpp index 2f61cba..bf8cc59 100644 --- a/noncore/settings/networksettings2/gprs/GPRS_NNI.cpp +++ b/noncore/settings/networksettings2/gprs/GPRS_NNI.cpp | |||
@@ -123,5 +123,5 @@ short AGPRSDevice::generateFile( SystemFile & SF, | |||
123 | SF << "user " << Data.User << oendl; | 123 | SF << "user " << Data.User << oendl; |
124 | SF << "connect \"/usr/sbin/chat -s -v -f /etc/chatscripts/" | 124 | SF << "connect \"/usr/sbin/chat -s -v -f /etc/chatscripts/" |
125 | << removeSpaces( connection()->name() ) | 125 | << removeSpaces( networkSetup()->name() ) |
126 | << "\"" | 126 | << "\"" |
127 | << oendl; | 127 | << oendl; |
@@ -136,5 +136,5 @@ short AGPRSDevice::generateFile( SystemFile & SF, | |||
136 | if( Data.Debug ) { | 136 | if( Data.Debug ) { |
137 | SF << "logfile /tmp/" | 137 | SF << "logfile /tmp/" |
138 | << removeSpaces( connection()->name() ) | 138 | << removeSpaces( networkSetup()->name() ) |
139 | << oendl; | 139 | << oendl; |
140 | for( int i = 0; i < Data.Debug; i ++ ) { | 140 | for( int i = 0; i < Data.Debug; i ++ ) { |
@@ -147,7 +147,7 @@ short AGPRSDevice::generateFile( SystemFile & SF, | |||
147 | SF << "lcp-echo-failure 0" << oendl; | 147 | SF << "lcp-echo-failure 0" << oendl; |
148 | SF << "usepeerdns" << oendl; | 148 | SF << "usepeerdns" << oendl; |
149 | SF << "linkname " << removeSpaces( connection()->name() ) << oendl; | 149 | SF << "linkname " << removeSpaces( networkSetup()->name() ) << oendl; |
150 | SF << "nopersist" << oendl; | 150 | SF << "nopersist" << oendl; |
151 | SF << "ipparam " << removeSpaces( connection()->name() ) <<oendl; | 151 | SF << "ipparam " << removeSpaces( networkSetup()->name() ) <<oendl; |
152 | SF << "maxfail 1" << oendl; | 152 | SF << "maxfail 1" << oendl; |
153 | return 0; | 153 | return 0; |
@@ -193,5 +193,5 @@ short AGPRSDevice::generateFile( SystemFile & SF, | |||
193 | << Data.DNS1 | 193 | << Data.DNS1 |
194 | << " # profile " | 194 | << " # profile " |
195 | << removeSpaces( connection()->name() ) | 195 | << removeSpaces( networkSetup()->name() ) |
196 | <<oendl; | 196 | <<oendl; |
197 | } | 197 | } |
@@ -201,5 +201,5 @@ short AGPRSDevice::generateFile( SystemFile & SF, | |||
201 | << Data.DNS2 | 201 | << Data.DNS2 |
202 | << " # profile " | 202 | << " # profile " |
203 | << removeSpaces( connection()->name() ) | 203 | << removeSpaces( networkSetup()->name() ) |
204 | <<oendl; | 204 | <<oendl; |
205 | } | 205 | } |
@@ -212,5 +212,5 @@ bool AGPRSDevice::openFile( SystemFile & SF ) { | |||
212 | SF.setPath( | 212 | SF.setPath( |
213 | QString( "/etc/ppp/peers/" ) + | 213 | QString( "/etc/ppp/peers/" ) + |
214 | removeSpaces( connection()->name() ) | 214 | removeSpaces( networkSetup()->name() ) |
215 | ); | 215 | ); |
216 | return 1; | 216 | return 1; |
@@ -218,5 +218,5 @@ bool AGPRSDevice::openFile( SystemFile & SF ) { | |||
218 | SF.setPath( | 218 | SF.setPath( |
219 | QString( "/etc/chatscripts/" ) + | 219 | QString( "/etc/chatscripts/" ) + |
220 | removeSpaces( connection()->name() ) | 220 | removeSpaces( networkSetup()->name() ) |
221 | ); | 221 | ); |
222 | return 1; | 222 | return 1; |
@@ -224,5 +224,5 @@ bool AGPRSDevice::openFile( SystemFile & SF ) { | |||
224 | SF.setPath( | 224 | SF.setPath( |
225 | QString( "/etc/ppp/" ) + | 225 | QString( "/etc/ppp/" ) + |
226 | removeSpaces( connection()->name() ) + ".fixed" | 226 | removeSpaces( networkSetup()->name() ) + ".fixed" |
227 | ); | 227 | ); |
228 | return 1; | 228 | return 1; |
diff --git a/noncore/settings/networksettings2/gprs/GPRSrun.cpp b/noncore/settings/networksettings2/gprs/GPRSrun.cpp index cccc71a..fd61f3a 100644 --- a/noncore/settings/networksettings2/gprs/GPRSrun.cpp +++ b/noncore/settings/networksettings2/gprs/GPRSrun.cpp | |||
@@ -12,5 +12,5 @@ State_t GPRSRun::detectState( void ) { | |||
12 | // is pppd still running ? | 12 | // is pppd still running ? |
13 | // is rfcomm still active | 13 | // is rfcomm still active |
14 | NodeCollection * NC = nodeCollection(); | 14 | NetworkSetup * NC = networkSetup(); |
15 | InterfaceInfo * I = NC->assignedInterface(); | 15 | InterfaceInfo * I = NC->assignedInterface(); |
16 | 16 | ||
@@ -63,5 +63,5 @@ State_t GPRSRun::detectState( void ) { | |||
63 | } | 63 | } |
64 | 64 | ||
65 | QString GPRSRun::setMyState( NodeCollection * NC, Action_t A , bool ) { | 65 | QString GPRSRun::setMyState( NetworkSetup * NC, Action_t A , bool ) { |
66 | 66 | ||
67 | if( A == Up ) { | 67 | if( A == Up ) { |
diff --git a/noncore/settings/networksettings2/gprs/GPRSrun.h b/noncore/settings/networksettings2/gprs/GPRSrun.h index 817f8a9..c3c2015 100644 --- a/noncore/settings/networksettings2/gprs/GPRSrun.h +++ b/noncore/settings/networksettings2/gprs/GPRSrun.h | |||
@@ -25,5 +25,5 @@ public : | |||
25 | protected : | 25 | protected : |
26 | 26 | ||
27 | QString setMyState( NodeCollection * , Action_t, bool ); | 27 | QString setMyState( NetworkSetup * , Action_t, bool ); |
28 | 28 | ||
29 | private : | 29 | private : |