58 files changed, 393 insertions, 373 deletions
diff --git a/noncore/settings/networksettings2/activateprofile.cpp b/noncore/settings/networksettings2/activateprofile.cpp index e4064e3..fe98fc4 100644 --- a/noncore/settings/networksettings2/activateprofile.cpp +++ b/noncore/settings/networksettings2/activateprofile.cpp | |||
@@ -8,9 +8,9 @@ ActivateProfile::ActivateProfile( const char * Interface ) : | |||
8 | Possible = NSD.collectPossible( Interface ); | 8 | Possible = NSD.collectPossible( Interface ); |
9 | 9 | ||
10 | DeviceName_LBL->setText( Interface ); | 10 | DeviceName_LBL->setText( Interface ); |
11 | Profiles_LB->clear(); | 11 | Profiles_LB->clear(); |
12 | for( NodeCollection * NC = Possible.first(); | 12 | for( NetworkSetup * NC = Possible.first(); |
13 | NC; | 13 | NC; |
14 | NC = Possible.next() ) { | 14 | NC = Possible.next() ) { |
15 | Profiles_LB->insertItem( NC->devicePixmap(), | 15 | Profiles_LB->insertItem( NC->devicePixmap(), |
16 | NC->name() ); | 16 | NC->name() ); |
diff --git a/noncore/settings/networksettings2/activateprofile.h b/noncore/settings/networksettings2/activateprofile.h index dedeb51..385c665 100644 --- a/noncore/settings/networksettings2/activateprofile.h +++ b/noncore/settings/networksettings2/activateprofile.h | |||
@@ -14,6 +14,6 @@ public : | |||
14 | 14 | ||
15 | private : | 15 | private : |
16 | 16 | ||
17 | NetworkSettingsData NSD; | 17 | NetworkSettingsData NSD; |
18 | QList<NodeCollection> Possible; | 18 | QList<NetworkSetup> Possible; |
19 | }; | 19 | }; |
diff --git a/noncore/settings/networksettings2/activatevpn.cpp b/noncore/settings/networksettings2/activatevpn.cpp index 768a031..35a881b 100644 --- a/noncore/settings/networksettings2/activatevpn.cpp +++ b/noncore/settings/networksettings2/activatevpn.cpp | |||
@@ -6,15 +6,15 @@ | |||
6 | class MyCheckListItem : public QCheckListItem { | 6 | class MyCheckListItem : public QCheckListItem { |
7 | 7 | ||
8 | public : | 8 | public : |
9 | 9 | ||
10 | MyCheckListItem( NodeCollection * N, QListView * V ); | 10 | MyCheckListItem( NetworkSetup * N, QListView * V ); |
11 | 11 | ||
12 | NodeCollection * NC; | 12 | NetworkSetup * NC; |
13 | 13 | ||
14 | }; | 14 | }; |
15 | 15 | ||
16 | MyCheckListItem::MyCheckListItem( NodeCollection * N, QListView * V ): | 16 | MyCheckListItem::MyCheckListItem( NetworkSetup * N, QListView * V ): |
17 | QCheckListItem( V, N->name() ) { | 17 | QCheckListItem( V, N->name() ) { |
18 | NC = N; | 18 | NC = N; |
19 | } | 19 | } |
20 | 20 | ||
@@ -24,10 +24,10 @@ ActivateVPN::ActivateVPN( const QString & I ) : | |||
24 | QCheckListItem * CI; | 24 | QCheckListItem * CI; |
25 | VPN_LV->clear(); | 25 | VPN_LV->clear(); |
26 | VPN_LV->header()->hide(); | 26 | VPN_LV->header()->hide(); |
27 | 27 | ||
28 | // find all connections that want to be triggered by this interface | 28 | // find all NetworkSetups that want to be triggered by this interface |
29 | for( QDictIterator<NodeCollection> it(NSResources->connections()); | 29 | for( QDictIterator<NetworkSetup> it(NSResources->networkSetups()); |
30 | it.current(); | 30 | it.current(); |
31 | ++it ) { | 31 | ++it ) { |
32 | if( it.current()->triggeredBy( I ) ) { | 32 | if( it.current()->triggeredBy( I ) ) { |
33 | CI = new MyCheckListItem( it.current(), VPN_LV ); | 33 | CI = new MyCheckListItem( it.current(), VPN_LV ); |
diff --git a/noncore/settings/networksettings2/bluetooth/bluetoothBNEPrun.cpp b/noncore/settings/networksettings2/bluetooth/bluetoothBNEPrun.cpp index 5c937a1..5c71a0a 100644 --- a/noncore/settings/networksettings2/bluetooth/bluetoothBNEPrun.cpp +++ b/noncore/settings/networksettings2/bluetooth/bluetoothBNEPrun.cpp | |||
@@ -4,10 +4,10 @@ | |||
4 | #include <resources.h> | 4 | #include <resources.h> |
5 | #include "bluetoothBNEPrun.h" | 5 | #include "bluetoothBNEPrun.h" |
6 | 6 | ||
7 | using Opietooth2::OTGateway; | 7 | using Opietooth2::OTGateway; |
8 | using Opietooth2::OTPANConnection; | 8 | using Opietooth2::OTPANNetworkSetup; |
9 | using Opietooth2::PANConnectionVector; | 9 | using Opietooth2::PANNetworkSetupVector; |
10 | 10 | ||
11 | BluetoothBNEPRun::BluetoothBNEPRun( ANetNodeInstance * NNI, | 11 | BluetoothBNEPRun::BluetoothBNEPRun( ANetNodeInstance * NNI, |
12 | BluetoothBNEPData & D ) : | 12 | BluetoothBNEPData & D ) : |
13 | RuntimeInfo( NNI ), | 13 | RuntimeInfo( NNI ), |
@@ -27,22 +27,22 @@ State_t BluetoothBNEPRun::detectState( void ) { | |||
27 | /* | 27 | /* |
28 | 28 | ||
29 | need to detect | 29 | need to detect |
30 | 30 | ||
31 | 1. for any PAN connection that is found if that | 31 | 1. for any PAN NetworkSetup that is found if that |
32 | PAN is connected. | 32 | PAN is connected. |
33 | 33 | ||
34 | if it is connected it is not available (since we do | 34 | if it is connected it is not available (since we do |
35 | not manage IP settings and we are called to detect | 35 | not manage IP settings and we are called to detect |
36 | the state we knwo that we do not have an UP connection) | 36 | the state we knwo that we do not have an UP NetworkSetup) |
37 | 37 | ||
38 | 2. if it not connected and we allow any connection we | 38 | 2. if it not connected and we allow any NetworkSetup we |
39 | are available or if that PAN connection is to a device | 39 | are available or if that PAN NetworkSetup is to a device |
40 | with a correct address | 40 | with a correct address |
41 | 41 | ||
42 | 3. if it is not connected and the address do not match or | 42 | 3. if it is not connected and the address do not match or |
43 | we do not accept any address, we are Unavailable but | 43 | we do not accept any address, we are Unavailable but |
44 | not DOWN. I.e a new connection could perhaps be created | 44 | not DOWN. I.e a new NetworkSetup could perhaps be created |
45 | 45 | ||
46 | */ | 46 | */ |
47 | 47 | ||
48 | if( ! OT ) { | 48 | if( ! OT ) { |
@@ -52,17 +52,17 @@ State_t BluetoothBNEPRun::detectState( void ) { | |||
52 | if( ! OT->isEnabled() ) { | 52 | if( ! OT->isEnabled() ) { |
53 | return Unavailable; | 53 | return Unavailable; |
54 | } | 54 | } |
55 | 55 | ||
56 | // if there is a PAN connection that is UP but not | 56 | // if there is a PAN NetworkSetup that is UP but not |
57 | // yet configured (no ifup) the we are available | 57 | // yet configured (no ifup) the we are available |
58 | return ( hasFreePANConnection() ) ? Available : Unknown; | 58 | return ( hasFreePANNetworkSetup() ) ? Available : Unknown; |
59 | } | 59 | } |
60 | 60 | ||
61 | QString BluetoothBNEPRun::setMyState( NodeCollection * NC, Action_t A, bool ) { | 61 | QString BluetoothBNEPRun::setMyState( NetworkSetup * NC, Action_t A, bool ) { |
62 | 62 | ||
63 | if( A == Activate ) { | 63 | if( A == Activate ) { |
64 | if( hasFreePANConnection( 1 ) ) { | 64 | if( hasFreePANNetworkSetup( 1 ) ) { |
65 | // we have now an assignedinterface | 65 | // we have now an assignedinterface |
66 | } else { | 66 | } else { |
67 | return QString("TODO : Start PAND"); | 67 | return QString("TODO : Start PAND"); |
68 | } | 68 | } |
@@ -88,19 +88,19 @@ bool BluetoothBNEPRun::handlesInterface( const QString & S ) { | |||
88 | bool BluetoothBNEPRun::handlesInterface( InterfaceInfo * I ) { | 88 | bool BluetoothBNEPRun::handlesInterface( InterfaceInfo * I ) { |
89 | return handlesInterface( I->Name ); | 89 | return handlesInterface( I->Name ); |
90 | } | 90 | } |
91 | 91 | ||
92 | bool BluetoothBNEPRun::hasFreePANConnection( bool Grab ) { | 92 | bool BluetoothBNEPRun::hasFreePANNetworkSetup( bool Grab ) { |
93 | 93 | ||
94 | if( ! OT ) { | 94 | if( ! OT ) { |
95 | OT = OTGateway::getOTGateway(); | 95 | OT = OTGateway::getOTGateway(); |
96 | } | 96 | } |
97 | 97 | ||
98 | // load PAN connections | 98 | // load PAN NetworkSetups |
99 | OTPANConnection * C; | 99 | OTPANNetworkSetup * C; |
100 | InterfaceInfo * Run; | 100 | InterfaceInfo * Run; |
101 | InterfaceInfo * Candidate = 0; // reuse this interface | 101 | InterfaceInfo * Candidate = 0; // reuse this interface |
102 | PANConnectionVector Conns = OT->getPANConnections(); | 102 | PANNetworkSetupVector Conns = OT->getPANNetworkSetups(); |
103 | System & Sys = NSResources->system(); | 103 | System & Sys = NSResources->system(); |
104 | bool IsValid; | 104 | bool IsValid; |
105 | 105 | ||
106 | for( unsigned int i = 0; | 106 | for( unsigned int i = 0; |
@@ -111,16 +111,16 @@ bool BluetoothBNEPRun::hasFreePANConnection( bool Grab ) { | |||
111 | if( Data.AllowAll ) { | 111 | if( Data.AllowAll ) { |
112 | // we allow all | 112 | // we allow all |
113 | IsValid = 1; | 113 | IsValid = 1; |
114 | } else { | 114 | } else { |
115 | // is this PAN connection connecting to a Peer | 115 | // is this PAN NetworkSetup connecting to a Peer |
116 | // we allow ? | 116 | // we allow ? |
117 | IsValid = 0; | 117 | IsValid = 0; |
118 | for ( QStringList::Iterator it = Data.BDAddress.begin(); | 118 | for ( QStringList::Iterator it = Data.BDAddress.begin(); |
119 | it != Data.BDAddress.end(); | 119 | it != Data.BDAddress.end(); |
120 | ++ it ) { | 120 | ++ it ) { |
121 | if( C->ConnectedTo == (*it) ) { | 121 | if( C->ConnectedTo == (*it) ) { |
122 | // this is a connection we could accept | 122 | // this is a NetworkSetup we could accept |
123 | IsValid = 1; | 123 | IsValid = 1; |
124 | break; | 124 | break; |
125 | } | 125 | } |
126 | } | 126 | } |
@@ -134,13 +134,13 @@ bool BluetoothBNEPRun::hasFreePANConnection( bool Grab ) { | |||
134 | // it is not acceptable | 134 | // it is not acceptable |
135 | continue; | 135 | continue; |
136 | } | 136 | } |
137 | 137 | ||
138 | // is this PAN connection available to us ? | 138 | // is this PAN NetworkSetup available to us ? |
139 | Run = Sys.findInterface( C->Device ); | 139 | Run = Sys.findInterface( C->Device ); |
140 | 140 | ||
141 | if( Run && Run->IsUp ) { | 141 | if( Run && Run->IsUp ) { |
142 | // this PAN connection is up | 142 | // this PAN NetworkSetup is up |
143 | Log(("%s acceptable but unavailable\n", | 143 | Log(("%s acceptable but unavailable\n", |
144 | C->Device.latin1() )); | 144 | C->Device.latin1() )); |
145 | // find others | 145 | // find others |
146 | continue; | 146 | continue; |
@@ -153,9 +153,9 @@ bool BluetoothBNEPRun::hasFreePANConnection( bool Grab ) { | |||
153 | } | 153 | } |
154 | 154 | ||
155 | if( Candidate ) { | 155 | if( Candidate ) { |
156 | if ( Grab ) { | 156 | if ( Grab ) { |
157 | netNode()->connection()->assignInterface( Candidate ); | 157 | netNode()->networkSetup()->assignInterface( Candidate ); |
158 | } | 158 | } |
159 | return 1; | 159 | return 1; |
160 | } | 160 | } |
161 | 161 | ||
diff --git a/noncore/settings/networksettings2/bluetooth/bluetoothBNEPrun.h b/noncore/settings/networksettings2/bluetooth/bluetoothBNEPrun.h index 8551a2e..7346a8d 100644 --- a/noncore/settings/networksettings2/bluetooth/bluetoothBNEPrun.h +++ b/noncore/settings/networksettings2/bluetooth/bluetoothBNEPrun.h | |||
@@ -21,13 +21,13 @@ public : | |||
21 | State_t detectState( void ); | 21 | State_t detectState( void ); |
22 | 22 | ||
23 | protected : | 23 | protected : |
24 | 24 | ||
25 | QString setMyState( NodeCollection * , Action_t, bool ); | 25 | QString setMyState( NetworkSetup * , Action_t, bool ); |
26 | 26 | ||
27 | private : | 27 | private : |
28 | 28 | ||
29 | bool hasFreePANConnection( bool Grab = 0 ); | 29 | bool hasFreePANNetworkSetup( bool Grab = 0 ); |
30 | 30 | ||
31 | BluetoothBNEPData & Data; | 31 | BluetoothBNEPData & Data; |
32 | Opietooth2::OTGateway * OT; | 32 | Opietooth2::OTGateway * OT; |
33 | QRegExp Pat; | 33 | QRegExp Pat; |
diff --git a/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.cpp b/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.cpp index 3df7f5c..cd7bb4a 100644 --- a/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.cpp +++ b/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.cpp | |||
@@ -19,9 +19,9 @@ State_t BluetoothRFCOMMRun::detectState( void ) { | |||
19 | if( ! OT ) { | 19 | if( ! OT ) { |
20 | OT = OTGateway::getOTGateway(); | 20 | OT = OTGateway::getOTGateway(); |
21 | } | 21 | } |
22 | 22 | ||
23 | if( deviceNrOfConnection() >= 0 ) { | 23 | if( deviceNrOfNetworkSetup() >= 0 ) { |
24 | return Available; | 24 | return Available; |
25 | } | 25 | } |
26 | 26 | ||
27 | odebug << "Bluetooth " | 27 | odebug << "Bluetooth " |
@@ -30,9 +30,9 @@ State_t BluetoothRFCOMMRun::detectState( void ) { | |||
30 | 30 | ||
31 | return ( OT->isEnabled() ) ? Off : Unavailable; | 31 | return ( OT->isEnabled() ) ? Off : Unavailable; |
32 | } | 32 | } |
33 | 33 | ||
34 | QString BluetoothRFCOMMRun::setMyState( NodeCollection *, | 34 | QString BluetoothRFCOMMRun::setMyState( NetworkSetup *, |
35 | Action_t A, | 35 | Action_t A, |
36 | bool ) { | 36 | bool ) { |
37 | 37 | ||
38 | if( OT ) { | 38 | if( OT ) { |
@@ -69,9 +69,9 @@ QString BluetoothRFCOMMRun::setMyState( NodeCollection *, | |||
69 | 69 | ||
70 | if( A == Deactivate ) { | 70 | if( A == Deactivate ) { |
71 | if( DeviceNr >= 0 ) { | 71 | if( DeviceNr >= 0 ) { |
72 | if( OT->releaseRFCommDevice( DeviceNr ) ) { | 72 | if( OT->releaseRFCommDevice( DeviceNr ) ) { |
73 | return QString( "Cannot release RFCOMM connection" ); | 73 | return QString( "Cannot release RFCOMM NetworkSetup" ); |
74 | } | 74 | } |
75 | DeviceNr = -1; | 75 | DeviceNr = -1; |
76 | } | 76 | } |
77 | } | 77 | } |
@@ -130,17 +130,17 @@ RFCOMMChannel * BluetoothRFCOMMRun::getChannel( void ) { | |||
130 | return Ch; | 130 | return Ch; |
131 | } | 131 | } |
132 | 132 | ||
133 | QString BluetoothRFCOMMRun::deviceFile( void ) { | 133 | QString BluetoothRFCOMMRun::deviceFile( void ) { |
134 | if( deviceNrOfConnection() >= 0 ) { | 134 | if( deviceNrOfNetworkSetup() >= 0 ) { |
135 | OTDevice * OTD = OT->getOTDevice(); | 135 | OTDevice * OTD = OT->getOTDevice(); |
136 | // there is a connection | 136 | // there is a NetworkSetup |
137 | return OTD->getRFCommDevicePattern().arg(DeviceNr); | 137 | return OTD->getRFCommDevicePattern().arg(DeviceNr); |
138 | } | 138 | } |
139 | return QString(); | 139 | return QString(); |
140 | } | 140 | } |
141 | 141 | ||
142 | int BluetoothRFCOMMRun::deviceNrOfConnection( void ) { | 142 | int BluetoothRFCOMMRun::deviceNrOfNetworkSetup( void ) { |
143 | 143 | ||
144 | if( ! OT ) { | 144 | if( ! OT ) { |
145 | OT = OTGateway::getOTGateway(); | 145 | OT = OTGateway::getOTGateway(); |
146 | } | 146 | } |
diff --git a/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.h b/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.h index 5a31a94..32986d3 100644 --- a/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.h +++ b/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.h | |||
@@ -19,13 +19,13 @@ public : | |||
19 | State_t detectState( void ); | 19 | State_t detectState( void ); |
20 | 20 | ||
21 | protected : | 21 | protected : |
22 | 22 | ||
23 | QString setMyState( NodeCollection * , Action_t, bool ); | 23 | QString setMyState( NetworkSetup * , Action_t, bool ); |
24 | 24 | ||
25 | private : | 25 | private : |
26 | 26 | ||
27 | int deviceNrOfConnection( void ); | 27 | int deviceNrOfNetworkSetup( void ); |
28 | RFCOMMChannel * getChannel( void ); | 28 | RFCOMMChannel * getChannel( void ); |
29 | BluetoothRFCOMMData * Data; | 29 | BluetoothRFCOMMData * Data; |
30 | Opietooth2::OTGateway * OT; | 30 | Opietooth2::OTGateway * OT; |
31 | int DeviceNr; // cached from detection | 31 | int DeviceNr; // cached from detection |
diff --git a/noncore/settings/networksettings2/cable/cable_NN.cpp b/noncore/settings/networksettings2/cable/cable_NN.cpp index 58237a1..3f34bb2 100644 --- a/noncore/settings/networksettings2/cable/cable_NN.cpp +++ b/noncore/settings/networksettings2/cable/cable_NN.cpp | |||
@@ -14,9 +14,9 @@ static const char * CableProvides[] = | |||
14 | 14 | ||
15 | /** | 15 | /** |
16 | * Constructor, find all of the possible interfaces | 16 | * Constructor, find all of the possible interfaces |
17 | */ | 17 | */ |
18 | CableNetNode::CableNetNode() : ANetNode(tr("Cable Connection")) { | 18 | CableNetNode::CableNetNode() : ANetNode(tr("Cable NetworkSetup")) { |
19 | } | 19 | } |
20 | 20 | ||
21 | /** | 21 | /** |
22 | * Delete any interfaces that we own. | 22 | * Delete any interfaces that we own. |
diff --git a/noncore/settings/networksettings2/cable/cablerun.cpp b/noncore/settings/networksettings2/cable/cablerun.cpp index 7a8deb9..edbeb89 100644 --- a/noncore/settings/networksettings2/cable/cablerun.cpp +++ b/noncore/settings/networksettings2/cable/cablerun.cpp | |||
@@ -12,9 +12,9 @@ State_t CableRun::detectState( void ) { | |||
12 | close( fd ); | 12 | close( fd ); |
13 | return Available; | 13 | return Available; |
14 | } | 14 | } |
15 | 15 | ||
16 | QString CableRun::setMyState( NodeCollection *, Action_t , bool ) { | 16 | QString CableRun::setMyState( NetworkSetup *, Action_t , bool ) { |
17 | return QString(); | 17 | return QString(); |
18 | } | 18 | } |
19 | 19 | ||
20 | QString CableRun::deviceFile( void ) { | 20 | QString CableRun::deviceFile( void ) { |
diff --git a/noncore/settings/networksettings2/cable/cablerun.h b/noncore/settings/networksettings2/cable/cablerun.h index 41aea01..6a457c4 100644 --- a/noncore/settings/networksettings2/cable/cablerun.h +++ b/noncore/settings/networksettings2/cable/cablerun.h | |||
@@ -17,9 +17,9 @@ public : | |||
17 | State_t detectState( void ); | 17 | State_t detectState( void ); |
18 | 18 | ||
19 | protected : | 19 | protected : |
20 | 20 | ||
21 | QString setMyState( NodeCollection * , Action_t, bool ); | 21 | QString setMyState( NetworkSetup * , Action_t, bool ); |
22 | 22 | ||
23 | private : | 23 | private : |
24 | 24 | ||
25 | CableData * Data; | 25 | CableData * Data; |
diff --git a/noncore/settings/networksettings2/editconnection.cpp b/noncore/settings/networksettings2/editconnection.cpp index 717d9e9..6ab2dd6 100644 --- a/noncore/settings/networksettings2/editconnection.cpp +++ b/noncore/settings/networksettings2/editconnection.cpp | |||
@@ -84,12 +84,12 @@ void MyQListViewItem::paintCell( QPainter *p, const QColorGroup &cg, | |||
84 | // REAL GUI | 84 | // REAL GUI |
85 | // | 85 | // |
86 | // | 86 | // |
87 | 87 | ||
88 | bool EditConnection::AutoCollapse = 1; | 88 | bool EditNetworkSetup::AutoCollapse = 1; |
89 | 89 | ||
90 | EditConnection::EditConnection( QWidget* parent ) : | 90 | EditNetworkSetup::EditNetworkSetup( QWidget* parent ) : |
91 | EditConnectionGUI( parent, 0, TRUE ), TmpCollection() { | 91 | EditNetworkSetupGUI( parent, 0, TRUE ), TmpCollection() { |
92 | 92 | ||
93 | Tab_TB->setTabEnabled( Setup_FRM, FALSE ); | 93 | Tab_TB->setTabEnabled( Setup_FRM, FALSE ); |
94 | Setup_FRM->setEnabled( FALSE ); | 94 | Setup_FRM->setEnabled( FALSE ); |
95 | 95 | ||
@@ -104,9 +104,9 @@ EditConnection::EditConnection( QWidget* parent ) : | |||
104 | // popluate tree with all NetNodes | 104 | // popluate tree with all NetNodes |
105 | buildFullTree(); | 105 | buildFullTree(); |
106 | } | 106 | } |
107 | 107 | ||
108 | NodeCollection * EditConnection::getTmpCollection( void ) { | 108 | NetworkSetup * EditNetworkSetup::getTmpCollection( void ) { |
109 | 109 | ||
110 | if( TmpIsValid ) | 110 | if( TmpIsValid ) |
111 | // content is stil OK | 111 | // content is stil OK |
112 | return &(TmpCollection); | 112 | return &(TmpCollection); |
@@ -118,9 +118,11 @@ NodeCollection * EditConnection::getTmpCollection( void ) { | |||
118 | if( it.current()->isNew() ) { | 118 | if( it.current()->isNew() ) { |
119 | delete it.current(); | 119 | delete it.current(); |
120 | } | 120 | } |
121 | } | 121 | } |
122 | |||
122 | TmpCollection.clear(); | 123 | TmpCollection.clear(); |
124 | TmpCollection.copyFrom( *SelectedNodes ); | ||
123 | 125 | ||
124 | // update content | 126 | // update content |
125 | QListViewItem * it = Nodes_LV->firstChild(); | 127 | QListViewItem * it = Nodes_LV->firstChild(); |
126 | ANetNode * NN; | 128 | ANetNode * NN; |
@@ -192,10 +194,10 @@ NodeCollection * EditConnection::getTmpCollection( void ) { | |||
192 | TmpIsValid = 1; | 194 | TmpIsValid = 1; |
193 | return &(TmpCollection); | 195 | return &(TmpCollection); |
194 | } | 196 | } |
195 | 197 | ||
196 | // pass a connection NodeCollection to be edited | 198 | // pass a NetworkSetup NetworkSetup to be edited |
197 | void EditConnection::setConnection( NodeCollection * NC ) { | 199 | void EditNetworkSetup::setNetworkSetup( NetworkSetup * NC ) { |
198 | ANetNodeInstance * NNI; | 200 | ANetNodeInstance * NNI; |
199 | ANetNode * NN; | 201 | ANetNode * NN; |
200 | 202 | ||
201 | SelectedNodes = NC; | 203 | SelectedNodes = NC; |
@@ -242,10 +244,10 @@ void EditConnection::setConnection( NodeCollection * NC ) { | |||
242 | // this means that this level is NOT present in collection | 244 | // this means that this level is NOT present in collection |
243 | // probably INCOMPATIBEL collection OR Missing plugin | 245 | // probably INCOMPATIBEL collection OR Missing plugin |
244 | QMessageBox::warning( | 246 | QMessageBox::warning( |
245 | 0, | 247 | 0, |
246 | tr( "Error presentig Connection" ), | 248 | tr( "Error presentig NetworkSetup" ), |
247 | tr( "<p>Old connection or missing plugin \"<i>%1</i>\"</p>" ). | 249 | tr( "<p>Old NetworkSetup or missing plugin \"<i>%1</i>\"</p>" ). |
248 | arg(NNI->nodeClass()->name()) ); | 250 | arg(NNI->nodeClass()->name()) ); |
249 | return; | 251 | return; |
250 | } | 252 | } |
251 | 253 | ||
@@ -257,16 +259,16 @@ void EditConnection::setConnection( NodeCollection * NC ) { | |||
257 | // should exist and be the same | 259 | // should exist and be the same |
258 | if( NNI ) { | 260 | if( NNI ) { |
259 | QMessageBox::warning( | 261 | QMessageBox::warning( |
260 | 0, | 262 | 0, |
261 | tr( "Error presentig Connection" ), | 263 | tr( "Error presentig NetworkSetup" ), |
262 | tr( "<p>Old connection or missing plugin \"<i>%1</i>\"</p>" ). | 264 | tr( "<p>Old NetworkSetup or missing plugin \"<i>%1</i>\"</p>" ). |
263 | arg(NNI->nodeClass()->name()) ); | 265 | arg(NNI->nodeClass()->name()) ); |
264 | } else { | 266 | } else { |
265 | QMessageBox::warning( | 267 | QMessageBox::warning( |
266 | 0, | 268 | 0, |
267 | tr( "Error presentig Connection" ), | 269 | tr( "Error presentig NetworkSetup" ), |
268 | tr( "<p>Missing connection\"<i>%1</i>\"</p>" ). | 270 | tr( "<p>Missing NetworkSetup\"<i>%1</i>\"</p>" ). |
269 | arg(it->text(0)) ); | 271 | arg(it->text(0)) ); |
270 | } | 272 | } |
271 | return; | 273 | return; |
272 | } | 274 | } |
@@ -275,13 +277,13 @@ void EditConnection::setConnection( NodeCollection * NC ) { | |||
275 | } | 277 | } |
276 | } | 278 | } |
277 | 279 | ||
278 | // get result of editing (either new OR updated collection | 280 | // get result of editing (either new OR updated collection |
279 | NodeCollection * EditConnection::connection( void ) { | 281 | NetworkSetup * EditNetworkSetup::networkSetup( void ) { |
280 | 282 | ||
281 | if( SelectedNodes == 0 ) { | 283 | if( SelectedNodes == 0 ) { |
282 | // new collection | 284 | // new collection |
283 | SelectedNodes = new NodeCollection; | 285 | SelectedNodes = new NetworkSetup; |
284 | } | 286 | } |
285 | 287 | ||
286 | // clean out old entries | 288 | // clean out old entries |
287 | SelectedNodes->clear(); | 289 | SelectedNodes->clear(); |
@@ -304,9 +306,9 @@ NodeCollection * EditConnection::connection( void ) { | |||
304 | return SelectedNodes; | 306 | return SelectedNodes; |
305 | } | 307 | } |
306 | 308 | ||
307 | // Build device tree -> start | 309 | // Build device tree -> start |
308 | void EditConnection::buildFullTree( void ) { | 310 | void EditNetworkSetup::buildFullTree( void ) { |
309 | ANetNode * NN; | 311 | ANetNode * NN; |
310 | 312 | ||
311 | // toplevel item | 313 | // toplevel item |
312 | MyQCheckListItem * TheTop = new MyQCheckListItem( | 314 | MyQCheckListItem * TheTop = new MyQCheckListItem( |
@@ -318,9 +320,9 @@ void EditConnection::buildFullTree( void ) { | |||
318 | NSResources->netNode2Description( "fullsetup" ) ); | 320 | NSResources->netNode2Description( "fullsetup" ) ); |
319 | Nodes_LV->setSelected( TheTop, TRUE ); | 321 | Nodes_LV->setSelected( TheTop, TRUE ); |
320 | 322 | ||
321 | // find all Nodes that are toplevel nodes -> ie provide | 323 | // find all Nodes that are toplevel nodes -> ie provide |
322 | // TCP/IP Connection | 324 | // TCP/IP NetworkSetup |
323 | for( QDictIterator<ANetNode> Iter(NSResources->netNodes()); | 325 | for( QDictIterator<ANetNode> Iter(NSResources->netNodes()); |
324 | Iter.current(); | 326 | Iter.current(); |
325 | ++Iter ) { | 327 | ++Iter ) { |
326 | NN = Iter.current(); | 328 | NN = Iter.current(); |
@@ -341,9 +343,9 @@ void EditConnection::buildFullTree( void ) { | |||
341 | } | 343 | } |
342 | } | 344 | } |
343 | 345 | ||
344 | // Build device tree -> help function | 346 | // Build device tree -> help function |
345 | void EditConnection::buildSubTree( QListViewItem * it, ANetNode *NN ) { | 347 | void EditNetworkSetup::buildSubTree( QListViewItem * it, ANetNode *NN ) { |
346 | ANetNode::NetNodeList & NNL = NN->alternatives(); | 348 | ANetNode::NetNodeList & NNL = NN->alternatives(); |
347 | 349 | ||
348 | if( NNL.size() > 1 ) { | 350 | if( NNL.size() > 1 ) { |
349 | // this node has alternatives -> needs radio buttons | 351 | // this node has alternatives -> needs radio buttons |
@@ -377,13 +379,13 @@ void EditConnection::buildSubTree( QListViewItem * it, ANetNode *NN ) { | |||
377 | } | 379 | } |
378 | } | 380 | } |
379 | 381 | ||
380 | // Clicked ok OK button | 382 | // Clicked ok OK button |
381 | void EditConnection::accept( void ) { | 383 | void EditNetworkSetup::accept( void ) { |
382 | if( ! haveCompleteConfig( 0 ) || Name_LE->text().isEmpty() ) { | 384 | if( ! haveCompleteConfig( 0 ) || Name_LE->text().isEmpty() ) { |
383 | QMessageBox::warning( | 385 | QMessageBox::warning( |
384 | 0, | 386 | 0, |
385 | tr( "Closing Connection Setup" ), | 387 | tr( "Closing NetworkSetup Setup" ), |
386 | tr( "Definition not complete or no name" ) ); | 388 | tr( "Definition not complete or no name" ) ); |
387 | return; | 389 | return; |
388 | } | 390 | } |
389 | 391 | ||
@@ -417,14 +419,14 @@ void EditConnection::accept( void ) { | |||
417 | QDialog::accept(); | 419 | QDialog::accept(); |
418 | } | 420 | } |
419 | 421 | ||
420 | // triggered by CB | 422 | // triggered by CB |
421 | void EditConnection::SLOT_AutoCollapse( bool b ) { | 423 | void EditNetworkSetup::SLOT_AutoCollapse( bool b ) { |
422 | AutoCollapse = b; | 424 | AutoCollapse = b; |
423 | } | 425 | } |
424 | 426 | ||
425 | // clicked on node in tree -> update GUI | 427 | // clicked on node in tree -> update GUI |
426 | void EditConnection::SLOT_SelectNode( QListViewItem * it ) { | 428 | void EditNetworkSetup::SLOT_SelectNode( QListViewItem * it ) { |
427 | ANetNode * NN; | 429 | ANetNode * NN; |
428 | if( it == 0 || it->depth() == 0 ) { | 430 | if( it == 0 || it->depth() == 0 ) { |
429 | Description_LBL->setText( | 431 | Description_LBL->setText( |
430 | NSResources->netNode2Description( "fullsetup" ) ); | 432 | NSResources->netNode2Description( "fullsetup" ) ); |
@@ -464,9 +466,9 @@ void EditConnection::SLOT_SelectNode( QListViewItem * it ) { | |||
464 | updateGUI( it, NN ); | 466 | updateGUI( it, NN ); |
465 | } | 467 | } |
466 | 468 | ||
467 | // cliecked on TAB to go to setup | 469 | // cliecked on TAB to go to setup |
468 | void EditConnection::SLOT_AlterTab( const QString & S ) { | 470 | void EditNetworkSetup::SLOT_AlterTab( const QString & S ) { |
469 | if( S == tr( "Setup" ) && Setup_FRM->isEnabled() ) { | 471 | if( S == tr( "Setup" ) && Setup_FRM->isEnabled() ) { |
470 | // switched to setup -> update CB and populate ws with | 472 | // switched to setup -> update CB and populate ws with |
471 | // forms for devices | 473 | // forms for devices |
472 | 474 | ||
@@ -513,9 +515,9 @@ void EditConnection::SLOT_AlterTab( const QString & S ) { | |||
513 | } | 515 | } |
514 | } | 516 | } |
515 | 517 | ||
516 | // update visual feedback of selection state | 518 | // update visual feedback of selection state |
517 | void EditConnection::updateGUI( QListViewItem * it, ANetNode * NN ) { | 519 | void EditNetworkSetup::updateGUI( QListViewItem * it, ANetNode * NN ) { |
518 | 520 | ||
519 | bool HCC = haveCompleteConfig( it ); | 521 | bool HCC = haveCompleteConfig( it ); |
520 | Tab_TB->setTabEnabled( Setup_FRM, HCC ); | 522 | Tab_TB->setTabEnabled( Setup_FRM, HCC ); |
521 | Setup_FRM->setEnabled( HCC ); | 523 | Setup_FRM->setEnabled( HCC ); |
@@ -539,9 +541,9 @@ void EditConnection::updateGUI( QListViewItem * it, ANetNode * NN ) { | |||
539 | 1 : // toplevel always alternatives | 541 | 1 : // toplevel always alternatives |
540 | (NN->alternatives().size() > 1) ); | 542 | (NN->alternatives().size() > 1) ); |
541 | } | 543 | } |
542 | 544 | ||
543 | void EditConnection::disableTree( QListViewItem * it, bool Mode ) { | 545 | void EditNetworkSetup::disableTree( QListViewItem * it, bool Mode ) { |
544 | while( it ) { | 546 | while( it ) { |
545 | // disable sbl's chidren | 547 | // disable sbl's chidren |
546 | it->setSelectable( Mode ); | 548 | it->setSelectable( Mode ); |
547 | if( AutoCollapse ) | 549 | if( AutoCollapse ) |
@@ -551,9 +553,9 @@ void EditConnection::disableTree( QListViewItem * it, bool Mode ) { | |||
551 | } | 553 | } |
552 | } | 554 | } |
553 | 555 | ||
554 | // pah : ParentHasAlternatives | 556 | // pah : ParentHasAlternatives |
555 | void EditConnection::enablePath( QListViewItem * it, bool pha ) { | 557 | void EditNetworkSetup::enablePath( QListViewItem * it, bool pha ) { |
556 | while( it ) { | 558 | while( it ) { |
557 | ANetNode * NN; | 559 | ANetNode * NN; |
558 | NN = (*Mapping)[it]; | 560 | NN = (*Mapping)[it]; |
559 | if( NN ) { | 561 | if( NN ) { |
@@ -588,9 +590,9 @@ void EditConnection::enablePath( QListViewItem * it, bool pha ) { | |||
588 | } | 590 | } |
589 | } | 591 | } |
590 | 592 | ||
591 | // do we have a complete configuration (all needs are provided for ?) | 593 | // do we have a complete configuration (all needs are provided for ?) |
592 | bool EditConnection::haveCompleteConfig( QListViewItem * it ) { | 594 | bool EditNetworkSetup::haveCompleteConfig( QListViewItem * it ) { |
593 | 595 | ||
594 | // check if all below this level is selected | 596 | // check if all below this level is selected |
595 | it = ( it ) ?it : Nodes_LV->firstChild(); | 597 | it = ( it ) ?it : Nodes_LV->firstChild(); |
596 | ANetNode *NN; | 598 | ANetNode *NN; |
diff --git a/noncore/settings/networksettings2/editconnection.h b/noncore/settings/networksettings2/editconnection.h index e8d7a2c..c2fc643 100644 --- a/noncore/settings/networksettings2/editconnection.h +++ b/noncore/settings/networksettings2/editconnection.h | |||
@@ -9,19 +9,19 @@ class ANetNode; | |||
9 | class QListViewItem; | 9 | class QListViewItem; |
10 | class NetNodeLVI; | 10 | class NetNodeLVI; |
11 | class QCloseEvent; | 11 | class QCloseEvent; |
12 | 12 | ||
13 | class EditConnection : public EditConnectionGUI { | 13 | class EditNetworkSetup : public EditNetworkSetupGUI { |
14 | 14 | ||
15 | Q_OBJECT | 15 | Q_OBJECT |
16 | 16 | ||
17 | public : | 17 | public : |
18 | 18 | ||
19 | EditConnection( QWidget * P ); | 19 | EditNetworkSetup( QWidget * P ); |
20 | 20 | ||
21 | ANetNodeInstance * netNodeInstance( void ); | 21 | ANetNodeInstance * netNodeInstance( void ); |
22 | void setConnection( NodeCollection * NC ); | 22 | void setNetworkSetup( NetworkSetup * NC ); |
23 | NodeCollection * connection( void ); | 23 | NetworkSetup * networkSetup( void ); |
24 | 24 | ||
25 | public slots : | 25 | public slots : |
26 | 26 | ||
27 | void SLOT_AutoCollapse( bool ); | 27 | void SLOT_AutoCollapse( bool ); |
@@ -30,20 +30,20 @@ public slots : | |||
30 | virtual void accept( void ); | 30 | virtual void accept( void ); |
31 | 31 | ||
32 | private : | 32 | private : |
33 | 33 | ||
34 | NodeCollection * getTmpCollection( void ); | 34 | NetworkSetup * getTmpCollection( void ); |
35 | void updateGUI( QListViewItem * it, ANetNode * NN ); | 35 | void updateGUI( QListViewItem * it, ANetNode * NN ); |
36 | void buildFullTree( void ); | 36 | void buildFullTree( void ); |
37 | void buildSubTree( QListViewItem * Parent, ANetNode * NN ); | 37 | void buildSubTree( QListViewItem * Parent, ANetNode * NN ); |
38 | void disableTree( QListViewItem * it, bool Mode); | 38 | void disableTree( QListViewItem * it, bool Mode); |
39 | void enablePath( QListViewItem * it, bool pha); | 39 | void enablePath( QListViewItem * it, bool pha); |
40 | 40 | ||
41 | bool haveCompleteConfig( QListViewItem * it ); | 41 | bool haveCompleteConfig( QListViewItem * it ); |
42 | QPtrDict<ANetNode> * Mapping; | 42 | QPtrDict<ANetNode> * Mapping; |
43 | NodeCollection * SelectedNodes; | 43 | NetworkSetup * SelectedNodes; |
44 | bool TmpIsValid; | 44 | bool TmpIsValid; |
45 | NodeCollection TmpCollection; | 45 | NetworkSetup TmpCollection; |
46 | 46 | ||
47 | static bool AutoCollapse; | 47 | static bool AutoCollapse; |
48 | 48 | ||
49 | }; | 49 | }; |
diff --git a/noncore/settings/networksettings2/editconnectionGUI.ui b/noncore/settings/networksettings2/editconnectionGUI.ui index dfb2596..5e50490 100644 --- a/noncore/settings/networksettings2/editconnectionGUI.ui +++ b/noncore/settings/networksettings2/editconnectionGUI.ui | |||
@@ -1,11 +1,11 @@ | |||
1 | <!DOCTYPE UI><UI> | 1 | <!DOCTYPE UI><UI> |
2 | <class>EditConnectionGUI</class> | 2 | <class>EditNetworkSetupGUI</class> |
3 | <widget> | 3 | <widget> |
4 | <class>QDialog</class> | 4 | <class>QDialog</class> |
5 | <property stdset="1"> | 5 | <property stdset="1"> |
6 | <name>name</name> | 6 | <name>name</name> |
7 | <cstring>EditConnectionGUI</cstring> | 7 | <cstring>EditNetworkSetupGUI</cstring> |
8 | </property> | 8 | </property> |
9 | <property stdset="1"> | 9 | <property stdset="1"> |
10 | <name>geometry</name> | 10 | <name>geometry</name> |
11 | <rect> | 11 | <rect> |
@@ -116,9 +116,9 @@ | |||
116 | <enum>MShadow</enum> | 116 | <enum>MShadow</enum> |
117 | </property> | 117 | </property> |
118 | <property stdset="1"> | 118 | <property stdset="1"> |
119 | <name>text</name> | 119 | <name>text</name> |
120 | <string>Connection profile</string> | 120 | <string>NetworkSetup profile</string> |
121 | </property> | 121 | </property> |
122 | <property stdset="1"> | 122 | <property stdset="1"> |
123 | <name>alignment</name> | 123 | <name>alignment</name> |
124 | <set>AlignVCenter|AlignLeft</set> | 124 | <set>AlignVCenter|AlignLeft</set> |
@@ -377,15 +377,15 @@ | |||
377 | <connections> | 377 | <connections> |
378 | <connection> | 378 | <connection> |
379 | <sender>Nodes_LV</sender> | 379 | <sender>Nodes_LV</sender> |
380 | <signal>clicked(QListViewItem*)</signal> | 380 | <signal>clicked(QListViewItem*)</signal> |
381 | <receiver>EditConnectionGUI</receiver> | 381 | <receiver>EditNetworkSetupGUI</receiver> |
382 | <slot>SLOT_SelectNode( QListViewItem *)</slot> | 382 | <slot>SLOT_SelectNode( QListViewItem *)</slot> |
383 | </connection> | 383 | </connection> |
384 | <connection> | 384 | <connection> |
385 | <sender>AutoCollapse_CB</sender> | 385 | <sender>AutoCollapse_CB</sender> |
386 | <signal>toggled(bool)</signal> | 386 | <signal>toggled(bool)</signal> |
387 | <receiver>EditConnectionGUI</receiver> | 387 | <receiver>EditNetworkSetupGUI</receiver> |
388 | <slot>SLOT_AutoCollapse( bool)</slot> | 388 | <slot>SLOT_AutoCollapse( bool)</slot> |
389 | </connection> | 389 | </connection> |
390 | <connection> | 390 | <connection> |
391 | <sender>Devices_CB</sender> | 391 | <sender>Devices_CB</sender> |
@@ -395,9 +395,9 @@ | |||
395 | </connection> | 395 | </connection> |
396 | <connection> | 396 | <connection> |
397 | <sender>Tab_TB</sender> | 397 | <sender>Tab_TB</sender> |
398 | <signal>selected(const QString&)</signal> | 398 | <signal>selected(const QString&)</signal> |
399 | <receiver>EditConnectionGUI</receiver> | 399 | <receiver>EditNetworkSetupGUI</receiver> |
400 | <slot>SLOT_AlterTab( const QString & )</slot> | 400 | <slot>SLOT_AlterTab( const QString & )</slot> |
401 | </connection> | 401 | </connection> |
402 | <slot access="public">SLOT_AlterTab( const QString & )</slot> | 402 | <slot access="public">SLOT_AlterTab( const QString & )</slot> |
403 | <slot access="public">SLOT_AutoCollapse( bool)</slot> | 403 | <slot access="public">SLOT_AutoCollapse( bool)</slot> |
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 | |||
@@ -11,9 +11,9 @@ static const char * GPRSNeeds[] = | |||
11 | 0 | 11 | 0 |
12 | }; | 12 | }; |
13 | 13 | ||
14 | static const char * GPRSProvides[] = | 14 | static const char * GPRSProvides[] = |
15 | { "connection", | 15 | { "NetworkSetup", |
16 | 0 | 16 | 0 |
17 | }; | 17 | }; |
18 | 18 | ||
19 | /** | 19 | /** |
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 | |||
@@ -121,9 +121,9 @@ short AGPRSDevice::generateFile( SystemFile & SF, | |||
121 | } else if( SF.name() == "peers" ) { | 121 | } else if( SF.name() == "peers" ) { |
122 | SF << "noauth" << oendl; | 122 | SF << "noauth" << oendl; |
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; |
128 | SF << "ipcp-accept-local" << oendl; | 128 | SF << "ipcp-accept-local" << oendl; |
129 | SF << "ipcp-accept-remote" << oendl; | 129 | SF << "ipcp-accept-remote" << oendl; |
@@ -134,9 +134,9 @@ short AGPRSDevice::generateFile( SystemFile & SF, | |||
134 | } | 134 | } |
135 | } | 135 | } |
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 ++ ) { |
141 | SF << "debug" << oendl; | 141 | SF << "debug" << oendl; |
142 | } | 142 | } |
@@ -145,11 +145,11 @@ short AGPRSDevice::generateFile( SystemFile & SF, | |||
145 | SF << "local" << oendl; | 145 | SF << "local" << oendl; |
146 | SF << "lcp-echo-interval 0" << oendl; | 146 | SF << "lcp-echo-interval 0" << oendl; |
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; |
154 | } else if( SF.name() == "extra" ) { | 154 | } else if( SF.name() == "extra" ) { |
155 | unsigned long Bits; | 155 | unsigned long Bits; |
@@ -191,17 +191,17 @@ short AGPRSDevice::generateFile( SystemFile & SF, | |||
191 | if( ! Data.DNS1.isEmpty() ) { | 191 | if( ! Data.DNS1.isEmpty() ) { |
192 | SF << "nameserver " | 192 | SF << "nameserver " |
193 | << Data.DNS1 | 193 | << Data.DNS1 |
194 | << " # profile " | 194 | << " # profile " |
195 | << removeSpaces( connection()->name() ) | 195 | << removeSpaces( networkSetup()->name() ) |
196 | <<oendl; | 196 | <<oendl; |
197 | } | 197 | } |
198 | 198 | ||
199 | if( ! Data.DNS2.isEmpty() ) { | 199 | if( ! Data.DNS2.isEmpty() ) { |
200 | SF << "nameserver " | 200 | SF << "nameserver " |
201 | << Data.DNS2 | 201 | << Data.DNS2 |
202 | << " # profile " | 202 | << " # profile " |
203 | << removeSpaces( connection()->name() ) | 203 | << removeSpaces( networkSetup()->name() ) |
204 | <<oendl; | 204 | <<oendl; |
205 | } | 205 | } |
206 | } | 206 | } |
207 | return 1; | 207 | return 1; |
@@ -210,21 +210,21 @@ short AGPRSDevice::generateFile( SystemFile & SF, | |||
210 | bool AGPRSDevice::openFile( SystemFile & SF ) { | 210 | bool AGPRSDevice::openFile( SystemFile & SF ) { |
211 | if( SF.name() == "peers" ) { | 211 | if( SF.name() == "peers" ) { |
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; |
217 | } else if ( SF.name() == "chatscripts" ) { | 217 | } else if ( SF.name() == "chatscripts" ) { |
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; |
223 | } else if ( SF.name() == "extra" ) { | 223 | } else if ( SF.name() == "extra" ) { |
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; |
229 | } | 229 | } |
230 | return 0; | 230 | return 0; |
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 | |||
@@ -10,9 +10,9 @@ | |||
10 | State_t GPRSRun::detectState( void ) { | 10 | State_t GPRSRun::detectState( void ) { |
11 | 11 | ||
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 | ||
17 | QDir D("/var/run"); | 17 | QDir D("/var/run"); |
18 | 18 | ||
@@ -61,9 +61,9 @@ State_t GPRSRun::detectState( void ) { | |||
61 | NC->assignInterface( 0 ); | 61 | NC->assignInterface( 0 ); |
62 | return Unknown; | 62 | return Unknown; |
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 ) { |
68 | // start ppp on deviceFile | 68 | // start ppp on deviceFile |
69 | QStringList SL; | 69 | QStringList SL; |
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 | |||
@@ -23,9 +23,9 @@ public : | |||
23 | State_t detectState( void ); | 23 | State_t detectState( void ); |
24 | 24 | ||
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 : |
30 | 30 | ||
31 | QRegExp Pat; | 31 | QRegExp Pat; |
diff --git a/noncore/settings/networksettings2/irda/irdarun.h b/noncore/settings/networksettings2/irda/irdarun.h index d3b714b..e5ba79a 100644 --- a/noncore/settings/networksettings2/irda/irdarun.h +++ b/noncore/settings/networksettings2/irda/irdarun.h | |||
@@ -19,7 +19,7 @@ public : | |||
19 | { return Unknown; } | 19 | { return Unknown; } |
20 | 20 | ||
21 | protected : | 21 | protected : |
22 | 22 | ||
23 | QString setMyState( NodeCollection * , Action_t, bool ) | 23 | QString setMyState( NetworkSetup * , Action_t, bool ) |
24 | { return QString(); } | 24 | { return QString(); } |
25 | }; | 25 | }; |
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 | |||
@@ -9,9 +9,9 @@ State_t LanCardRun::detectState( void ) { | |||
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; |
@@ -69,9 +69,9 @@ State_t LanCardRun::detectState( void ) { | |||
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 | ||
@@ -113,12 +113,12 @@ InterfaceInfo * LanCardRun::getInterface( void ) { | |||
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 | } |
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 | |||
@@ -24,9 +24,9 @@ public : | |||
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 ); |
diff --git a/noncore/settings/networksettings2/modem/modemrun.h b/noncore/settings/networksettings2/modem/modemrun.h index eb3a193..df6b370 100644 --- a/noncore/settings/networksettings2/modem/modemrun.h +++ b/noncore/settings/networksettings2/modem/modemrun.h | |||
@@ -19,7 +19,7 @@ public : | |||
19 | { return Unknown;} | 19 | { return Unknown;} |
20 | 20 | ||
21 | protected : | 21 | protected : |
22 | 22 | ||
23 | QString setMyState( NodeCollection * , Action_t, bool ) | 23 | QString setMyState( NetworkSetup * , Action_t, bool ) |
24 | { return QString(); } | 24 | { return QString(); } |
25 | }; | 25 | }; |
diff --git a/noncore/settings/networksettings2/network/network_NN.cpp b/noncore/settings/networksettings2/network/network_NN.cpp index 2fa31bd..80a7fac 100644 --- a/noncore/settings/networksettings2/network/network_NN.cpp +++ b/noncore/settings/networksettings2/network/network_NN.cpp | |||
@@ -11,9 +11,9 @@ static const char * NetworkNeeds[] = | |||
11 | 0 | 11 | 0 |
12 | }; | 12 | }; |
13 | 13 | ||
14 | static const char * NetworkProvides[] = | 14 | static const char * NetworkProvides[] = |
15 | { "connection", | 15 | { "NetworkSetup", |
16 | 0 | 16 | 0 |
17 | }; | 17 | }; |
18 | 18 | ||
19 | /** | 19 | /** |
diff --git a/noncore/settings/networksettings2/network/network_NNI.cpp b/noncore/settings/networksettings2/network/network_NNI.cpp index 34dac54..c183d5e 100644 --- a/noncore/settings/networksettings2/network/network_NNI.cpp +++ b/noncore/settings/networksettings2/network/network_NNI.cpp | |||
@@ -116,16 +116,16 @@ short ANetwork::generateFile( SystemFile &SF, | |||
116 | // we can safely call from here since device item is deeper | 116 | // we can safely call from here since device item is deeper |
117 | if( Data.UseDHCP ) { | 117 | if( Data.UseDHCP ) { |
118 | SF << "iface " | 118 | SF << "iface " |
119 | << "A" | 119 | << "A" |
120 | << connection()->number() | 120 | << networkSetup()->number() |
121 | << NIC | 121 | << NIC |
122 | << " inet dhcp" | 122 | << " inet dhcp" |
123 | << endl; | 123 | << endl; |
124 | SF << " up echo \"" | 124 | SF << " up echo \"" |
125 | << NIC | 125 | << NIC |
126 | << "\" > /tmp/profile-" | 126 | << "\" > /tmp/profile-" |
127 | << connection()->number() | 127 | << networkSetup()->number() |
128 | << ".up" | 128 | << ".up" |
129 | << endl; | 129 | << endl; |
130 | if( Data.SendHostname ) { | 130 | if( Data.SendHostname ) { |
131 | SF << " hostname " | 131 | SF << " hostname " |
@@ -133,26 +133,26 @@ short ANetwork::generateFile( SystemFile &SF, | |||
133 | << endl; | 133 | << endl; |
134 | } | 134 | } |
135 | 135 | ||
136 | SF << " down rm -f /tmp/profile-" | 136 | SF << " down rm -f /tmp/profile-" |
137 | << connection()->number() | 137 | << networkSetup()->number() |
138 | << ".up" | 138 | << ".up" |
139 | << endl; | 139 | << endl; |
140 | } else { | 140 | } else { |
141 | SF << "iface " | 141 | SF << "iface " |
142 | << "A" | 142 | << "A" |
143 | << connection()->number() | 143 | << networkSetup()->number() |
144 | << NIC | 144 | << NIC |
145 | << " inet static" | 145 | << " inet static" |
146 | << endl; | 146 | << endl; |
147 | SF << " up echo \"" | 147 | SF << " up echo \"" |
148 | << NIC | 148 | << NIC |
149 | << "\" > /tmp/profile-" | 149 | << "\" > /tmp/profile-" |
150 | << connection()->number() | 150 | << networkSetup()->number() |
151 | << ".up" | 151 | << ".up" |
152 | << endl; | 152 | << endl; |
153 | SF << " down rm -f /tmp/profile-" | 153 | SF << " down rm -f /tmp/profile-" |
154 | << connection()->number() | 154 | << networkSetup()->number() |
155 | << ".up" | 155 | << ".up" |
156 | << endl; | 156 | << endl; |
157 | SF << " address " | 157 | SF << " address " |
158 | << Data.IPAddress | 158 | << Data.IPAddress |
@@ -210,9 +210,9 @@ short ANetwork::generateFile( SystemFile &SF, | |||
210 | rvl = 0; | 210 | rvl = 0; |
211 | } | 211 | } |
212 | 212 | ||
213 | // embed other info in it | 213 | // embed other info in it |
214 | rvd = connection()->getToplevel()->generateFileEmbedded( SF, DevNr ); | 214 | rvd = networkSetup()->getToplevel()->generateFileEmbedded( SF, DevNr ); |
215 | 215 | ||
216 | return (rvd == 2 || rvl == 2 ) ? 2 : | 216 | return (rvd == 2 || rvl == 2 ) ? 2 : |
217 | (rvd == 0 || rvl == 0 ) ? 0 : 1; | 217 | (rvd == 0 || rvl == 0 ) ? 0 : 1; |
218 | } | 218 | } |
diff --git a/noncore/settings/networksettings2/network/networkrun.cpp b/noncore/settings/networksettings2/network/networkrun.cpp index 74467ad..7039a36 100644 --- a/noncore/settings/networksettings2/network/networkrun.cpp +++ b/noncore/settings/networksettings2/network/networkrun.cpp | |||
@@ -3,23 +3,22 @@ | |||
3 | #include <resources.h> | 3 | #include <resources.h> |
4 | #include "networkrun.h" | 4 | #include "networkrun.h" |
5 | 5 | ||
6 | State_t NetworkRun::detectState( void ) { | 6 | State_t NetworkRun::detectState( void ) { |
7 | InterfaceInfo * II = nodeCollection()->assignedInterface(); | 7 | InterfaceInfo * II = networkSetup()->assignedInterface(); |
8 | 8 | ||
9 | Log(( "Interface %p %p : %d\n", II, nodeCollection(), (II) ? II->IsUp : 0 )); | ||
10 | if( II && II->IsUp ) { | 9 | if( II && II->IsUp ) { |
11 | // device has assigned interface | 10 | // device has assigned interface |
12 | return IsUp; | 11 | return IsUp; |
13 | } | 12 | } |
14 | 13 | ||
15 | // had no interface or interface is no longer up -> release | 14 | // had no interface or interface is no longer up -> release |
16 | nodeCollection()->assignInterface( 0 ); | 15 | networkSetup()->assignInterface( 0 ); |
17 | 16 | ||
18 | return Unknown; | 17 | return Unknown; |
19 | } | 18 | } |
20 | 19 | ||
21 | QString NetworkRun::setMyState( NodeCollection * NC, Action_t A, bool ) { | 20 | QString NetworkRun::setMyState( NetworkSetup * NC, Action_t A, bool ) { |
22 | // we handle UP and DOWN | 21 | // we handle UP and DOWN |
23 | InterfaceInfo * II = NC->assignedInterface(); | 22 | InterfaceInfo * II = NC->assignedInterface(); |
24 | 23 | ||
25 | if( ! II ) { | 24 | if( ! II ) { |
@@ -39,9 +38,9 @@ QString NetworkRun::setMyState( NodeCollection * NC, Action_t A, bool ) { | |||
39 | } | 38 | } |
40 | 39 | ||
41 | SL << QString().sprintf( "%s=A%ld%s", | 40 | SL << QString().sprintf( "%s=A%ld%s", |
42 | II->Name.latin1(), | 41 | II->Name.latin1(), |
43 | nodeCollection()->number(), | 42 | networkSetup()->number(), |
44 | II->Name.latin1() ); | 43 | II->Name.latin1() ); |
45 | 44 | ||
46 | if( ! NSResources->system().runAsRoot( SL ) ) { | 45 | if( ! NSResources->system().runAsRoot( SL ) ) { |
47 | return QString("Cannot call %1").arg(SL.join(" ")); | 46 | return QString("Cannot call %1").arg(SL.join(" ")); |
diff --git a/noncore/settings/networksettings2/network/networkrun.h b/noncore/settings/networksettings2/network/networkrun.h index 78a1694..ac186e7 100644 --- a/noncore/settings/networksettings2/network/networkrun.h +++ b/noncore/settings/networksettings2/network/networkrun.h | |||
@@ -15,6 +15,6 @@ public : | |||
15 | State_t detectState( void ); | 15 | State_t detectState( void ); |
16 | 16 | ||
17 | protected : | 17 | protected : |
18 | 18 | ||
19 | QString setMyState( NodeCollection * , Action_t, bool ); | 19 | QString setMyState( NetworkSetup * , Action_t, bool ); |
20 | }; | 20 | }; |
diff --git a/noncore/settings/networksettings2/networksettings.cpp b/noncore/settings/networksettings2/networksettings.cpp index 78b6cce..80dcb3d 100644 --- a/noncore/settings/networksettings2/networksettings.cpp +++ b/noncore/settings/networksettings2/networksettings.cpp | |||
@@ -63,12 +63,12 @@ NetworkSettings::NetworkSettings( QWidget *parent, | |||
63 | connect( Profiles_LB, | 63 | connect( Profiles_LB, |
64 | SIGNAL(rightButtonPressed(QListBoxItem*,const QPoint&)), | 64 | SIGNAL(rightButtonPressed(QListBoxItem*,const QPoint&)), |
65 | this, SLOT(SLOT_EditNode(QListBoxItem*)) ); | 65 | this, SLOT(SLOT_EditNode(QListBoxItem*)) ); |
66 | 66 | ||
67 | { Name2Connection_t & M = NSResources->connections(); | 67 | { Name2NetworkSetup_t & M = NSResources->networkSetups(); |
68 | NodeCollection * NC; | 68 | NetworkSetup * NC; |
69 | // for all connections | 69 | // for all NetworkSetups |
70 | for( QDictIterator<NodeCollection> it(M); | 70 | for( QDictIterator<NetworkSetup> it(M); |
71 | it.current(); | 71 | it.current(); |
72 | ++it ) { | 72 | ++it ) { |
73 | NC = it.current(); | 73 | NC = it.current(); |
74 | Profiles_LB->insertItem( NC->devicePixmap(), | 74 | Profiles_LB->insertItem( NC->devicePixmap(), |
@@ -80,9 +80,9 @@ NetworkSettings::NetworkSettings( QWidget *parent, | |||
80 | Profiles_LB->setSelected( 0, TRUE ); | 80 | Profiles_LB->setSelected( 0, TRUE ); |
81 | } | 81 | } |
82 | 82 | ||
83 | // if no profiles -> auto popup editing | 83 | // if no profiles -> auto popup editing |
84 | if( NSResources->connections().count() == 0 ) { | 84 | if( NSResources->networkSetups().count() == 0 ) { |
85 | QTimer::singleShot( 100, this, SLOT(SLOT_AddNode() ) ); | 85 | QTimer::singleShot( 100, this, SLOT(SLOT_AddNode() ) ); |
86 | } | 86 | } |
87 | 87 | ||
88 | connect( &(NSResources->system()), | 88 | connect( &(NSResources->system()), |
@@ -135,12 +135,12 @@ void NetworkSettings::SLOT_CmdMessage( const QString & S ) { | |||
135 | void NetworkSettings::SLOT_RefreshStates( void ) { | 135 | void NetworkSettings::SLOT_RefreshStates( void ) { |
136 | QListBoxItem * LBI = Profiles_LB->item( Profiles_LB->currentItem() ); // remember | 136 | QListBoxItem * LBI = Profiles_LB->item( Profiles_LB->currentItem() ); // remember |
137 | 137 | ||
138 | if( LBI ) { | 138 | if( LBI ) { |
139 | NodeCollection * NC; | 139 | NetworkSetup * NC; |
140 | NSResources->system().probeInterfaces(); | 140 | NSResources->system().probeInterfaces(); |
141 | // update current selection only | 141 | // update current selection only |
142 | NC = NSResources->findConnection( LBI->text() ); | 142 | NC = NSResources->findNetworkSetup( LBI->text() ); |
143 | if( NC ) { | 143 | if( NC ) { |
144 | State_t OldS = NC->state(); | 144 | State_t OldS = NC->state(); |
145 | State_t NewS = NC->state(1); | 145 | State_t NewS = NC->state(1); |
146 | if( OldS != NewS ) { | 146 | if( OldS != NewS ) { |
@@ -151,12 +151,12 @@ void NetworkSettings::SLOT_RefreshStates( void ) { | |||
151 | 151 | ||
152 | 152 | ||
153 | /* -> LATER !! | 153 | /* -> LATER !! |
154 | bool is; | 154 | bool is; |
155 | NodeCollection * NC; | 155 | NetworkSetup * NC; |
156 | 156 | ||
157 | for( unsigned int i = 0; i < Profiles_LB->count() ; i ++ ) { | 157 | for( unsigned int i = 0; i < Profiles_LB->count() ; i ++ ) { |
158 | NC = NSResources->findConnection( Profiles_LB->text(i) ); | 158 | NC = NSResources->findNetworkSetup( Profiles_LB->text(i) ); |
159 | if( NC ) { | 159 | if( NC ) { |
160 | State_t OldS = NC->state(); | 160 | State_t OldS = NC->state(); |
161 | State_t NewS = NC->state(1); | 161 | State_t NewS = NC->state(1); |
162 | if( OldS != NewS ) { | 162 | if( OldS != NewS ) { |
@@ -189,26 +189,26 @@ void NetworkSettings::SLOT_DeleteNode( void ) { | |||
189 | 0, | 189 | 0, |
190 | tr( "Removing profile" ), | 190 | tr( "Removing profile" ), |
191 | tr( "Remove selected profile ?" ), | 191 | tr( "Remove selected profile ?" ), |
192 | 1, 0 ) == 1 ) { | 192 | 1, 0 ) == 1 ) { |
193 | NSResources->removeConnection( LBI->text() ); | 193 | NSResources->removeNetworkSetup( LBI->text() ); |
194 | delete LBI; | 194 | delete LBI; |
195 | NSD.setModified( 1 ); | 195 | NSD.setModified( 1 ); |
196 | } | 196 | } |
197 | } | 197 | } |
198 | 198 | ||
199 | void NetworkSettings::SLOT_EditNode( QListBoxItem * LBI ) { | 199 | void NetworkSettings::SLOT_EditNode( QListBoxItem * LBI ) { |
200 | QString OldName = ""; | 200 | QString OldName = ""; |
201 | 201 | ||
202 | EditConnection EC( this ); | 202 | EditNetworkSetup EC( this ); |
203 | 203 | ||
204 | if( LBI ) { | 204 | if( LBI ) { |
205 | NodeCollection * NC = NSResources->findConnection( LBI->text() ); | 205 | NetworkSetup * NC = NSResources->findNetworkSetup( LBI->text() ); |
206 | if( ! NC ) { | 206 | if( ! NC ) { |
207 | return; | 207 | return; |
208 | } | 208 | } |
209 | OldName = NC->name(); | 209 | OldName = NC->name(); |
210 | EC.setConnection( NC ); | 210 | EC.setNetworkSetup( NC ); |
211 | } | 211 | } |
212 | 212 | ||
213 | EC.showMaximized(); | 213 | EC.showMaximized(); |
214 | // disable refresh timer | 214 | // disable refresh timer |
@@ -217,14 +217,14 @@ void NetworkSettings::SLOT_EditNode( QListBoxItem * LBI ) { | |||
217 | // we need to retry | 217 | // we need to retry |
218 | while( 1 ) { | 218 | while( 1 ) { |
219 | if( EC.exec() == QDialog::Accepted ) { | 219 | if( EC.exec() == QDialog::Accepted ) { |
220 | // toplevel item -> store | 220 | // toplevel item -> store |
221 | NodeCollection * NC = EC.connection(); | 221 | NetworkSetup * NC = EC.networkSetup(); |
222 | if( NC->isModified() ) { | 222 | if( NC->isModified() ) { |
223 | if( LBI ) { | 223 | if( LBI ) { |
224 | if( NC->name() != OldName ) { | 224 | if( NC->name() != OldName ) { |
225 | // find if new name is free | 225 | // find if new name is free |
226 | NodeCollection * LCN = NSResources->findConnection( | 226 | NetworkSetup * LCN = NSResources->findNetworkSetup( |
227 | NC->name() ); | 227 | NC->name() ); |
228 | if( LCN ) { | 228 | if( LCN ) { |
229 | QMessageBox::warning( | 229 | QMessageBox::warning( |
230 | 0, | 230 | 0, |
@@ -233,10 +233,10 @@ void NetworkSettings::SLOT_EditNode( QListBoxItem * LBI ) { | |||
233 | ); | 233 | ); |
234 | continue; // restart exec | 234 | continue; // restart exec |
235 | } // else new name | 235 | } // else new name |
236 | // new name -> remove item | 236 | // new name -> remove item |
237 | NSResources->removeConnection( OldName ); | 237 | NSResources->removeNetworkSetup( OldName ); |
238 | NSResources->addConnection( NC, 0 ); | 238 | NSResources->addNetworkSetup( NC, 0 ); |
239 | } // else not changed | 239 | } // else not changed |
240 | 240 | ||
241 | // must add it here since change will trigger event | 241 | // must add it here since change will trigger event |
242 | Profiles_LB->changeItem( NC->devicePixmap(), | 242 | Profiles_LB->changeItem( NC->devicePixmap(), |
@@ -245,19 +245,19 @@ void NetworkSettings::SLOT_EditNode( QListBoxItem * LBI ) { | |||
245 | ); | 245 | ); |
246 | } else { | 246 | } else { |
247 | // new item | 247 | // new item |
248 | int ci = Profiles_LB->count(); | 248 | int ci = Profiles_LB->count(); |
249 | NSResources->addConnection( NC, 0 ); | 249 | NSResources->addNetworkSetup( NC, 0 ); |
250 | NC->setNumber( NSResources->assignConnectionNumber() ); | 250 | NC->setNumber( NSResources->assignNetworkSetupNumber() ); |
251 | Profiles_LB->insertItem( NC->devicePixmap(), NC->name() ); | 251 | Profiles_LB->insertItem( NC->devicePixmap(), NC->name() ); |
252 | Profiles_LB->setSelected( ci, TRUE ); | 252 | Profiles_LB->setSelected( ci, TRUE ); |
253 | } | 253 | } |
254 | updateProfileState( LBI ); | 254 | updateProfileState( LBI ); |
255 | } | 255 | } |
256 | } else { | 256 | } else { |
257 | // cancelled : reset connection | 257 | // cancelled : reset NetworkSetup |
258 | if( LBI ) { | 258 | if( LBI ) { |
259 | NodeCollection * NC = NSResources->findConnection( LBI->text() ); | 259 | NetworkSetup * NC = NSResources->findNetworkSetup( LBI->text() ); |
260 | NC->reassign(); | 260 | NC->reassign(); |
261 | } | 261 | } |
262 | } | 262 | } |
263 | break; | 263 | break; |
@@ -269,9 +269,9 @@ void NetworkSettings::SLOT_EditNode( QListBoxItem * LBI ) { | |||
269 | void NetworkSettings::SLOT_ShowNode( QListBoxItem * LBI ) { | 269 | void NetworkSettings::SLOT_ShowNode( QListBoxItem * LBI ) { |
270 | if( LBI == 0 ) | 270 | if( LBI == 0 ) |
271 | return; | 271 | return; |
272 | 272 | ||
273 | NodeCollection * NC = NSResources->findConnection( LBI->text() ); | 273 | NetworkSetup * NC = NSResources->findNetworkSetup( LBI->text() ); |
274 | 274 | ||
275 | if( NC->description().isEmpty() ) { | 275 | if( NC->description().isEmpty() ) { |
276 | Description_LBL->setText( tr( "<<No description>>" ) ); | 276 | Description_LBL->setText( tr( "<<No description>>" ) ); |
277 | } else { | 277 | } else { |
@@ -352,9 +352,9 @@ void NetworkSettings::SLOT_Disable( bool T ) { | |||
352 | 352 | ||
353 | if ( ! LBI ) | 353 | if ( ! LBI ) |
354 | return; | 354 | return; |
355 | 355 | ||
356 | NodeCollection * NC = NSResources->findConnection( LBI->text() ); | 356 | NetworkSetup * NC = NSResources->findNetworkSetup( LBI->text() ); |
357 | 357 | ||
358 | Log(( "Prepare to %sable\n", (T) ? "en" : "dis" )); | 358 | Log(( "Prepare to %sable\n", (T) ? "en" : "dis" )); |
359 | Msg = NC->setState( (T) ? Disable : Enable ); | 359 | Msg = NC->setState( (T) ? Disable : Enable ); |
360 | if( ! Msg.isEmpty() ) { | 360 | if( ! Msg.isEmpty() ) { |
@@ -381,10 +381,10 @@ void NetworkSettings::SLOT_Up( void ) { | |||
381 | 381 | ||
382 | if ( ! LBI ) | 382 | if ( ! LBI ) |
383 | return; | 383 | return; |
384 | 384 | ||
385 | NodeCollection * NC = | 385 | NetworkSetup * NC = |
386 | NSResources->findConnection( LBI->text() ); | 386 | NSResources->findNetworkSetup( LBI->text() ); |
387 | 387 | ||
388 | switch( NC->state() ) { | 388 | switch( NC->state() ) { |
389 | case Disabled : // cannot modify this state | 389 | case Disabled : // cannot modify this state |
390 | case Unknown : // cannot modify this state | 390 | case Unknown : // cannot modify this state |
@@ -437,10 +437,10 @@ void NetworkSettings::SLOT_Down( void ) { | |||
437 | 437 | ||
438 | if ( ! LBI ) | 438 | if ( ! LBI ) |
439 | return; | 439 | return; |
440 | 440 | ||
441 | NodeCollection * NC = | 441 | NetworkSetup * NC = |
442 | NSResources->findConnection( LBI->text() ); | 442 | NSResources->findNetworkSetup( LBI->text() ); |
443 | 443 | ||
444 | switch( NC->state() ) { | 444 | switch( NC->state() ) { |
445 | case Disabled : // cannot modify this state | 445 | case Disabled : // cannot modify this state |
446 | case Unknown : // cannot modify this state | 446 | case Unknown : // cannot modify this state |
diff --git a/noncore/settings/networksettings2/networksettings2/asconnection.h b/noncore/settings/networksettings2/networksettings2/asconnection.h index 1ed7e74..eeb0939 100644 --- a/noncore/settings/networksettings2/networksettings2/asconnection.h +++ b/noncore/settings/networksettings2/networksettings2/asconnection.h | |||
@@ -3,14 +3,14 @@ | |||
3 | 3 | ||
4 | #include <resources.h> | 4 | #include <resources.h> |
5 | 5 | ||
6 | // pure virtual (component oriented) interface of any | 6 | // pure virtual (component oriented) interface of any |
7 | // plugin that offers a connection | 7 | // plugin that offers a networkSetup |
8 | class AsConnection : public RuntimeInfo { | 8 | class AsNetworkSetup : public RuntimeInfo { |
9 | 9 | ||
10 | public : | 10 | public : |
11 | 11 | ||
12 | AsConnection( ANetNodeInstance * NNI ) : | 12 | AsNetworkSetup( ANetNodeInstance * NNI ) : |
13 | RuntimeInfo( NNI ) { | 13 | RuntimeInfo( NNI ) { |
14 | } | 14 | } |
15 | 15 | ||
16 | }; | 16 | }; |
diff --git a/noncore/settings/networksettings2/networksettings2/netnode.cpp b/noncore/settings/networksettings2/networksettings2/netnode.cpp index f00e0b3..0ab0e5b 100644 --- a/noncore/settings/networksettings2/networksettings2/netnode.cpp +++ b/noncore/settings/networksettings2/networksettings2/netnode.cpp | |||
@@ -124,18 +124,18 @@ void ANetNodeInstance::saveAttributes( QTextStream & TS ) { | |||
124 | saveSpecificAttribute( TS ); | 124 | saveSpecificAttribute( TS ); |
125 | } | 125 | } |
126 | 126 | ||
127 | ANetNodeInstance * ANetNodeInstance::nextNode( void ) { | 127 | ANetNodeInstance * ANetNodeInstance::nextNode( void ) { |
128 | return connection()->findNext( this ); | 128 | return networkSetup()->findNext( this ); |
129 | } | 129 | } |
130 | 130 | ||
131 | // | 131 | // |
132 | // | 132 | // |
133 | // NODECOLLECTION | 133 | // NODECOLLECTION |
134 | // | 134 | // |
135 | // | 135 | // |
136 | 136 | ||
137 | NodeCollection::NodeCollection( void ) : QList<ANetNodeInstance>() { | 137 | NetworkSetup::NetworkSetup( void ) : QList<ANetNodeInstance>() { |
138 | IsModified = 0; | 138 | IsModified = 0; |
139 | Index = -1; | 139 | Index = -1; |
140 | Name=""; | 140 | Name=""; |
141 | IsNew = 1; | 141 | IsNew = 1; |
@@ -144,9 +144,9 @@ NodeCollection::NodeCollection( void ) : QList<ANetNodeInstance>() { | |||
144 | Number = -1; | 144 | Number = -1; |
145 | Done = 0; | 145 | Done = 0; |
146 | } | 146 | } |
147 | 147 | ||
148 | NodeCollection::NodeCollection( QTextStream & TS, bool & Dangling ) : | 148 | NetworkSetup::NetworkSetup( QTextStream & TS, bool & Dangling ) : |
149 | QList<ANetNodeInstance>() { | 149 | QList<ANetNodeInstance>() { |
150 | long idx; | 150 | long idx; |
151 | QString S, A, N; | 151 | QString S, A, N; |
152 | 152 | ||
@@ -186,9 +186,9 @@ NodeCollection::NodeCollection( QTextStream & TS, bool & Dangling ) : | |||
186 | if( NNI ) { | 186 | if( NNI ) { |
187 | append( NNI ); | 187 | append( NNI ); |
188 | } else { | 188 | } else { |
189 | // could not find a node type -> collection invalid | 189 | // could not find a node type -> collection invalid |
190 | Log(( "Node %s missing -> connection dangling\n", | 190 | Log(( "Node %s missing -> NetworkSetup dangling\n", |
191 | N.latin1() )); | 191 | N.latin1() )); |
192 | // create placeholder for this dangling NNI | 192 | // create placeholder for this dangling NNI |
193 | NNI = new ErrorNNI( N ); | 193 | NNI = new ErrorNNI( N ); |
194 | Dangling = 1; | 194 | Dangling = 1; |
@@ -199,22 +199,22 @@ NodeCollection::NodeCollection( QTextStream & TS, bool & Dangling ) : | |||
199 | Log(( "Profile number %s : %d nodes\n", | 199 | Log(( "Profile number %s : %d nodes\n", |
200 | Name.latin1(), count() )); | 200 | Name.latin1(), count() )); |
201 | } | 201 | } |
202 | 202 | ||
203 | NodeCollection::~NodeCollection( void ) { | 203 | NetworkSetup::~NetworkSetup( void ) { |
204 | } | 204 | } |
205 | 205 | ||
206 | const QString & NodeCollection::description( void ) { | 206 | const QString & NetworkSetup::description( void ) { |
207 | ANetNodeInstance * NNI = getToplevel(); | 207 | ANetNodeInstance * NNI = getToplevel(); |
208 | return (NNI) ? NNI->runtime()->description() : Name; | 208 | return (NNI) ? NNI->runtime()->description() : Name; |
209 | } | 209 | } |
210 | 210 | ||
211 | void NodeCollection::append( ANetNodeInstance * NNI ) { | 211 | void NetworkSetup::append( ANetNodeInstance * NNI ) { |
212 | NNI->setConnection( this ); | 212 | NNI->setNetworkSetup( this ); |
213 | QList<ANetNodeInstance>::append( NNI ); | 213 | QList<ANetNodeInstance>::append( NNI ); |
214 | } | 214 | } |
215 | 215 | ||
216 | void NodeCollection::save( QTextStream & TS ) { | 216 | void NetworkSetup::save( QTextStream & TS ) { |
217 | 217 | ||
218 | TS << "name=" << quote( Name ) << endl; | 218 | TS << "name=" << quote( Name ) << endl; |
219 | TS << "number=" << number() << endl; | 219 | TS << "number=" << number() << endl; |
220 | ANetNodeInstance * NNI; | 220 | ANetNodeInstance * NNI; |
@@ -227,9 +227,9 @@ void NodeCollection::save( QTextStream & TS ) { | |||
227 | TS << endl; | 227 | TS << endl; |
228 | IsNew = 0; | 228 | IsNew = 0; |
229 | } | 229 | } |
230 | 230 | ||
231 | ANetNodeInstance * NodeCollection::getToplevel( void ) { | 231 | ANetNodeInstance * NetworkSetup::getToplevel( void ) { |
232 | ANetNodeInstance * NNI = 0; | 232 | ANetNodeInstance * NNI = 0; |
233 | for( QListIterator<ANetNodeInstance> it(*this); | 233 | for( QListIterator<ANetNodeInstance> it(*this); |
234 | it.current(); | 234 | it.current(); |
235 | ++it ) { | 235 | ++it ) { |
@@ -240,9 +240,9 @@ ANetNodeInstance * NodeCollection::getToplevel( void ) { | |||
240 | } | 240 | } |
241 | return 0; | 241 | return 0; |
242 | } | 242 | } |
243 | 243 | ||
244 | ANetNodeInstance * NodeCollection::findByName( const QString & S ) { | 244 | ANetNodeInstance * NetworkSetup::findByName( const QString & S ) { |
245 | ANetNodeInstance * NNI = 0; | 245 | ANetNodeInstance * NNI = 0; |
246 | for( QListIterator<ANetNodeInstance> it(*this); | 246 | for( QListIterator<ANetNodeInstance> it(*this); |
247 | it.current(); | 247 | it.current(); |
248 | ++it ) { | 248 | ++it ) { |
@@ -253,9 +253,9 @@ ANetNodeInstance * NodeCollection::findByName( const QString & S ) { | |||
253 | } | 253 | } |
254 | return 0; | 254 | return 0; |
255 | } | 255 | } |
256 | 256 | ||
257 | ANetNodeInstance * NodeCollection::findNext( ANetNodeInstance * NNI ) { | 257 | ANetNodeInstance * NetworkSetup::findNext( ANetNodeInstance * NNI ) { |
258 | ANetNodeInstance * NNNI; | 258 | ANetNodeInstance * NNNI; |
259 | 259 | ||
260 | if( ! NNI ) | 260 | if( ! NNI ) |
261 | getToplevel(); | 261 | getToplevel(); |
@@ -271,9 +271,9 @@ ANetNodeInstance * NodeCollection::findNext( ANetNodeInstance * NNI ) { | |||
271 | } | 271 | } |
272 | return 0; // no more next | 272 | return 0; // no more next |
273 | } | 273 | } |
274 | 274 | ||
275 | int NodeCollection::compareItems( QCollection::Item I1, | 275 | int NetworkSetup::compareItems( QCollection::Item I1, |
276 | QCollection::Item I2 ) { | 276 | QCollection::Item I2 ) { |
277 | ANetNodeInstance * NNI1, * NNI2; | 277 | ANetNodeInstance * NNI1, * NNI2; |
278 | NNI1 = (ANetNodeInstance *)I1; | 278 | NNI1 = (ANetNodeInstance *)I1; |
279 | NNI2 = (ANetNodeInstance *)I2; | 279 | NNI2 = (ANetNodeInstance *)I2; |
@@ -289,9 +289,9 @@ static char * State2PixmapTbl[] = { | |||
289 | "disconnected", // available | 289 | "disconnected", // available |
290 | "connected" // up | 290 | "connected" // up |
291 | }; | 291 | }; |
292 | 292 | ||
293 | QPixmap NodeCollection::devicePixmap( void ) { | 293 | QPixmap NetworkSetup::devicePixmap( void ) { |
294 | QPixmap pm = NSResources->getPixmap( | 294 | QPixmap pm = NSResources->getPixmap( |
295 | getToplevel()->nextNode()->pixmapName()+"-large"); | 295 | getToplevel()->nextNode()->pixmapName()+"-large"); |
296 | 296 | ||
297 | QPixmap Mini = NSResources->getPixmap( | 297 | QPixmap Mini = NSResources->getPixmap( |
@@ -307,13 +307,13 @@ QPixmap NodeCollection::devicePixmap( void ) { | |||
307 | pm.setMask( pm.createHeuristicMask( TRUE ) ); | 307 | pm.setMask( pm.createHeuristicMask( TRUE ) ); |
308 | return pm; | 308 | return pm; |
309 | } | 309 | } |
310 | 310 | ||
311 | QPixmap NodeCollection::statePixmap( State_t S) { | 311 | QPixmap NetworkSetup::statePixmap( State_t S) { |
312 | return NSResources->getPixmap( State2PixmapTbl[S] ); | 312 | return NSResources->getPixmap( State2PixmapTbl[S] ); |
313 | } | 313 | } |
314 | 314 | ||
315 | QString NodeCollection::stateName( State_t S) { | 315 | QString NetworkSetup::stateName( State_t S) { |
316 | switch( S ) { | 316 | switch( S ) { |
317 | case Unknown : | 317 | case Unknown : |
318 | return qApp->translate( "networksettings2", "Unknown"); | 318 | return qApp->translate( "networksettings2", "Unknown"); |
319 | case Unavailable : | 319 | case Unavailable : |
@@ -332,25 +332,25 @@ QString NodeCollection::stateName( State_t S) { | |||
332 | } | 332 | } |
333 | return QString(""); | 333 | return QString(""); |
334 | } | 334 | } |
335 | 335 | ||
336 | void NodeCollection::reassign( void ) { | 336 | void NetworkSetup::reassign( void ) { |
337 | for( QListIterator<ANetNodeInstance> it(*this); | 337 | for( QListIterator<ANetNodeInstance> it(*this); |
338 | it.current(); | 338 | it.current(); |
339 | ++it ) { | 339 | ++it ) { |
340 | it.current()->setConnection( this ); | 340 | it.current()->setNetworkSetup( this ); |
341 | } | 341 | } |
342 | } | 342 | } |
343 | 343 | ||
344 | const QStringList & NodeCollection::triggers() { | 344 | const QStringList & NetworkSetup::triggers() { |
345 | return getToplevel()->runtime()->triggers(); | 345 | return getToplevel()->runtime()->triggers(); |
346 | } | 346 | } |
347 | 347 | ||
348 | bool NodeCollection::hasDataForFile( SystemFile & S ) { | 348 | bool NetworkSetup::hasDataForFile( SystemFile & S ) { |
349 | return ( firstWithDataForFile( S ) != 0 ); | 349 | return ( firstWithDataForFile( S ) != 0 ); |
350 | } | 350 | } |
351 | 351 | ||
352 | ANetNodeInstance * NodeCollection::firstWithDataForFile( SystemFile & S ) { | 352 | ANetNodeInstance * NetworkSetup::firstWithDataForFile( SystemFile & S ) { |
353 | for( QListIterator<ANetNodeInstance> it(*this); | 353 | for( QListIterator<ANetNodeInstance> it(*this); |
354 | it.current(); | 354 | it.current(); |
355 | ++it ) { | 355 | ++it ) { |
356 | if( it.current()->hasDataForFile( S ) ) { | 356 | if( it.current()->hasDataForFile( S ) ) { |
@@ -359,16 +359,16 @@ ANetNodeInstance * NodeCollection::firstWithDataForFile( SystemFile & S ) { | |||
359 | } | 359 | } |
360 | return 0; | 360 | return 0; |
361 | } | 361 | } |
362 | 362 | ||
363 | State_t NodeCollection::state( bool Update ) { | 363 | State_t NetworkSetup::state( bool Update ) { |
364 | State_t NodeState; | 364 | State_t NodeState; |
365 | 365 | ||
366 | if( CurrentState == Unchecked || Update ) { | 366 | if( CurrentState == Unchecked || Update ) { |
367 | // collect states of all nodes until with get the 'higest' | 367 | // collect states of all nodes until with get the 'higest' |
368 | // state possible | 368 | // state possible |
369 | 369 | ||
370 | Log(( "Connection %s state %s\n", | 370 | Log(( "NetworkSetup %s state %s\n", |
371 | Name.latin1(), StateName[CurrentState] )); | 371 | Name.latin1(), StateName[CurrentState] )); |
372 | 372 | ||
373 | CurrentState = Unknown; | 373 | CurrentState = Unknown; |
374 | for( QListIterator<ANetNodeInstance> it(*this); | 374 | for( QListIterator<ANetNodeInstance> it(*this); |
@@ -394,9 +394,9 @@ State_t NodeCollection::state( bool Update ) { | |||
394 | 394 | ||
395 | return CurrentState; | 395 | return CurrentState; |
396 | } | 396 | } |
397 | 397 | ||
398 | QString NodeCollection::setState( Action_t A, bool Force ) { | 398 | QString NetworkSetup::setState( Action_t A, bool Force ) { |
399 | 399 | ||
400 | QString msg; | 400 | QString msg; |
401 | Action_t Actions[10]; | 401 | Action_t Actions[10]; |
402 | int NoOfActions = 0; | 402 | int NoOfActions = 0; |
@@ -491,15 +491,24 @@ QString NodeCollection::setState( Action_t A, bool Force ) { | |||
491 | } | 491 | } |
492 | return QString(); | 492 | return QString(); |
493 | } | 493 | } |
494 | 494 | ||
495 | void NetworkSetup::copyFrom( const NetworkSetup & N ) { | ||
496 | Number = N.Number; | ||
497 | CurrentState = N.CurrentState; | ||
498 | Name = N.Name; | ||
499 | IsNew = N.IsNew; | ||
500 | Index = N.Index; | ||
501 | AssignedInterface = N.AssignedInterface; | ||
502 | } | ||
503 | |||
495 | // | 504 | // |
496 | // | 505 | // |
497 | // RuntimeInfo | 506 | // RuntimeInfo |
498 | // | 507 | // |
499 | // | 508 | // |
500 | 509 | ||
501 | QString RuntimeInfo::setState( NodeCollection * NC, | 510 | QString RuntimeInfo::setState( NetworkSetup * NC, |
502 | Action_t A, | 511 | Action_t A, |
503 | bool Force ) { | 512 | bool Force ) { |
504 | QString M; | 513 | QString M; |
505 | RuntimeInfo * Deeper = nextNode(); | 514 | RuntimeInfo * Deeper = nextNode(); |
diff --git a/noncore/settings/networksettings2/networksettings2/netnode.h b/noncore/settings/networksettings2/networksettings2/netnode.h index 151d546..8aebdc0 100644 --- a/noncore/settings/networksettings2/networksettings2/netnode.h +++ b/noncore/settings/networksettings2/networksettings2/netnode.h | |||
@@ -14,17 +14,17 @@ | |||
14 | 14 | ||
15 | // difference feature interfaces | 15 | // difference feature interfaces |
16 | class AsDevice; | 16 | class AsDevice; |
17 | class AsLine; | 17 | class AsLine; |
18 | class AsConnection; | 18 | class AsNetworkSetup; |
19 | class AsFullSetup; | 19 | class AsFullSetup; |
20 | 20 | ||
21 | // needed for plugin creation function | 21 | // needed for plugin creation function |
22 | #include <qlist.h> | 22 | #include <qlist.h> |
23 | 23 | ||
24 | class ANetNode; | 24 | class ANetNode; |
25 | class ANetNodeInstance; | 25 | class ANetNodeInstance; |
26 | class NodeCollection; | 26 | class NetworkSetup; |
27 | class QTextStream; | 27 | class QTextStream; |
28 | class RuntimeInfo; | 28 | class RuntimeInfo; |
29 | class InterfaceInfo; | 29 | class InterfaceInfo; |
30 | class NSResources; | 30 | class NSResources; |
@@ -38,22 +38,22 @@ typedef enum State { | |||
38 | // if we have not yet detected the state of the device | 38 | // if we have not yet detected the state of the device |
39 | Unchecked = 0, | 39 | Unchecked = 0, |
40 | // if we cannot determine the state | 40 | // if we cannot determine the state |
41 | Unknown = 1, | 41 | Unknown = 1, |
42 | // if connection cannot be established e.g. because | 42 | // if networkSetup cannot be established e.g. because |
43 | // the hardware is not available | 43 | // the hardware is not available |
44 | Unavailable = 2, | 44 | Unavailable = 2, |
45 | // if the connection cannot be establishec but NOT | 45 | // if the networkSetup cannot be establishec but NOT |
46 | // because it is physically impossible but because | 46 | // because it is physically impossible but because |
47 | // it has been disabled for FUNCTIONAL reasons | 47 | // it has been disabled for FUNCTIONAL reasons |
48 | Disabled = 3, | 48 | Disabled = 3, |
49 | // if connection is available to is currently down | 49 | // if networkSetup is available to is currently down |
50 | // i.e. the corresponding hardware is not activated | 50 | // i.e. the corresponding hardware is not activated |
51 | Off = 4, | 51 | Off = 4, |
52 | // if connection is available to be used (i.e. the | 52 | // if networkSetup is available to be used (i.e. the |
53 | // devices if fully ready to be used | 53 | // devices if fully ready to be used |
54 | Available = 5, | 54 | Available = 5, |
55 | // if connection is being used | 55 | // if networkSetup is being used |
56 | IsUp = 6 | 56 | IsUp = 6 |
57 | } State_t; | 57 | } State_t; |
58 | 58 | ||
59 | typedef enum Action { | 59 | typedef enum Action { |
@@ -64,11 +64,11 @@ typedef enum Action { | |||
64 | // bring the hardware up -> to Available | 64 | // bring the hardware up -> to Available |
65 | Activate = 2, | 65 | Activate = 2, |
66 | // bring the hardware down -> to off | 66 | // bring the hardware down -> to off |
67 | Deactivate = 3, | 67 | Deactivate = 3, |
68 | // bring the connection up -> to IsUp | 68 | // bring the networkSetup up -> to IsUp |
69 | Up = 4, | 69 | Up = 4, |
70 | // bring the connection down -> to Available | 70 | // bring the networkSetup down -> to Available |
71 | Down = 5 | 71 | Down = 5 |
72 | } Action_t; | 72 | } Action_t; |
73 | 73 | ||
74 | class ANetNode : public QObject { | 74 | class ANetNode : public QObject { |
@@ -90,9 +90,9 @@ public: | |||
90 | { return Done; } | 90 | { return Done; } |
91 | inline void setDone( int D ) | 91 | inline void setDone( int D ) |
92 | { Done = D; } | 92 | { Done = D; } |
93 | 93 | ||
94 | // does this Node provide a Connection | 94 | // does this Node provide a NetworkSetup |
95 | bool isToplevel( void ); | 95 | bool isToplevel( void ); |
96 | 96 | ||
97 | // set the value of an attribute | 97 | // set the value of an attribute |
98 | void setAttribute( QString & Attr, QString & Value ) ; | 98 | void setAttribute( QString & Attr, QString & Value ) ; |
@@ -244,12 +244,12 @@ public: | |||
244 | 244 | ||
245 | inline const char ** needs( void ) | 245 | inline const char ** needs( void ) |
246 | { return NodeType->needs(); } | 246 | { return NodeType->needs(); } |
247 | 247 | ||
248 | inline void setConnection( NodeCollection * NC ) | 248 | inline void setNetworkSetup( NetworkSetup * NC ) |
249 | { Connection = NC; } | 249 | { TheNetworkSetup = NC; } |
250 | inline NodeCollection * connection( void ) | 250 | inline NetworkSetup * networkSetup( void ) |
251 | { return Connection; } | 251 | { return TheNetworkSetup; } |
252 | 252 | ||
253 | // | 253 | // |
254 | // | 254 | // |
255 | // Virtual methods with sensible defaults | 255 | // Virtual methods with sensible defaults |
@@ -314,10 +314,10 @@ protected : | |||
314 | virtual void setSpecificAttribute( QString & , QString & ) = 0; | 314 | virtual void setSpecificAttribute( QString & , QString & ) = 0; |
315 | virtual void saveSpecificAttribute( QTextStream & ) = 0; | 315 | virtual void saveSpecificAttribute( QTextStream & ) = 0; |
316 | 316 | ||
317 | ANetNode * NodeType; | 317 | ANetNode * NodeType; |
318 | // connection to which this node belongs to | 318 | // networkSetup to which this node belongs to |
319 | NodeCollection * Connection; | 319 | NetworkSetup * TheNetworkSetup; |
320 | QString Description; | 320 | QString Description; |
321 | bool IsModified; | 321 | bool IsModified; |
322 | // true if this nodeinstance was just created (and not | 322 | // true if this nodeinstance was just created (and not |
323 | // loaded from file | 323 | // loaded from file |
@@ -377,9 +377,9 @@ public : | |||
377 | { NNI = TheNNI; } | 377 | { NNI = TheNNI; } |
378 | 378 | ||
379 | // | 379 | // |
380 | // | 380 | // |
381 | // methods to be overloaded by connection capable | 381 | // methods to be overloaded by networkSetup capable |
382 | // runtimes | 382 | // runtimes |
383 | // | 383 | // |
384 | // | 384 | // |
385 | 385 | ||
@@ -474,14 +474,14 @@ public : | |||
474 | 474 | ||
475 | inline ANetNodeInstance * netNode() | 475 | inline ANetNodeInstance * netNode() |
476 | { return NNI; } | 476 | { return NNI; } |
477 | 477 | ||
478 | inline NodeCollection * nodeCollection() | 478 | inline NetworkSetup * networkSetup() |
479 | { return NNI->connection(); } | 479 | { return NNI->networkSetup(); } |
480 | 480 | ||
481 | virtual State_t detectState( void ) = 0; | 481 | virtual State_t detectState( void ) = 0; |
482 | // public API to set the state | 482 | // public API to set the state |
483 | virtual QString setState( NodeCollection * NC, | 483 | virtual QString setState( NetworkSetup * NC, |
484 | Action_t A, | 484 | Action_t A, |
485 | bool Force = 0 ); | 485 | bool Force = 0 ); |
486 | 486 | ||
487 | inline RuntimeInfo * nextNode( void ) { | 487 | inline RuntimeInfo * nextNode( void ) { |
@@ -496,23 +496,26 @@ signals : | |||
496 | 496 | ||
497 | protected : | 497 | protected : |
498 | 498 | ||
499 | // set state of this node (private API) | 499 | // set state of this node (private API) |
500 | virtual QString setMyState( NodeCollection * NC, | 500 | virtual QString setMyState( NetworkSetup * NC, |
501 | Action_t A, | 501 | Action_t A, |
502 | bool Force = 0 ) = 0; | 502 | bool Force = 0 ) = 0; |
503 | 503 | ||
504 | // connection this runtime info belongs to | 504 | // networkSetup this runtime info belongs to |
505 | ANetNodeInstance * NNI; | 505 | ANetNodeInstance * NNI; |
506 | }; | 506 | }; |
507 | 507 | ||
508 | class NodeCollection : public QList<ANetNodeInstance> { | 508 | class NetworkSetup : public QList<ANetNodeInstance> { |
509 | 509 | ||
510 | public : | 510 | public : |
511 | 511 | ||
512 | NodeCollection( void ); | 512 | NetworkSetup( void ); |
513 | NodeCollection( QTextStream & TS, bool & Dangling ); | 513 | NetworkSetup( QTextStream & TS, bool & Dangling ); |
514 | ~NodeCollection( void ); | 514 | ~NetworkSetup( void ); |
515 | |||
516 | // copy settings from NC to this | ||
517 | void copyFrom( const NetworkSetup & NC ); | ||
515 | 518 | ||
516 | inline int done( void ) | 519 | inline int done( void ) |
517 | { return Done; } | 520 | { return Done; } |
518 | inline void setDone( int D ) | 521 | inline void setDone( int D ) |
@@ -542,17 +545,17 @@ public : | |||
542 | } | 545 | } |
543 | 546 | ||
544 | // assign the interface to this device | 547 | // assign the interface to this device |
545 | inline void assignInterface( InterfaceInfo * NI ) { | 548 | inline void assignInterface( InterfaceInfo * NI ) { |
546 | if( NI == 0 ) { | 549 | // cleanup previous |
547 | if( AssignedInterface ) { | ||
548 | AssignedInterface->assignConnection( 0 ); | ||
549 | } | ||
550 | } | ||
551 | AssignedInterface = NI; | ||
552 | if( AssignedInterface ) { | 550 | if( AssignedInterface ) { |
553 | AssignedInterface->assignConnection( this ); | 551 | AssignedInterface->assignToNetworkSetup( 0 ); |
554 | } | 552 | } |
553 | if( NI ) { | ||
554 | // assign new | ||
555 | NI->assignToNetworkSetup( this ); | ||
556 | } | ||
557 | AssignedInterface = NI; | ||
555 | } | 558 | } |
556 | 559 | ||
557 | inline RuntimeInfo * device() { | 560 | inline RuntimeInfo * device() { |
558 | return getToplevel()->runtime()->device(); | 561 | return getToplevel()->runtime()->device(); |
@@ -576,9 +579,9 @@ public : | |||
576 | void save( QTextStream & TS ); | 579 | void save( QTextStream & TS ); |
577 | 580 | ||
578 | void append( ANetNodeInstance * NNI ); | 581 | void append( ANetNodeInstance * NNI ); |
579 | 582 | ||
580 | // makes sure that all items in the connection point to | 583 | // makes sure that all items in the networkSetup point to |
581 | // that connectoin | 584 | // that connectoin |
582 | void reassign( void ); | 585 | void reassign( void ); |
583 | 586 | ||
584 | ANetNodeInstance * getToplevel( void ); | 587 | ANetNodeInstance * getToplevel( void ); |
@@ -618,9 +621,9 @@ private : | |||
618 | QCollection::Item item2 ); | 621 | QCollection::Item item2 ); |
619 | 622 | ||
620 | long Number; | 623 | long Number; |
621 | 624 | ||
622 | // state of this connection | 625 | // state of this networkSetup |
623 | State_t CurrentState; | 626 | State_t CurrentState; |
624 | 627 | ||
625 | QString Name; | 628 | QString Name; |
626 | // true if this collection was just created (and not | 629 | // true if this collection was just created (and not |
diff --git a/noncore/settings/networksettings2/networksettings2/resources.cpp b/noncore/settings/networksettings2/networksettings2/resources.cpp index b81dcaa..0e72c25 100644 --- a/noncore/settings/networksettings2/networksettings2/resources.cpp +++ b/noncore/settings/networksettings2/networksettings2/resources.cpp | |||
@@ -24,9 +24,9 @@ | |||
24 | // single resources instance | 24 | // single resources instance |
25 | TheNSResources * _NSResources = 0; | 25 | TheNSResources * _NSResources = 0; |
26 | 26 | ||
27 | TheNSResources::TheNSResources( void ) : NodeTypeNameMap(), | 27 | TheNSResources::TheNSResources( void ) : NodeTypeNameMap(), |
28 | ConnectionsMap(), DanglingConnectionsMap() { | 28 | NetworkSetupsMap(), DanglingNetworkSetupsMap() { |
29 | 29 | ||
30 | _NSResources = this; | 30 | _NSResources = this; |
31 | 31 | ||
32 | detectCurrentUser(); | 32 | detectCurrentUser(); |
@@ -79,14 +79,14 @@ TheNSResources::TheNSResources( void ) : NodeTypeNameMap(), | |||
79 | addNodeType( "device", tr( "Network Device" ), | 79 | addNodeType( "device", tr( "Network Device" ), |
80 | tr( "<p>Devices that can handle IP packets</p>" ) ); | 80 | tr( "<p>Devices that can handle IP packets</p>" ) ); |
81 | addNodeType( "line", tr( "Character device" ), | 81 | addNodeType( "line", tr( "Character device" ), |
82 | tr( "<p>Devices that can handle single bytes</p>" ) ); | 82 | tr( "<p>Devices that can handle single bytes</p>" ) ); |
83 | addNodeType( "connection", tr( "IP Connection" ), | 83 | addNodeType( "NetworkSetup", tr( "IP NetworkSetup" ), |
84 | tr( "<p>Nodes that provide working IP connections</p>" ) ); | 84 | tr( "<p>Nodes that provide working IP NetworkSetups</p>" ) ); |
85 | addNodeType( "fullsetup", tr( "Connection Profile" ), | 85 | addNodeType( "fullsetup", tr( "NetworkSetup Profile" ), |
86 | tr( "<p>Fully configured connection profile</p>" ) ); | 86 | tr( "<p>Fully configured NetworkSetup profile</p>" ) ); |
87 | addNodeType( "GPRS", tr( "Connection to GPRS device" ), | 87 | addNodeType( "GPRS", tr( "NetworkSetup to GPRS device" ), |
88 | tr( "<p>Connection to a GPRS capable device</p>" ) ); | 88 | tr( "<p>NetworkSetup to a GPRS capable device</p>" ) ); |
89 | 89 | ||
90 | // get access to the system | 90 | // get access to the system |
91 | TheSystem = new System(); | 91 | TheSystem = new System(); |
92 | 92 | ||
@@ -200,14 +200,14 @@ void TheNSResources::findAvailableNetNodes( void ){ | |||
200 | } | 200 | } |
201 | 201 | ||
202 | } | 202 | } |
203 | 203 | ||
204 | // used to find unique connection number | 204 | // used to find unique NetworkSetup number |
205 | int TheNSResources::assignConnectionNumber( void ) { | 205 | int TheNSResources::assignNetworkSetupNumber( void ) { |
206 | bool found = 1; | 206 | bool found = 1; |
207 | for( int trial = 0; ; trial ++ ) { | 207 | for( int trial = 0; ; trial ++ ) { |
208 | found = 1; | 208 | found = 1; |
209 | for( QDictIterator<NodeCollection> it(ConnectionsMap); | 209 | for( QDictIterator<NetworkSetup> it(NetworkSetupsMap); |
210 | it.current(); | 210 | it.current(); |
211 | ++it ) { | 211 | ++it ) { |
212 | if( it.current()->number() == trial ) { | 212 | if( it.current()->number() == trial ) { |
213 | found = 0; | 213 | found = 0; |
@@ -244,16 +244,16 @@ const QString & TheNSResources::netNode2Name( const char * s ) { | |||
244 | const QString & TheNSResources::netNode2Description( const char * s ) { | 244 | const QString & TheNSResources::netNode2Description( const char * s ) { |
245 | return NodeTypeDescriptionMap[s]; | 245 | return NodeTypeDescriptionMap[s]; |
246 | } | 246 | } |
247 | 247 | ||
248 | void TheNSResources::addConnection( NodeCollection * NC, bool Dangling ) { | 248 | void TheNSResources::addNetworkSetup( NetworkSetup * NC, bool Dangling ) { |
249 | ANetNodeInstance * NNI; | 249 | ANetNodeInstance * NNI; |
250 | Log(( "Add Connection %s, Dangling %d\n", | 250 | Log(( "Add NetworkSetup %s, Dangling %d\n", |
251 | NC->name().latin1(), Dangling )); | 251 | NC->name().latin1(), Dangling )); |
252 | if( Dangling ) { | 252 | if( Dangling ) { |
253 | DanglingConnectionsMap.insert( NC->name(), NC ); | 253 | DanglingNetworkSetupsMap.insert( NC->name(), NC ); |
254 | } else { | 254 | } else { |
255 | ConnectionsMap.insert( NC->name(), NC ); | 255 | NetworkSetupsMap.insert( NC->name(), NC ); |
256 | } | 256 | } |
257 | 257 | ||
258 | // add (new) nodes to NodeList | 258 | // add (new) nodes to NodeList |
259 | for( QListIterator<ANetNodeInstance> it(*NC); | 259 | for( QListIterator<ANetNodeInstance> it(*NC); |
@@ -266,33 +266,33 @@ void TheNSResources::addConnection( NodeCollection * NC, bool Dangling ) { | |||
266 | } | 266 | } |
267 | } | 267 | } |
268 | } | 268 | } |
269 | 269 | ||
270 | void TheNSResources::removeConnection( const QString & N ) { | 270 | void TheNSResources::removeNetworkSetup( const QString & N ) { |
271 | NodeCollection * NC = findConnection( N ); | 271 | NetworkSetup * NC = findNetworkSetup( N ); |
272 | if( ! NC ) | 272 | if( ! NC ) |
273 | return; | 273 | return; |
274 | 274 | ||
275 | // delete netnodes in this connection | 275 | // delete netnodes in this NetworkSetup |
276 | ANetNodeInstance * NNI; | 276 | ANetNodeInstance * NNI; |
277 | for( NNI = NC->first(); NNI != 0; NNI = NC->next() ) { | 277 | for( NNI = NC->first(); NNI != 0; NNI = NC->next() ) { |
278 | removeNodeInstance( NNI->name() ); | 278 | removeNodeInstance( NNI->name() ); |
279 | } | 279 | } |
280 | if( ConnectionsMap.find( N ) ) { | 280 | if( NetworkSetupsMap.find( N ) ) { |
281 | ConnectionsMap.remove( N ); | 281 | NetworkSetupsMap.remove( N ); |
282 | } else { | 282 | } else { |
283 | DanglingConnectionsMap.remove( N ); | 283 | DanglingNetworkSetupsMap.remove( N ); |
284 | } | 284 | } |
285 | 285 | ||
286 | } | 286 | } |
287 | 287 | ||
288 | // dangling connections are filtered out | 288 | // dangling NetworkSetups are filtered out |
289 | NodeCollection * TheNSResources::findConnection( const QString & S ) { | 289 | NetworkSetup * TheNSResources::findNetworkSetup( const QString & S ) { |
290 | return ConnectionsMap[ S ]; | 290 | return NetworkSetupsMap[ S ]; |
291 | } | 291 | } |
292 | 292 | ||
293 | NodeCollection * TheNSResources::getConnection( int nr ) { | 293 | NetworkSetup * TheNSResources::getNetworkSetup( int nr ) { |
294 | for( QDictIterator<NodeCollection> it(ConnectionsMap); | 294 | for( QDictIterator<NetworkSetup> it(NetworkSetupsMap); |
295 | it.current(); | 295 | it.current(); |
296 | ++it ) { | 296 | ++it ) { |
297 | if( it.current()->number() == nr ) { | 297 | if( it.current()->number() == nr ) { |
298 | return it.current(); | 298 | return it.current(); |
@@ -300,19 +300,19 @@ NodeCollection * TheNSResources::getConnection( int nr ) { | |||
300 | } | 300 | } |
301 | return 0; | 301 | return 0; |
302 | } | 302 | } |
303 | /* | 303 | /* |
304 | void TheNSResources::renumberConnections( void ) { | 304 | void TheNSResources::renumberNetworkSetups( void ) { |
305 | Name2Connection_t & M = NSResources->connections(); | 305 | Name2NetworkSetup_t & M = NSResources->NetworkSetups(); |
306 | NodeCollection * NC; | 306 | NetworkSetup * NC; |
307 | 307 | ||
308 | // for all connections | 308 | // for all NetworkSetups |
309 | NodeCollection::resetMaxNr(); | 309 | NetworkSetup::resetMaxNr(); |
310 | for( QDictIterator<NodeCollection> it(M); | 310 | for( QDictIterator<NetworkSetup> it(M); |
311 | it.current(); | 311 | it.current(); |
312 | ++it ) { | 312 | ++it ) { |
313 | NC = it.current(); | 313 | NC = it.current(); |
314 | NC->setNumber( NC->maxConnectionNumber()+1 ); | 314 | NC->setNumber( NC->maxNetworkSetupNumber()+1 ); |
315 | NC->setModified( 1 ); | 315 | NC->setModified( 1 ); |
316 | } | 316 | } |
317 | } | 317 | } |
318 | */ | 318 | */ |
diff --git a/noncore/settings/networksettings2/networksettings2/resources.h b/noncore/settings/networksettings2/networksettings2/resources.h index 51c4250..f7393d3 100644 --- a/noncore/settings/networksettings2/networksettings2/resources.h +++ b/noncore/settings/networksettings2/networksettings2/resources.h | |||
@@ -39,9 +39,9 @@ public : | |||
39 | }; | 39 | }; |
40 | 40 | ||
41 | typedef QDict<ANetNode> Name2NetNode_t; | 41 | typedef QDict<ANetNode> Name2NetNode_t; |
42 | typedef QDict<ANetNodeInstance > Name2Instance_t; | 42 | typedef QDict<ANetNodeInstance > Name2Instance_t; |
43 | typedef QDict<NodeCollection> Name2Connection_t; | 43 | typedef QDict<NetworkSetup> Name2NetworkSetup_t; |
44 | typedef QDict<SystemFile> Name2SystemFile_t; | 44 | typedef QDict<SystemFile> Name2SystemFile_t; |
45 | 45 | ||
46 | class TheNSResources { | 46 | class TheNSResources { |
47 | 47 | ||
@@ -55,9 +55,9 @@ public : | |||
55 | 55 | ||
56 | System & system() | 56 | System & system() |
57 | { return *TheSystem; } | 57 | { return *TheSystem; } |
58 | 58 | ||
59 | int assignConnectionNumber(void); | 59 | int assignNetworkSetupNumber(void); |
60 | QPixmap getPixmap( const QString & Name ); | 60 | QPixmap getPixmap( const QString & Name ); |
61 | 61 | ||
62 | Name2NetNode_t & netNodes( void ) | 62 | Name2NetNode_t & netNodes( void ) |
63 | { return AllNodeTypes; } | 63 | { return AllNodeTypes; } |
@@ -102,16 +102,16 @@ public : | |||
102 | 102 | ||
103 | const QString & netNode2Name( const char * Type ); | 103 | const QString & netNode2Name( const char * Type ); |
104 | const QString & netNode2Description( const char * Type ); | 104 | const QString & netNode2Description( const char * Type ); |
105 | 105 | ||
106 | void addConnection( NodeCollection * NC, bool Dangling ); | 106 | void addNetworkSetup( NetworkSetup * NC, bool Dangling ); |
107 | void removeConnection( const QString & N ); | 107 | void removeNetworkSetup( const QString & N ); |
108 | NodeCollection * findConnection( const QString & N ); | 108 | NetworkSetup * findNetworkSetup( const QString & N ); |
109 | NodeCollection * getConnection( int nr ); | 109 | NetworkSetup * getNetworkSetup( int nr ); |
110 | Name2Connection_t & connections( void ) | 110 | Name2NetworkSetup_t & networkSetups( void ) |
111 | { return ConnectionsMap; } | 111 | { return NetworkSetupsMap; } |
112 | Name2Connection_t & danglingConnections( void ) | 112 | Name2NetworkSetup_t & danglingNetworkSetups( void ) |
113 | { return DanglingConnectionsMap; } | 113 | { return DanglingNetworkSetupsMap; } |
114 | 114 | ||
115 | inline bool userKnown( void ) | 115 | inline bool userKnown( void ) |
116 | { return CurrentUser.known(); } | 116 | { return CurrentUser.known(); } |
117 | CurrentQPEUser & currentUser( void ) | 117 | CurrentQPEUser & currentUser( void ) |
@@ -125,13 +125,13 @@ private : | |||
125 | void findAvailableNetNodes( void ); | 125 | void findAvailableNetNodes( void ); |
126 | 126 | ||
127 | QMap< QString, QString> NodeTypeNameMap; | 127 | QMap< QString, QString> NodeTypeNameMap; |
128 | QMap< QString, QString> NodeTypeDescriptionMap; | 128 | QMap< QString, QString> NodeTypeDescriptionMap; |
129 | // list of connections that are valid | 129 | // list of networkSetups that are valid |
130 | Name2Connection_t ConnectionsMap; | 130 | Name2NetworkSetup_t NetworkSetupsMap; |
131 | // list of connection configurations that are not valid | 131 | // list of networkSetup configurations that are not valid |
132 | // e.g. because plugins are missing | 132 | // e.g. because plugins are missing |
133 | Name2Connection_t DanglingConnectionsMap; | 133 | Name2NetworkSetup_t DanglingNetworkSetupsMap; |
134 | System * TheSystem; | 134 | System * TheSystem; |
135 | Name2SystemFile_t SystemFiles; | 135 | Name2SystemFile_t SystemFiles; |
136 | 136 | ||
137 | // all node type classes | 137 | // all node type classes |
diff --git a/noncore/settings/networksettings2/networksettings2/system.cpp b/noncore/settings/networksettings2/networksettings2/system.cpp index a290f08..33cc5bd 100644 --- a/noncore/settings/networksettings2/networksettings2/system.cpp +++ b/noncore/settings/networksettings2/networksettings2/system.cpp | |||
@@ -452,15 +452,15 @@ void System::probeInterfaces( void ) { | |||
452 | } | 452 | } |
453 | 453 | ||
454 | InterfaceInfo * System::findInterface( const QString & N ) { | 454 | InterfaceInfo * System::findInterface( const QString & N ) { |
455 | InterfaceInfo * Run; | 455 | InterfaceInfo * Run; |
456 | // has PAN connection UP interface ? | 456 | // has PAN NetworkSetup UP interface ? |
457 | for( QDictIterator<InterfaceInfo> It(ProbedInterfaces); | 457 | for( QDictIterator<InterfaceInfo> It(ProbedInterfaces); |
458 | It.current(); | 458 | It.current(); |
459 | ++It ) { | 459 | ++It ) { |
460 | Run = It.current(); | 460 | Run = It.current(); |
461 | if( N == Run->Name ) { | 461 | if( N == Run->Name ) { |
462 | // this PAN connection is up | 462 | // this PAN NetworkSetup is up |
463 | return Run; | 463 | return Run; |
464 | } | 464 | } |
465 | } | 465 | } |
466 | return 0; | 466 | return 0; |
diff --git a/noncore/settings/networksettings2/networksettings2/system.h b/noncore/settings/networksettings2/networksettings2/system.h index ebee0d5..794b868 100644 --- a/noncore/settings/networksettings2/networksettings2/system.h +++ b/noncore/settings/networksettings2/networksettings2/system.h | |||
@@ -12,9 +12,9 @@ using namespace Opie::Core; | |||
12 | #include <qdict.h> | 12 | #include <qdict.h> |
13 | #include <qobject.h> | 13 | #include <qobject.h> |
14 | #include <stdio.h> | 14 | #include <stdio.h> |
15 | 15 | ||
16 | class NodeCollection; | 16 | class NetworkSetup; |
17 | class ANetNodeInstance; | 17 | class ANetNodeInstance; |
18 | class QFile; | 18 | class QFile; |
19 | 19 | ||
20 | class MyProcess : public QObject { | 20 | class MyProcess : public QObject { |
@@ -65,15 +65,15 @@ public : | |||
65 | Netmask(), | 65 | Netmask(), |
66 | DstAddress() { | 66 | DstAddress() { |
67 | } | 67 | } |
68 | 68 | ||
69 | NodeCollection * assignedConnection() | 69 | NetworkSetup * assignedToNetworkSetup() |
70 | { return Collection; } | 70 | { return Collection; } |
71 | 71 | ||
72 | void assignConnection( NodeCollection * NNI ) | 72 | void assignToNetworkSetup( NetworkSetup * NNI ) |
73 | { Collection = NNI; } | 73 | { Collection = NNI; } |
74 | 74 | ||
75 | NodeCollection * Collection; // connection taking care of me | 75 | NetworkSetup * Collection; // networkSetup taking care of me |
76 | QString Name; // name of interface | 76 | QString Name; // name of interface |
77 | int CardType; // type of card | 77 | int CardType; // type of card |
78 | QString MACAddress; // MAC address | 78 | QString MACAddress; // MAC address |
79 | QString Address; // IP Address | 79 | QString Address; // IP Address |
diff --git a/noncore/settings/networksettings2/nsdata.cpp b/noncore/settings/networksettings2/nsdata.cpp index 39031ed..b4622fc 100644 --- a/noncore/settings/networksettings2/nsdata.cpp +++ b/noncore/settings/networksettings2/nsdata.cpp | |||
@@ -49,16 +49,16 @@ NetworkSettingsData::NetworkSettingsData( void ) { | |||
49 | profilenr = atol( (*it).mid( 8 ).latin1() ); | 49 | profilenr = atol( (*it).mid( 8 ).latin1() ); |
50 | // read the interface store int 'up' | 50 | // read the interface store int 'up' |
51 | F->setName( D.path() + "/" + (*it) ); | 51 | F->setName( D.path() + "/" + (*it) ); |
52 | if( F->open( IO_ReadOnly ) ) { | 52 | if( F->open( IO_ReadOnly ) ) { |
53 | NodeCollection * NC; | 53 | NetworkSetup * NC; |
54 | interfacename = TS.readLine(); | 54 | interfacename = TS.readLine(); |
55 | F->close(); | 55 | F->close(); |
56 | 56 | ||
57 | Log(( "Assign interface %s to Profile nr %d\n", | 57 | Log(( "Assign interface %s to Profile nr %d\n", |
58 | interfacename.latin1(), profilenr )); | 58 | interfacename.latin1(), profilenr )); |
59 | 59 | ||
60 | NC = NSResources->getConnection( profilenr ); | 60 | NC = NSResources->getNetworkSetup( profilenr ); |
61 | if( NC ) { | 61 | if( NC ) { |
62 | NC->assignInterface( | 62 | NC->assignInterface( |
63 | NSResources->system().findInterface( interfacename ) ); | 63 | NSResources->system().findInterface( interfacename ) ); |
64 | Log(( "Assign interface %p\n", | 64 | Log(( "Assign interface %p\n", |
@@ -98,9 +98,9 @@ void NetworkSettingsData::loadSettings( void ) { | |||
98 | 98 | ||
99 | [NETNODETYPE] | 99 | [NETNODETYPE] |
100 | Entries ... | 100 | Entries ... |
101 | <EMPTYLINE> | 101 | <EMPTYLINE> |
102 | [connection] | 102 | [NetworkSetup] |
103 | Name=Name | 103 | Name=Name |
104 | Node=Name | 104 | Node=Name |
105 | <EMPTYLINE> | 105 | <EMPTYLINE> |
106 | */ | 106 | */ |
@@ -115,13 +115,13 @@ void NetworkSettingsData::loadSettings( void ) { | |||
115 | if( ! NSResources ) { | 115 | if( ! NSResources ) { |
116 | continue; | 116 | continue; |
117 | } | 117 | } |
118 | 118 | ||
119 | if( S == "connection" ) { | 119 | if( S == "NetworkSetup" ) { |
120 | // load connections -> collections of nodes | 120 | // load NetworkSetups -> collections of nodes |
121 | bool Dangling; | 121 | bool Dangling; |
122 | NodeCollection * NC = new NodeCollection( TS, Dangling ); | 122 | NetworkSetup * NC = new NetworkSetup( TS, Dangling ); |
123 | NSResources->addConnection( NC, Dangling ); | 123 | NSResources->addNetworkSetup( NC, Dangling ); |
124 | } else { | 124 | } else { |
125 | ANetNode * NN = 0; | 125 | ANetNode * NN = 0; |
126 | ANetNodeInstance* NNI = 0; | 126 | ANetNodeInstance* NNI = 0; |
127 | if( S.startsWith( "nodetype " ) ) { | 127 | if( S.startsWith( "nodetype " ) ) { |
@@ -250,28 +250,28 @@ QString NetworkSettingsData::saveSettings( void ) { | |||
250 | TS << endl; | 250 | TS << endl; |
251 | } | 251 | } |
252 | } | 252 | } |
253 | 253 | ||
254 | // good connections | 254 | // good NetworkSetups |
255 | { Name2Connection_t & M = NSResources->connections(); | 255 | { Name2NetworkSetup_t & M = NSResources->networkSetups(); |
256 | 256 | ||
257 | // for all connections | 257 | // for all NetworkSetups |
258 | for( QDictIterator<NodeCollection> it(M); | 258 | for( QDictIterator<NetworkSetup> it(M); |
259 | it.current(); | 259 | it.current(); |
260 | ++it ) { | 260 | ++it ) { |
261 | TS << "[connection]" << endl; | 261 | TS << "[NetworkSetup]" << endl; |
262 | it.current()->save(TS); | 262 | it.current()->save(TS); |
263 | } | 263 | } |
264 | } | 264 | } |
265 | 265 | ||
266 | // save dangling connections | 266 | // save dangling NetworkSetups |
267 | { Name2Connection_t & M = NSResources->danglingConnections(); | 267 | { Name2NetworkSetup_t & M = NSResources->danglingNetworkSetups(); |
268 | 268 | ||
269 | // for all connections | 269 | // for all NetworkSetups |
270 | for( QDictIterator<NodeCollection> it(M); | 270 | for( QDictIterator<NetworkSetup> it(M); |
271 | it.current(); | 271 | it.current(); |
272 | ++it ) { | 272 | ++it ) { |
273 | TS << "[connection]" << endl; | 273 | TS << "[NetworkSetup]" << endl; |
274 | it.current()->save(TS); | 274 | it.current()->save(TS); |
275 | } | 275 | } |
276 | } | 276 | } |
277 | 277 | ||
@@ -282,9 +282,9 @@ QString NetworkSettingsData::saveSettings( void ) { | |||
282 | // proper files AND system files regenerated | 282 | // proper files AND system files regenerated |
283 | // | 283 | // |
284 | 284 | ||
285 | 285 | ||
286 | for( QDictIterator<NodeCollection> it(NSResources->connections()); | 286 | for( QDictIterator<NetworkSetup> it(NSResources->networkSetups()); |
287 | it.current(); | 287 | it.current(); |
288 | ++it ) { | 288 | ++it ) { |
289 | it.current()->setModified( 0 ); | 289 | it.current()->setModified( 0 ); |
290 | } | 290 | } |
@@ -294,10 +294,10 @@ QString NetworkSettingsData::saveSettings( void ) { | |||
294 | 294 | ||
295 | QString NetworkSettingsData::generateSettings( void ) { | 295 | QString NetworkSettingsData::generateSettings( void ) { |
296 | QString S = ""; | 296 | QString S = ""; |
297 | Name2SystemFile_t & SFM = NSResources->systemFiles(); | 297 | Name2SystemFile_t & SFM = NSResources->systemFiles(); |
298 | Name2Connection_t & M = NSResources->connections(); | 298 | Name2NetworkSetup_t & M = NSResources->networkSetups(); |
299 | NodeCollection * NC; | 299 | NetworkSetup * NC; |
300 | ANetNodeInstance * NNI; | 300 | ANetNodeInstance * NNI; |
301 | ANetNodeInstance * FirstWithData; | 301 | ANetNodeInstance * FirstWithData; |
302 | RuntimeInfo * CurDev; | 302 | RuntimeInfo * CurDev; |
303 | ANetNode * NN, * CurDevNN = 0; | 303 | ANetNode * NN, * CurDevNN = 0; |
@@ -427,9 +427,9 @@ QString NetworkSettingsData::generateSettings( void ) { | |||
427 | ++nniit ) { | 427 | ++nniit ) { |
428 | nniit.current()->setDone(0); | 428 | nniit.current()->setDone(0); |
429 | } | 429 | } |
430 | 430 | ||
431 | for( QDictIterator<NodeCollection> ncit(M); | 431 | for( QDictIterator<NetworkSetup> ncit(M); |
432 | ncit.current(); | 432 | ncit.current(); |
433 | ++ncit ) { | 433 | ++ncit ) { |
434 | ncit.current()->setDone(0); | 434 | ncit.current()->setDone(0); |
435 | } | 435 | } |
@@ -487,10 +487,10 @@ QString NetworkSettingsData::generateSettings( void ) { | |||
487 | arg( SF->name() ); | 487 | arg( SF->name() ); |
488 | return S; | 488 | return S; |
489 | } | 489 | } |
490 | 490 | ||
491 | // find connections that want to write to this file | 491 | // find NetworkSetups that want to write to this file |
492 | for( QDictIterator<NodeCollection> ncit(M); | 492 | for( QDictIterator<NetworkSetup> ncit(M); |
493 | ncit.current(); | 493 | ncit.current(); |
494 | ++ncit ) { | 494 | ++ncit ) { |
495 | 495 | ||
496 | NC = ncit.current(); | 496 | NC = ncit.current(); |
@@ -504,14 +504,14 @@ QString NetworkSettingsData::generateSettings( void ) { | |||
504 | // no data | 504 | // no data |
505 | continue; | 505 | continue; |
506 | } | 506 | } |
507 | 507 | ||
508 | Log(("Generating %s for connection %s\n", | 508 | Log(("Generating %s for NetworkSetup %s\n", |
509 | SF->name().latin1(), NC->name().latin1() )); | 509 | SF->name().latin1(), NC->name().latin1() )); |
510 | // find highest item that wants to write data to this file | 510 | // find highest item that wants to write data to this file |
511 | FirstWithData = NC->firstWithDataForFile( *SF ); | 511 | FirstWithData = NC->firstWithDataForFile( *SF ); |
512 | 512 | ||
513 | // find device on which this connection works | 513 | // find device on which this NetworkSetup works |
514 | CurDev = NC->device(); | 514 | CurDev = NC->device(); |
515 | // class of that node | 515 | // class of that node |
516 | CurDevNN = CurDev->netNode()->nodeClass(); | 516 | CurDevNN = CurDev->netNode()->nodeClass(); |
517 | 517 | ||
@@ -570,19 +570,19 @@ QString NetworkSettingsData::generateSettings( void ) { | |||
570 | )); | 570 | )); |
571 | } | 571 | } |
572 | 572 | ||
573 | // generate profile specific info | 573 | // generate profile specific info |
574 | // for all nodeconnections that work on the same device | 574 | // for all nodeNetworkSetups that work on the same device |
575 | for( QDictIterator<NodeCollection> ncit2(M); | 575 | for( QDictIterator<NetworkSetup> ncit2(M); |
576 | ncit2.current(); | 576 | ncit2.current(); |
577 | ++ncit2 ) { | 577 | ++ncit2 ) { |
578 | 578 | ||
579 | if( ncit2.current()->device() != CurDev ) { | 579 | if( ncit2.current()->device() != CurDev ) { |
580 | // different device | 580 | // different device |
581 | continue; | 581 | continue; |
582 | } | 582 | } |
583 | 583 | ||
584 | Log(("Connection %s of family %s\n", | 584 | Log(("NetworkSetup %s of family %s\n", |
585 | ncit2.current()->name().latin1(), | 585 | ncit2.current()->name().latin1(), |
586 | CurDev->name() )); | 586 | CurDev->name() )); |
587 | // generate | 587 | // generate |
588 | NNI = ncit2.current()->firstWithDataForFile( *SF ); | 588 | NNI = ncit2.current()->firstWithDataForFile( *SF ); |
@@ -644,17 +644,17 @@ QString NetworkSettingsData::generateSettings( void ) { | |||
644 | } | 644 | } |
645 | return S; | 645 | return S; |
646 | } | 646 | } |
647 | 647 | ||
648 | QList<NodeCollection> NetworkSettingsData::collectPossible( | 648 | QList<NetworkSetup> NetworkSettingsData::collectPossible( |
649 | const QString & Interface ) { | 649 | const QString & Interface ) { |
650 | // collect connections that can work on top of this interface | 650 | // collect NetworkSetups that can work on top of this interface |
651 | NodeCollection * NC; | 651 | NetworkSetup * NC; |
652 | QList<NodeCollection> PossibleConnections; | 652 | QList<NetworkSetup> PossibleNetworkSetups; |
653 | Name2Connection_t & M = NSResources->connections(); | 653 | Name2NetworkSetup_t & M = NSResources->networkSetups(); |
654 | 654 | ||
655 | // for all connections | 655 | // for all NetworkSetups |
656 | for( QDictIterator<NodeCollection> it(M); | 656 | for( QDictIterator<NetworkSetup> it(M); |
657 | it.current(); | 657 | it.current(); |
658 | ++it ) { | 658 | ++it ) { |
659 | NC = it.current(); | 659 | NC = it.current(); |
660 | // check if this profile handles the requested interface | 660 | // check if this profile handles the requested interface |
@@ -663,12 +663,12 @@ QList<NodeCollection> NetworkSettingsData::collectPossible( | |||
663 | NC->state() != IsUp // if already used | 663 | NC->state() != IsUp // if already used |
664 | ) { | 664 | ) { |
665 | Log( ( "Append %s for %s\n", | 665 | Log( ( "Append %s for %s\n", |
666 | NC->name().latin1(), Interface.latin1() )); | 666 | NC->name().latin1(), Interface.latin1() )); |
667 | PossibleConnections.append( NC ); | 667 | PossibleNetworkSetups.append( NC ); |
668 | } | 668 | } |
669 | } | 669 | } |
670 | return PossibleConnections; | 670 | return PossibleNetworkSetups; |
671 | } | 671 | } |
672 | 672 | ||
673 | 673 | ||
674 | /* | 674 | /* |
@@ -678,20 +678,20 @@ QList<NodeCollection> NetworkSettingsData::collectPossible( | |||
678 | */ | 678 | */ |
679 | 679 | ||
680 | bool NetworkSettingsData::canStart( const QString & Interface ) { | 680 | bool NetworkSettingsData::canStart( const QString & Interface ) { |
681 | // load situation | 681 | // load situation |
682 | NodeCollection * NC = 0; | 682 | NetworkSetup * NC = 0; |
683 | QList<NodeCollection> PossibleConnections; | 683 | QList<NetworkSetup> PossibleNetworkSetups; |
684 | 684 | ||
685 | PossibleConnections = collectPossible( Interface ); | 685 | PossibleNetworkSetups = collectPossible( Interface ); |
686 | 686 | ||
687 | Log( ( "for %s : Possiblilies %d\n", | 687 | Log( ( "for %s : Possiblilies %d\n", |
688 | Interface.latin1(), PossibleConnections.count() )); | 688 | Interface.latin1(), PossibleNetworkSetups.count() )); |
689 | switch( PossibleConnections.count() ) { | 689 | switch( PossibleNetworkSetups.count() ) { |
690 | case 0 : // no connections | 690 | case 0 : // no NetworkSetups |
691 | break; | 691 | break; |
692 | case 1 : // one connection | 692 | case 1 : // one NetworkSetup |
693 | NC = PossibleConnections.first(); | 693 | NC = PossibleNetworkSetups.first(); |
694 | break; | 694 | break; |
695 | default : // need to ask user ? | 695 | default : // need to ask user ? |
696 | return 1; | 696 | return 1; |
697 | } | 697 | } |
@@ -735,9 +735,9 @@ bool NetworkSettingsData::canStart( const QString & Interface ) { | |||
735 | bool NetworkSettingsData::isModified( void ) { | 735 | bool NetworkSettingsData::isModified( void ) { |
736 | if( ForceModified ) | 736 | if( ForceModified ) |
737 | return 1; | 737 | return 1; |
738 | 738 | ||
739 | for( QDictIterator<NodeCollection> it(NSResources->connections()); | 739 | for( QDictIterator<NetworkSetup> it(NSResources->networkSetups()); |
740 | it.current(); | 740 | it.current(); |
741 | ++it ) { | 741 | ++it ) { |
742 | if( it.current()->isModified() ) { | 742 | if( it.current()->isModified() ) { |
743 | return 1; | 743 | return 1; |
@@ -747,9 +747,9 @@ bool NetworkSettingsData::isModified( void ) { | |||
747 | } | 747 | } |
748 | 748 | ||
749 | bool NetworkSettingsData::couldBeTriggered( const QString & Interface ) { | 749 | bool NetworkSettingsData::couldBeTriggered( const QString & Interface ) { |
750 | // load situation | 750 | // load situation |
751 | QList<NodeCollection> PossibleTriggered; | 751 | QList<NetworkSetup> PossibleTriggered; |
752 | 752 | ||
753 | PossibleTriggered = collectTriggered( Interface ); | 753 | PossibleTriggered = collectTriggered( Interface ); |
754 | 754 | ||
755 | Log( ( "for %s : Possiblilies %d\n", | 755 | Log( ( "for %s : Possiblilies %d\n", |
@@ -757,19 +757,19 @@ bool NetworkSettingsData::couldBeTriggered( const QString & Interface ) { | |||
757 | 757 | ||
758 | return ( PossibleTriggered.count() ) ? 1 : 0; | 758 | return ( PossibleTriggered.count() ) ? 1 : 0; |
759 | } | 759 | } |
760 | 760 | ||
761 | QList<NodeCollection> NetworkSettingsData::collectTriggered( | 761 | QList<NetworkSetup> NetworkSettingsData::collectTriggered( |
762 | const QString & Interface ) { | 762 | const QString & Interface ) { |
763 | 763 | ||
764 | // collect connections that could be triggered by this interface | 764 | // collect NetworkSetups that could be triggered by this interface |
765 | NodeCollection * NC; | 765 | NetworkSetup * NC; |
766 | QList<NodeCollection> PossibleTriggered; | 766 | QList<NetworkSetup> PossibleTriggered; |
767 | 767 | ||
768 | // for all connections | 768 | // for all NetworkSetups |
769 | Name2Connection_t & M = NSResources->connections(); | 769 | Name2NetworkSetup_t & M = NSResources->networkSetups(); |
770 | 770 | ||
771 | for( QDictIterator<NodeCollection> it(M); | 771 | for( QDictIterator<NetworkSetup> it(M); |
772 | it.current(); | 772 | it.current(); |
773 | ++it ) { | 773 | ++it ) { |
774 | NC = it.current(); | 774 | NC = it.current(); |
775 | // check if this profile handles the requested interface | 775 | // check if this profile handles the requested interface |
diff --git a/noncore/settings/networksettings2/nsdata.h b/noncore/settings/networksettings2/nsdata.h index 5791c1e..b9c216d 100644 --- a/noncore/settings/networksettings2/nsdata.h +++ b/noncore/settings/networksettings2/nsdata.h | |||
@@ -18,18 +18,18 @@ public : | |||
18 | bool isModified( void ); | 18 | bool isModified( void ); |
19 | inline void setModified( bool M ) | 19 | inline void setModified( bool M ) |
20 | { ForceModified = M; } | 20 | { ForceModified = M; } |
21 | 21 | ||
22 | QList<NodeCollection> collectPossible( const QString & Interface ); | 22 | QList<NetworkSetup> collectPossible( const QString & Interface ); |
23 | // return TRUE if we need gui to decide | 23 | // return TRUE if we need gui to decide |
24 | bool canStart( const QString & Interface ); | 24 | bool canStart( const QString & Interface ); |
25 | // return TRUE if there are vpns that could be triggered | 25 | // return TRUE if there are vpns that could be triggered |
26 | // by this interface | 26 | // by this interface |
27 | bool couldBeTriggered( const QString & Interface ); | 27 | bool couldBeTriggered( const QString & Interface ); |
28 | 28 | ||
29 | private : | 29 | private : |
30 | 30 | ||
31 | QList<NodeCollection> collectTriggered( const QString &Interface ); | 31 | QList<NetworkSetup> collectTriggered( const QString &Interface ); |
32 | bool ForceModified; | 32 | bool ForceModified; |
33 | 33 | ||
34 | // collect strings in config file nobody wants | 34 | // collect strings in config file nobody wants |
35 | QStringList LeftOvers; | 35 | QStringList LeftOvers; |
diff --git a/noncore/settings/networksettings2/opietooth2/OTDriver.cpp b/noncore/settings/networksettings2/opietooth2/OTDriver.cpp index a7ee662..cfd0491 100644 --- a/noncore/settings/networksettings2/opietooth2/OTDriver.cpp +++ b/noncore/settings/networksettings2/opietooth2/OTDriver.cpp | |||
@@ -712,9 +712,9 @@ long OTDriver::getLinkQuality( const OTDeviceAddress & Addr ) { | |||
712 | bacpy( &(cr->bdaddr), &(Addr.getBDAddr()) ); | 712 | bacpy( &(cr->bdaddr), &(Addr.getBDAddr()) ); |
713 | cr->type = ACL_LINK; | 713 | cr->type = ACL_LINK; |
714 | 714 | ||
715 | if (ioctl( fd(), HCIGETCONNINFO, (unsigned long) cr) < 0) { | 715 | if (ioctl( fd(), HCIGETCONNINFO, (unsigned long) cr) < 0) { |
716 | odebug << "Get connection info failed" << oendl; | 716 | odebug << "Get NetworkSetup info failed" << oendl; |
717 | free(cr); | 717 | free(cr); |
718 | return 0; | 718 | return 0; |
719 | } | 719 | } |
720 | 720 | ||
@@ -730,9 +730,9 @@ long OTDriver::getLinkQuality( const OTDeviceAddress & Addr ) { | |||
730 | rq.rparam = &rp; | 730 | rq.rparam = &rp; |
731 | rq.rlen = GET_LINK_QUALITY_RP_SIZE; | 731 | rq.rlen = GET_LINK_QUALITY_RP_SIZE; |
732 | 732 | ||
733 | if (hci_send_req( fd(), &rq, 100) < 0) { | 733 | if (hci_send_req( fd(), &rq, 100) < 0) { |
734 | odebug << "Get connection info failed" << oendl; | 734 | odebug << "Get NetworkSetup info failed" << oendl; |
735 | return 0; | 735 | return 0; |
736 | } | 736 | } |
737 | 737 | ||
738 | if( rp.status ) { | 738 | if( rp.status ) { |
diff --git a/noncore/settings/networksettings2/opietooth2/OTDriver.h b/noncore/settings/networksettings2/opietooth2/OTDriver.h index b54ffdf..899fab4 100644 --- a/noncore/settings/networksettings2/opietooth2/OTDriver.h +++ b/noncore/settings/networksettings2/opietooth2/OTDriver.h | |||
@@ -11,9 +11,9 @@ | |||
11 | #ifndef OTDRIVER_H | 11 | #ifndef OTDRIVER_H |
12 | #define OTDRIVER_H | 12 | #define OTDRIVER_H |
13 | 13 | ||
14 | /* | 14 | /* |
15 | * This class handles the connection with the BlueZ libraries, implements | 15 | * This class handles the networkSetup with the BlueZ libraries, implements |
16 | * most of the bluetooth-related functions and owns the KBTDevice class | 16 | * most of the bluetooth-related functions and owns the KBTDevice class |
17 | * that is a single local bluetooth device representation. | 17 | * that is a single local bluetooth device representation. |
18 | * It is used as a Singleton pattern thru the getDefaultConnector() method. | 18 | * It is used as a Singleton pattern thru the getDefaultConnector() method. |
19 | * | 19 | * |
@@ -117,9 +117,9 @@ public: | |||
117 | { return Dev; }; | 117 | { return Dev; }; |
118 | 118 | ||
119 | /* | 119 | /* |
120 | * Returns the file descriptor for the local | 120 | * Returns the file descriptor for the local |
121 | * connection to this device | 121 | * networkSetup to this device |
122 | */ | 122 | */ |
123 | int fd() const | 123 | int fd() const |
124 | { return Fd; }; | 124 | { return Fd; }; |
125 | void setfd(int _fd) | 125 | void setfd(int _fd) |
diff --git a/noncore/settings/networksettings2/opietooth2/OTGateway.cpp b/noncore/settings/networksettings2/opietooth2/OTGateway.cpp index 1b61a2e..7fc8719 100644 --- a/noncore/settings/networksettings2/opietooth2/OTGateway.cpp +++ b/noncore/settings/networksettings2/opietooth2/OTGateway.cpp | |||
@@ -61,11 +61,11 @@ OTGateway::OTGateway( void ) : QObject( 0, "OTGateway" ), | |||
61 | 61 | ||
62 | // load all peers we have ever seen | 62 | // load all peers we have ever seen |
63 | loadKnownPeers(); | 63 | loadKnownPeers(); |
64 | 64 | ||
65 | // iterate over drivers and find active connections | 65 | // iterate over drivers and find active NetworkSetups |
66 | // adding/updating peers | 66 | // adding/updating peers |
67 | loadActiveConnections(); | 67 | loadActiveNetworkSetups(); |
68 | 68 | ||
69 | // check every 4 seconds the state of BT | 69 | // check every 4 seconds the state of BT |
70 | timerEvent(0); | 70 | timerEvent(0); |
71 | RefreshTimer = -1; | 71 | RefreshTimer = -1; |
@@ -374,10 +374,10 @@ const char * OTGateway::deviceTypeToName( int cls ) { | |||
374 | } | 374 | } |
375 | return "unknown"; | 375 | return "unknown"; |
376 | } | 376 | } |
377 | 377 | ||
378 | PANConnectionVector OTGateway::getPANConnections( void ) { | 378 | PANNetworkSetupVector OTGateway::getPANNetworkSetups( void ) { |
379 | PANConnectionVector V; | 379 | PANNetworkSetupVector V; |
380 | 380 | ||
381 | struct bnep_connlist_req req; | 381 | struct bnep_connlist_req req; |
382 | struct bnep_conninfo ci[48]; | 382 | struct bnep_conninfo ci[48]; |
383 | 383 | ||
@@ -391,18 +391,18 @@ PANConnectionVector OTGateway::getPANConnections( void ) { | |||
391 | 391 | ||
392 | req.cnum = 48; | 392 | req.cnum = 48; |
393 | req.ci = ci; | 393 | req.ci = ci; |
394 | if (ioctl(ctl, BNEPGETCONNLIST, &req)) { | 394 | if (ioctl(ctl, BNEPGETCONNLIST, &req)) { |
395 | odebug << "Failed to get connection list" << oendl; | 395 | odebug << "Failed to get NetworkSetup list" << oendl; |
396 | ::close( ctl ); | 396 | ::close( ctl ); |
397 | return V; | 397 | return V; |
398 | } | 398 | } |
399 | 399 | ||
400 | for ( unsigned i=0; i < req.cnum; i++) { | 400 | for ( unsigned i=0; i < req.cnum; i++) { |
401 | V.resize( V.size() + 1 ); | 401 | V.resize( V.size() + 1 ); |
402 | if( ci[i].role == BNEP_SVC_PANU ) { | 402 | if( ci[i].role == BNEP_SVC_PANU ) { |
403 | // we are the client | 403 | // we are the client |
404 | V.insert( V.size()-1, new OTPANConnection( | 404 | V.insert( V.size()-1, new OTPANNetworkSetup( |
405 | ci[i].device, | 405 | ci[i].device, |
406 | batostr((bdaddr_t *) ci[i].dst) | 406 | batostr((bdaddr_t *) ci[i].dst) |
407 | ) ); | 407 | ) ); |
408 | } | 408 | } |
@@ -509,9 +509,9 @@ bool OTGateway::removeLinkKey( unsigned int Index ) { | |||
509 | return 1; | 509 | return 1; |
510 | } | 510 | } |
511 | 511 | ||
512 | #define MAXCONNECTIONS 10 | 512 | #define MAXCONNECTIONS 10 |
513 | void OTGateway::loadActiveConnections( void ) { | 513 | void OTGateway::loadActiveNetworkSetups( void ) { |
514 | 514 | ||
515 | struct hci_conn_list_req *cl; | 515 | struct hci_conn_list_req *cl; |
516 | struct hci_conn_info *ci; | 516 | struct hci_conn_info *ci; |
517 | OTDeviceAddress Addr; | 517 | OTDeviceAddress Addr; |
@@ -531,15 +531,15 @@ void OTGateway::loadActiveConnections( void ) { | |||
531 | if( ! AllDrivers[i]->isUp() ) { | 531 | if( ! AllDrivers[i]->isUp() ) { |
532 | continue; | 532 | continue; |
533 | } | 533 | } |
534 | 534 | ||
535 | // driver is up -> check connections | 535 | // driver is up -> check NetworkSetups |
536 | cl->dev_id = AllDrivers[i]->devId(); | 536 | cl->dev_id = AllDrivers[i]->devId(); |
537 | cl->conn_num = MAXCONNECTIONS; | 537 | cl->conn_num = MAXCONNECTIONS; |
538 | ci = cl->conn_info; | 538 | ci = cl->conn_info; |
539 | 539 | ||
540 | if (ioctl( getSocket(), HCIGETCONNLIST, (void *) cl)) { | 540 | if (ioctl( getSocket(), HCIGETCONNLIST, (void *) cl)) { |
541 | emit error( tr("Can't get connection list") ); | 541 | emit error( tr("Can't get NetworkSetup list") ); |
542 | break; | 542 | break; |
543 | } | 543 | } |
544 | 544 | ||
545 | for ( int k = 0; k < cl->conn_num; k++, ci++) { | 545 | for ( int k = 0; k < cl->conn_num; k++, ci++) { |
@@ -752,9 +752,9 @@ int OTGateway::releaseRFCommDevice( int devnr ) { | |||
752 | 752 | ||
753 | dr = di; | 753 | dr = di; |
754 | for (i = 0; i < dl->dev_num; i++, dr++) { | 754 | for (i = 0; i < dl->dev_num; i++, dr++) { |
755 | if( dr->id == devnr ) { | 755 | if( dr->id == devnr ) { |
756 | // still in connection list | 756 | // still in NetworkSetup list |
757 | struct rfcomm_dev_req req; | 757 | struct rfcomm_dev_req req; |
758 | int err; | 758 | int err; |
759 | 759 | ||
760 | memset(&req, 0, sizeof(req)); | 760 | memset(&req, 0, sizeof(req)); |
diff --git a/noncore/settings/networksettings2/opietooth2/OTGateway.h b/noncore/settings/networksettings2/opietooth2/OTGateway.h index 11c6b30..d0e42db 100644 --- a/noncore/settings/networksettings2/opietooth2/OTGateway.h +++ b/noncore/settings/networksettings2/opietooth2/OTGateway.h | |||
@@ -16,13 +16,13 @@ class OTDriverList; | |||
16 | class OTDriver; | 16 | class OTDriver; |
17 | class OTDevice; | 17 | class OTDevice; |
18 | class OTPeer; | 18 | class OTPeer; |
19 | class OTInquiry; | 19 | class OTInquiry; |
20 | class OTPANConnection; | 20 | class OTPANNetworkSetup; |
21 | class OTLinkKey; | 21 | class OTLinkKey; |
22 | 22 | ||
23 | typedef QVector<OTPeer> PeerVector; | 23 | typedef QVector<OTPeer> PeerVector; |
24 | typedef QVector<OTPANConnection> PANConnectionVector; | 24 | typedef QVector<OTPANNetworkSetup> PANNetworkSetupVector; |
25 | typedef QArray<OTLinkKey> LinkKeyArray; | 25 | typedef QArray<OTLinkKey> LinkKeyArray; |
26 | 26 | ||
27 | class OTLinkKey { | 27 | class OTLinkKey { |
28 | 28 | ||
@@ -42,13 +42,13 @@ public : | |||
42 | OTDeviceAddress From; | 42 | OTDeviceAddress From; |
43 | OTDeviceAddress To; | 43 | OTDeviceAddress To; |
44 | }; | 44 | }; |
45 | 45 | ||
46 | class OTPANConnection { | 46 | class OTPANNetworkSetup { |
47 | 47 | ||
48 | public : | 48 | public : |
49 | 49 | ||
50 | OTPANConnection( const QString & Dev, const QString & CT ) { | 50 | OTPANNetworkSetup( const QString & Dev, const QString & CT ) { |
51 | Device = Dev; | 51 | Device = Dev; |
52 | ConnectedTo = CT; | 52 | ConnectedTo = CT; |
53 | } | 53 | } |
54 | 54 | ||
@@ -91,9 +91,9 @@ public : | |||
91 | OTDriver * driver( int nr ) | 91 | OTDriver * driver( int nr ) |
92 | { return AllDrivers.count() == 0 ? 0 : AllDrivers[nr]; } | 92 | { return AllDrivers.count() == 0 ? 0 : AllDrivers[nr]; } |
93 | void updateDrivers(); | 93 | void updateDrivers(); |
94 | 94 | ||
95 | PANConnectionVector getPANConnections(); | 95 | PANNetworkSetupVector getPANNetworkSetups(); |
96 | 96 | ||
97 | // scan neighbourhood using device | 97 | // scan neighbourhood using device |
98 | void scanNeighbourhood( OTDriver * D = 0 ); | 98 | void scanNeighbourhood( OTDriver * D = 0 ); |
99 | void stopScanOfNeighbourhood(void ); | 99 | void stopScanOfNeighbourhood(void ); |
@@ -172,9 +172,9 @@ protected : | |||
172 | void timerEvent( QTimerEvent * ); | 172 | void timerEvent( QTimerEvent * ); |
173 | 173 | ||
174 | private : | 174 | private : |
175 | 175 | ||
176 | void loadActiveConnections( void ); | 176 | void loadActiveNetworkSetups( void ); |
177 | void loadKnownPeers( void ); | 177 | void loadKnownPeers( void ); |
178 | void saveKnownPeers( void ); | 178 | void saveKnownPeers( void ); |
179 | bool isConnectedTo( int devid, | 179 | bool isConnectedTo( int devid, |
180 | const OTDeviceAddress & Address ); | 180 | const OTDeviceAddress & Address ); |
diff --git a/noncore/settings/networksettings2/opietooth2/OTInquiry.h b/noncore/settings/networksettings2/opietooth2/OTInquiry.h index f7bdeec..559af7a 100644 --- a/noncore/settings/networksettings2/opietooth2/OTInquiry.h +++ b/noncore/settings/networksettings2/opietooth2/OTInquiry.h | |||
@@ -37,9 +37,9 @@ class OTHCISocket; | |||
37 | * to the signals neighbourFound() and finished() and call | 37 | * to the signals neighbourFound() and finished() and call |
38 | * inquiry(). Inquiry results are signalled as soon as they arrive, | 38 | * inquiry(). Inquiry results are signalled as soon as they arrive, |
39 | * so the information can be displayed before the whole inquiry | 39 | * so the information can be displayed before the whole inquiry |
40 | * process is finished. | 40 | * process is finished. |
41 | * Still no connections should be set up before | 41 | * Still no networkSetups should be set up before |
42 | * the finished() signal was sent (hmm, is this always true..?) | 42 | * the finished() signal was sent (hmm, is this always true..?) |
43 | */ | 43 | */ |
44 | 44 | ||
45 | class OTInquiry : public QObject { | 45 | class OTInquiry : public QObject { |
diff --git a/noncore/settings/networksettings2/ppp/PPPDialingedit.cpp b/noncore/settings/networksettings2/ppp/PPPDialingedit.cpp index 9264ceb..2b03c73 100644 --- a/noncore/settings/networksettings2/ppp/PPPDialingedit.cpp +++ b/noncore/settings/networksettings2/ppp/PPPDialingedit.cpp | |||
@@ -15,11 +15,10 @@ PPPDialingEdit::PPPDialingEdit( QWidget * Parent ) : | |||
15 | QString PPPDialingEdit::acceptable( void ) { | 15 | QString PPPDialingEdit::acceptable( void ) { |
16 | return QString(); | 16 | return QString(); |
17 | } | 17 | } |
18 | 18 | ||
19 | bool PPPDialingEdit::commit( PPPData & D ) { | 19 | bool PPPDialingEdit::commit( PPPData & ) { |
20 | bool SM; | 20 | return true; |
21 | return SM; | ||
22 | } | 21 | } |
23 | 22 | ||
24 | void PPPDialingEdit::showData( PPPData & D ) { | 23 | void PPPDialingEdit::showData( PPPData & D ) { |
25 | } | 24 | } |
diff --git a/noncore/settings/networksettings2/ppp/ppp_NN.cpp b/noncore/settings/networksettings2/ppp/ppp_NN.cpp index 8c15e9c..884168c 100644 --- a/noncore/settings/networksettings2/ppp/ppp_NN.cpp +++ b/noncore/settings/networksettings2/ppp/ppp_NN.cpp | |||
@@ -13,16 +13,16 @@ static const char * PPPNeeds[] = | |||
13 | 0 | 13 | 0 |
14 | }; | 14 | }; |
15 | 15 | ||
16 | static const char * PPPProvides[] = | 16 | static const char * PPPProvides[] = |
17 | { "connection", | 17 | { "NetworkSetup", |
18 | 0 | 18 | 0 |
19 | }; | 19 | }; |
20 | 20 | ||
21 | /** | 21 | /** |
22 | * Constructor, find all of the possible interfaces | 22 | * Constructor, find all of the possible interfaces |
23 | */ | 23 | */ |
24 | PPPNetNode::PPPNetNode() : ANetNode(tr("PPP Connection")) { | 24 | PPPNetNode::PPPNetNode() : ANetNode(tr("PPP NetworkSetup")) { |
25 | 25 | ||
26 | NSResources->addSystemFile( | 26 | NSResources->addSystemFile( |
27 | "pap-secrets", "/etc/ppp/pap-secrets", 0 ); | 27 | "pap-secrets", "/etc/ppp/pap-secrets", 0 ); |
28 | NSResources->addSystemFile( | 28 | NSResources->addSystemFile( |
diff --git a/noncore/settings/networksettings2/ppp/ppp_NNI.cpp b/noncore/settings/networksettings2/ppp/ppp_NNI.cpp index 9e3bb64..7286d96 100644 --- a/noncore/settings/networksettings2/ppp/ppp_NNI.cpp +++ b/noncore/settings/networksettings2/ppp/ppp_NNI.cpp | |||
@@ -148,13 +148,13 @@ void APPP::commit( void ) { | |||
148 | 148 | ||
149 | bool APPP::openFile( SystemFile & SF ) { | 149 | bool APPP::openFile( SystemFile & SF ) { |
150 | if( SF.name() == "peers" ) { | 150 | if( SF.name() == "peers" ) { |
151 | SF.setPath( removeSpaces( | 151 | SF.setPath( removeSpaces( |
152 | QString( "/tmp/ppp/peers/" ) + connection()->name() ) ); | 152 | QString( "/tmp/ppp/peers/" ) + networkSetup()->name() ) ); |
153 | return 1; | 153 | return 1; |
154 | } else if ( SF.name() == "chatscripts" ) { | 154 | } else if ( SF.name() == "chatscripts" ) { |
155 | SF.setPath( removeSpaces( | 155 | SF.setPath( removeSpaces( |
156 | QString( "/tmp/chatscripts/" ) + connection()->name() ) ); | 156 | QString( "/tmp/chatscripts/" ) + networkSetup()->name() ) ); |
157 | return 1; | 157 | return 1; |
158 | } | 158 | } |
159 | return 0; | 159 | return 0; |
160 | } | 160 | } |
@@ -169,26 +169,26 @@ short APPP::generateFile( SystemFile & SF, long DevNr ) { | |||
169 | Log(("Generate PPP for %s\n", SF.name().latin1() )); | 169 | Log(("Generate PPP for %s\n", SF.name().latin1() )); |
170 | 170 | ||
171 | if( Data.Auth.Mode == 1 && Data.Auth.PCEMode == 0 ) { | 171 | if( Data.Auth.Mode == 1 && Data.Auth.PCEMode == 0 ) { |
172 | SF << "# secrets for " | 172 | SF << "# secrets for " |
173 | << connection()->name().latin1() | 173 | << networkSetup()->name().latin1() |
174 | << endl; | 174 | << endl; |
175 | SF << Data.Auth.Client | 175 | SF << Data.Auth.Client |
176 | << " " | 176 | << " " |
177 | << Data.Auth.Server | 177 | << Data.Auth.Server |
178 | << " " | 178 | << " " |
179 | << Data.Auth.Secret | 179 | << Data.Auth.Secret |
180 | << endl; | 180 | << endl; |
181 | rvl = 0; | 181 | rvl = 0; |
182 | rvd = connection()->getToplevel()->generateFileEmbedded( | 182 | rvd = networkSetup()->getToplevel()->generateFileEmbedded( |
183 | SF, DevNr ); | 183 | SF, DevNr ); |
184 | } | 184 | } |
185 | } else if( SF.name() == "chap-secrets" ) { | 185 | } else if( SF.name() == "chap-secrets" ) { |
186 | Log(("Generate PPP for %s\n", SF.name().latin1() )); | 186 | Log(("Generate PPP for %s\n", SF.name().latin1() )); |
187 | if( Data.Auth.Mode == 1 && Data.Auth.PCEMode != 0 ) { | 187 | if( Data.Auth.Mode == 1 && Data.Auth.PCEMode != 0 ) { |
188 | // used for both EAP and Chap | 188 | // used for both EAP and Chap |
189 | SF << "# secrets for " | 189 | SF << "# secrets for " |
190 | << connection()->name().latin1() | 190 | << networkSetup()->name().latin1() |
191 | << endl; | 191 | << endl; |
192 | SF << Data.Auth.Client | 192 | SF << Data.Auth.Client |
193 | << " " | 193 | << " " |
194 | << Data.Auth.Server | 194 | << Data.Auth.Server |
@@ -196,9 +196,9 @@ short APPP::generateFile( SystemFile & SF, long DevNr ) { | |||
196 | << Data.Auth.Secret | 196 | << Data.Auth.Secret |
197 | << endl; | 197 | << endl; |
198 | 198 | ||
199 | rvl = 0; | 199 | rvl = 0; |
200 | rvd = connection()->getToplevel()->generateFileEmbedded( | 200 | rvd = networkSetup()->getToplevel()->generateFileEmbedded( |
201 | SF, DevNr ); | 201 | SF, DevNr ); |
202 | } | 202 | } |
203 | } else if ( SF.name() == "peers" ) { | 203 | } else if ( SF.name() == "peers" ) { |
204 | 204 | ||
@@ -220,14 +220,14 @@ short APPP::generateFile( SystemFile & SF, long DevNr ) { | |||
220 | << endl; | 220 | << endl; |
221 | 221 | ||
222 | // insert other data here | 222 | // insert other data here |
223 | rvl = 0; | 223 | rvl = 0; |
224 | rvd = connection()->getToplevel()->generateFileEmbedded( | 224 | rvd = networkSetup()->getToplevel()->generateFileEmbedded( |
225 | SF, DevNr ); | 225 | SF, DevNr ); |
226 | } else if ( SF.name() == "chatscripts" ) { | 226 | } else if ( SF.name() == "chatscripts" ) { |
227 | Log(("Generate PPP for %s\n", SF.name().latin1() )); | 227 | Log(("Generate PPP for %s\n", SF.name().latin1() )); |
228 | rvl = 0; | 228 | rvl = 0; |
229 | rvd = connection()->getToplevel()->generateFileEmbedded( | 229 | rvd = networkSetup()->getToplevel()->generateFileEmbedded( |
230 | SF, DevNr ); | 230 | SF, DevNr ); |
231 | } | 231 | } |
232 | 232 | ||
233 | return (rvd == 2 || rvl == 2 ) ? 2 : | 233 | return (rvd == 2 || rvl == 2 ) ? 2 : |
diff --git a/noncore/settings/networksettings2/ppp/ppprun.cpp b/noncore/settings/networksettings2/ppp/ppprun.cpp index 8403e6d..f548483 100644 --- a/noncore/settings/networksettings2/ppp/ppprun.cpp +++ b/noncore/settings/networksettings2/ppp/ppprun.cpp | |||
@@ -12,9 +12,9 @@ State_t PPPRun::detectState( void ) { | |||
12 | } | 12 | } |
13 | return Off; | 13 | return Off; |
14 | } | 14 | } |
15 | 15 | ||
16 | QString PPPRun::setMyState( NodeCollection * NC, Action_t A, bool ) { | 16 | QString PPPRun::setMyState( NetworkSetup * , Action_t , bool ) { |
17 | return QString(); | 17 | return QString(); |
18 | } | 18 | } |
19 | 19 | ||
20 | bool PPPRun::isMyPPPDRunning( void ) { | 20 | bool PPPRun::isMyPPPDRunning( void ) { |
@@ -33,9 +33,9 @@ bool PPPRun::isMyPPPUp( void ) { | |||
33 | if( R.match( Run->Name ) >= 0 && | 33 | if( R.match( Run->Name ) >= 0 && |
34 | Run->IsPointToPoint | 34 | Run->IsPointToPoint |
35 | ) { | 35 | ) { |
36 | // this is a LAN card | 36 | // this is a LAN card |
37 | if( Run->assignedConnection() == netNode()->connection() ) { | 37 | if( Run->assignedToNetworkSetup() == netNode()->networkSetup() ) { |
38 | // assigned to us | 38 | // assigned to us |
39 | return 1; | 39 | return 1; |
40 | } | 40 | } |
41 | } | 41 | } |
diff --git a/noncore/settings/networksettings2/ppp/ppprun.h b/noncore/settings/networksettings2/ppp/ppprun.h index 2990a96..9535382 100644 --- a/noncore/settings/networksettings2/ppp/ppprun.h +++ b/noncore/settings/networksettings2/ppp/ppprun.h | |||
@@ -22,9 +22,9 @@ public : | |||
22 | { return this; } | 22 | { return this; } |
23 | 23 | ||
24 | protected : | 24 | protected : |
25 | 25 | ||
26 | QString setMyState( NodeCollection * , Action_t, bool ); | 26 | QString setMyState( NetworkSetup * , Action_t, bool ); |
27 | 27 | ||
28 | private : | 28 | private : |
29 | 29 | ||
30 | bool isMyPPPDRunning( void ); | 30 | bool isMyPPPDRunning( void ); |
diff --git a/noncore/settings/networksettings2/profile/profile_NN.cpp b/noncore/settings/networksettings2/profile/profile_NN.cpp index 1e6912e..007f4a5 100644 --- a/noncore/settings/networksettings2/profile/profile_NN.cpp +++ b/noncore/settings/networksettings2/profile/profile_NN.cpp | |||
@@ -4,9 +4,9 @@ | |||
4 | 4 | ||
5 | #include "netnodeinterface.h" | 5 | #include "netnodeinterface.h" |
6 | 6 | ||
7 | static const char * ProfileNeeds[] = | 7 | static const char * ProfileNeeds[] = |
8 | { "connection", | 8 | { "NetworkSetup", |
9 | 0 | 9 | 0 |
10 | }; | 10 | }; |
11 | static const char * ProfileProvides[] = | 11 | static const char * ProfileProvides[] = |
12 | { "fullsetup", | 12 | { "fullsetup", |
@@ -15,9 +15,9 @@ static const char * ProfileProvides[] = | |||
15 | 15 | ||
16 | /** | 16 | /** |
17 | * Constructor, find all of the possible interfaces | 17 | * Constructor, find all of the possible interfaces |
18 | */ | 18 | */ |
19 | ProfileNetNode::ProfileNetNode() : ANetNode( tr("Regular connection profile")) { | 19 | ProfileNetNode::ProfileNetNode() : ANetNode( tr("Regular NetworkSetup profile")) { |
20 | 20 | ||
21 | NSResources->addSystemFile( | 21 | NSResources->addSystemFile( |
22 | "interfaces", "/etc/network/interfaces", 1 ); | 22 | "interfaces", "/etc/network/interfaces", 1 ); |
23 | 23 | ||
@@ -30,10 +30,10 @@ ProfileNetNode::~ProfileNetNode(){ | |||
30 | } | 30 | } |
31 | 31 | ||
32 | const QString ProfileNetNode::nodeDescription(){ | 32 | const QString ProfileNetNode::nodeDescription(){ |
33 | return tr("\ | 33 | return tr("\ |
34 | <p>Define use of an IP connection.</p>\ | 34 | <p>Define use of an IP NetworkSetup.</p>\ |
35 | <p>Configure if and when this connection needs to be established</p>\ | 35 | <p>Configure if and when this NetworkSetup needs to be established</p>\ |
36 | " | 36 | " |
37 | ); | 37 | ); |
38 | } | 38 | } |
39 | 39 | ||
diff --git a/noncore/settings/networksettings2/profile/profiledata.h b/noncore/settings/networksettings2/profile/profiledata.h index c9577e5..2f7060d 100644 --- a/noncore/settings/networksettings2/profile/profiledata.h +++ b/noncore/settings/networksettings2/profile/profiledata.h | |||
@@ -8,9 +8,9 @@ public : | |||
8 | // start up automatically | 8 | // start up automatically |
9 | bool Automatic; | 9 | bool Automatic; |
10 | // if started up automatically, ask user for confirmation | 10 | // if started up automatically, ask user for confirmation |
11 | bool Confirm; | 11 | bool Confirm; |
12 | // Do not bring this connection up | 12 | // Do not bring this networkSetup up |
13 | bool Disabled; | 13 | bool Disabled; |
14 | bool TriggerVPN; | 14 | bool TriggerVPN; |
15 | } ; | 15 | } ; |
16 | 16 | ||
diff --git a/noncore/settings/networksettings2/profile/profileedit.cpp b/noncore/settings/networksettings2/profile/profileedit.cpp index 88aab15..ad943fe 100644 --- a/noncore/settings/networksettings2/profile/profileedit.cpp +++ b/noncore/settings/networksettings2/profile/profileedit.cpp | |||
@@ -13,11 +13,15 @@ | |||
13 | ProfileEdit::ProfileEdit( QWidget * Parent, ANetNodeInstance * TNNI ) : | 13 | ProfileEdit::ProfileEdit( QWidget * Parent, ANetNodeInstance * TNNI ) : |
14 | ProfileGUI( Parent ), RefreshTimer(this) { | 14 | ProfileGUI( Parent ), RefreshTimer(this) { |
15 | InterfaceInfo * II; | 15 | InterfaceInfo * II; |
16 | 16 | ||
17 | II = TNNI->networkSetup()->assignedInterface(); | ||
18 | Log(( "Interface %p %p %p: %d\n", II, | ||
19 | TNNI, TNNI->networkSetup(), (II) ? II->IsUp : 0 )); | ||
20 | |||
17 | NNI = TNNI; | 21 | NNI = TNNI; |
18 | Dev = NNI->runtime()->device(); | 22 | Dev = NNI->runtime()->device(); |
19 | if( ( II = NNI->connection()->assignedInterface() ) ) { | 23 | if( ( II = NNI->networkSetup()->assignedInterface() ) ) { |
20 | 24 | ||
21 | Refresh_CB->setEnabled( TRUE ); | 25 | Refresh_CB->setEnabled( TRUE ); |
22 | Snd_GB->setEnabled( TRUE ); | 26 | Snd_GB->setEnabled( TRUE ); |
23 | Rcv_GB->setEnabled( TRUE ); | 27 | Rcv_GB->setEnabled( TRUE ); |
@@ -76,9 +80,9 @@ bool ProfileEdit::commit( ProfileData & Data ) { | |||
76 | return SM; | 80 | return SM; |
77 | } | 81 | } |
78 | 82 | ||
79 | void ProfileEdit::SLOT_Refresh( void ) { | 83 | void ProfileEdit::SLOT_Refresh( void ) { |
80 | InterfaceInfo * II = NNI->connection()->assignedInterface(); | 84 | InterfaceInfo * II = NNI->networkSetup()->assignedInterface(); |
81 | NSResources->system().refreshStatistics( *II ); | 85 | NSResources->system().refreshStatistics( *II ); |
82 | RcvBytes_LBL->setText( II->RcvBytes ); | 86 | RcvBytes_LBL->setText( II->RcvBytes ); |
83 | SndBytes_LBL->setText( II->SndBytes ); | 87 | SndBytes_LBL->setText( II->SndBytes ); |
84 | RcvErrors_LBL->setText( II->RcvErrors ); | 88 | RcvErrors_LBL->setText( II->RcvErrors ); |
diff --git a/noncore/settings/networksettings2/profile/profilerun.cpp b/noncore/settings/networksettings2/profile/profilerun.cpp index acb67bd..48011ea 100644 --- a/noncore/settings/networksettings2/profile/profilerun.cpp +++ b/noncore/settings/networksettings2/profile/profilerun.cpp | |||
@@ -2,15 +2,19 @@ | |||
2 | 2 | ||
3 | #include "profilerun.h" | 3 | #include "profilerun.h" |
4 | 4 | ||
5 | State_t ProfileRun::detectState( void ) { | 5 | State_t ProfileRun::detectState( void ) { |
6 | InterfaceInfo * II = networkSetup()->assignedInterface(); | ||
7 | |||
8 | Log(( "Interface %p %p %p: %d\n", II, | ||
9 | netNode(), netNode()->networkSetup(), (II) ? II->IsUp : 0 )); | ||
6 | if( Data->Disabled ) { | 10 | if( Data->Disabled ) { |
7 | return Disabled; | 11 | return Disabled; |
8 | } | 12 | } |
9 | return Unknown; | 13 | return Unknown; |
10 | } | 14 | } |
11 | 15 | ||
12 | QString ProfileRun::setMyState( NodeCollection * NC, Action_t A, bool ) { | 16 | QString ProfileRun::setMyState( NetworkSetup * NC, Action_t A, bool ) { |
13 | odebug << "Profile " << Data->Disabled << oendl; | 17 | odebug << "Profile " << Data->Disabled << oendl; |
14 | if( A == Disable ) { | 18 | if( A == Disable ) { |
15 | if( ! Data->Disabled ) { | 19 | if( ! Data->Disabled ) { |
16 | Data->Disabled = 1; | 20 | Data->Disabled = 1; |
diff --git a/noncore/settings/networksettings2/profile/profilerun.h b/noncore/settings/networksettings2/profile/profilerun.h index 2d48b15..9470c0f 100644 --- a/noncore/settings/networksettings2/profile/profilerun.h +++ b/noncore/settings/networksettings2/profile/profilerun.h | |||
@@ -22,9 +22,9 @@ public : | |||
22 | State_t detectState( void ); | 22 | State_t detectState( void ); |
23 | 23 | ||
24 | protected : | 24 | protected : |
25 | 25 | ||
26 | QString setMyState( NodeCollection * , Action_t, bool ); | 26 | QString setMyState( NetworkSetup * , Action_t, bool ); |
27 | 27 | ||
28 | private : | 28 | private : |
29 | 29 | ||
30 | ProfileData * Data; | 30 | ProfileData * Data; |
diff --git a/noncore/settings/networksettings2/usb/usb_NN.cpp b/noncore/settings/networksettings2/usb/usb_NN.cpp index 6d90ae0..6e2597c 100644 --- a/noncore/settings/networksettings2/usb/usb_NN.cpp +++ b/noncore/settings/networksettings2/usb/usb_NN.cpp | |||
@@ -29,9 +29,9 @@ USBNetNode::~USBNetNode(){ | |||
29 | 29 | ||
30 | const QString USBNetNode::nodeDescription(){ | 30 | const QString USBNetNode::nodeDescription(){ |
31 | return tr("\ | 31 | return tr("\ |
32 | <p>Configure Ethernet over USB.</p>\ | 32 | <p>Configure Ethernet over USB.</p>\ |
33 | <p>Use this for a computer to computer USB cable connection</p>\ | 33 | <p>Use this for a computer to computer USB cable NetworkSetup</p>\ |
34 | " | 34 | " |
35 | ); | 35 | ); |
36 | } | 36 | } |
37 | 37 | ||
diff --git a/noncore/settings/networksettings2/usb/usbrun.cpp b/noncore/settings/networksettings2/usb/usbrun.cpp index 763644e..4082f7f 100644 --- a/noncore/settings/networksettings2/usb/usbrun.cpp +++ b/noncore/settings/networksettings2/usb/usbrun.cpp | |||
@@ -9,9 +9,9 @@ State_t USBRun::detectState( void ) { | |||
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" ).arg(NC->number()); | 14 | QString S = QString( "/tmp/profile-%1.up" ).arg(NC->number()); |
15 | System & Sys = NSResources->system(); | 15 | System & Sys = NSResources->system(); |
16 | InterfaceInfo * Run; | 16 | InterfaceInfo * Run; |
17 | QFile F( S ); | 17 | QFile F( S ); |
@@ -60,9 +60,9 @@ State_t USBRun::detectState( void ) { | |||
60 | 60 | ||
61 | return Unavailable; | 61 | return Unavailable; |
62 | } | 62 | } |
63 | 63 | ||
64 | QString USBRun::setMyState( NodeCollection * NC, Action_t A, bool ) { | 64 | QString USBRun::setMyState( NetworkSetup * NC, Action_t, bool ) { |
65 | 65 | ||
66 | InterfaceInfo * I = getInterface(); | 66 | InterfaceInfo * I = getInterface(); |
67 | 67 | ||
68 | if( ! I ) { | 68 | if( ! I ) { |
@@ -96,13 +96,13 @@ InterfaceInfo * USBRun::getInterface( void ) { | |||
96 | if( handlesInterface( Run->Name ) && | 96 | if( handlesInterface( Run->Name ) && |
97 | Run->CardType == ARPHRD_ETHER | 97 | Run->CardType == ARPHRD_ETHER |
98 | ) { | 98 | ) { |
99 | // this is a USB card | 99 | // this is a USB card |
100 | if( Run->assignedConnection() == netNode()->connection() ) { | 100 | if( Run->assignedToNetworkSetup() == netNode()->networkSetup() ) { |
101 | // assigned to us | 101 | // assigned to us |
102 | return Run; | 102 | return Run; |
103 | } else if( ! Run->IsUp && | 103 | } else if( ! Run->IsUp && |
104 | Run->assignedConnection() == 0 ) { | 104 | Run->assignedToNetworkSetup() == 0 ) { |
105 | // free | 105 | // free |
106 | best = Run; | 106 | best = Run; |
107 | } // UP or not assigned to us | 107 | } // UP or not assigned to us |
108 | } | 108 | } |
diff --git a/noncore/settings/networksettings2/usb/usbrun.h b/noncore/settings/networksettings2/usb/usbrun.h index 6ce4fa2..0872f3d 100644 --- a/noncore/settings/networksettings2/usb/usbrun.h +++ b/noncore/settings/networksettings2/usb/usbrun.h | |||
@@ -24,9 +24,9 @@ public : | |||
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 ); |
diff --git a/noncore/settings/networksettings2/vpn/vpn_NN.cpp b/noncore/settings/networksettings2/vpn/vpn_NN.cpp index 96e9df2..7c2e77b 100644 --- a/noncore/settings/networksettings2/vpn/vpn_NN.cpp +++ b/noncore/settings/networksettings2/vpn/vpn_NN.cpp | |||
@@ -7,15 +7,15 @@ static const char * VPNNeeds[] = | |||
7 | { 0 | 7 | { 0 |
8 | }; | 8 | }; |
9 | 9 | ||
10 | static const char * VPNProvides[] = | 10 | static const char * VPNProvides[] = |
11 | { "connection", | 11 | { "NetworkSetup", |
12 | 0 | 12 | 0 |
13 | }; | 13 | }; |
14 | /** | 14 | /** |
15 | * Constructor, find all of the possible interfaces | 15 | * Constructor, find all of the possible interfaces |
16 | */ | 16 | */ |
17 | VPNNetNode::VPNNetNode() : ANetNode(tr("VPN Connection")) { | 17 | VPNNetNode::VPNNetNode() : ANetNode(tr("VPN NetworkSetup")) { |
18 | } | 18 | } |
19 | 19 | ||
20 | /** | 20 | /** |
21 | * Delete any interfaces that we own. | 21 | * Delete any interfaces that we own. |
@@ -24,9 +24,9 @@ VPNNetNode::~VPNNetNode(){ | |||
24 | } | 24 | } |
25 | 25 | ||
26 | const QString VPNNetNode::nodeDescription(){ | 26 | const QString VPNNetNode::nodeDescription(){ |
27 | return tr("\ | 27 | return tr("\ |
28 | <p>Configure private IP connection.</p>\ | 28 | <p>Configure private IP NetworkSetup.</p>\ |
29 | <p>Defines Secure tunnels over non secure IP sessions</p>\ | 29 | <p>Defines Secure tunnels over non secure IP sessions</p>\ |
30 | " | 30 | " |
31 | ); | 31 | ); |
32 | } | 32 | } |
diff --git a/noncore/settings/networksettings2/vpn/vpnrun.h b/noncore/settings/networksettings2/vpn/vpnrun.h index 9a55625..e40aa87 100644 --- a/noncore/settings/networksettings2/vpn/vpnrun.h +++ b/noncore/settings/networksettings2/vpn/vpnrun.h | |||
@@ -19,9 +19,9 @@ public : | |||
19 | { return Unknown; } | 19 | { return Unknown; } |
20 | 20 | ||
21 | protected : | 21 | protected : |
22 | 22 | ||
23 | QString setMyState( NodeCollection * , Action_t, bool ) | 23 | QString setMyState( NetworkSetup * , Action_t, bool ) |
24 | { return QString(); } | 24 | { return QString(); } |
25 | }; | 25 | }; |
26 | 26 | ||
27 | #endif | 27 | #endif |
diff --git a/noncore/settings/networksettings2/wlan/wlanedit.cpp b/noncore/settings/networksettings2/wlan/wlanedit.cpp index 74174bf..73c0c7c 100644 --- a/noncore/settings/networksettings2/wlan/wlanedit.cpp +++ b/noncore/settings/networksettings2/wlan/wlanedit.cpp | |||
@@ -19,9 +19,9 @@ WLanEdit::WLanEdit( QWidget * Parent, ANetNodeInstance * TNNI ) : | |||
19 | 19 | ||
20 | NNI = TNNI; | 20 | NNI = TNNI; |
21 | Dev = NNI->runtime()->device(); | 21 | Dev = NNI->runtime()->device(); |
22 | WE = 0; | 22 | WE = 0; |
23 | if( ( II = NNI->connection()->assignedInterface() ) ) { | 23 | if( ( II = NNI->networkSetup()->assignedInterface() ) ) { |
24 | // show data | 24 | // show data |
25 | WE = new WExtensions( II->Name ); | 25 | WE = new WExtensions( II->Name ); |
26 | 26 | ||
27 | if( WE->doesHaveWirelessExtensions() ) { | 27 | if( WE->doesHaveWirelessExtensions() ) { |
diff --git a/noncore/settings/networksettings2/wlan/wlanrun.cpp b/noncore/settings/networksettings2/wlan/wlanrun.cpp index b15a560..a0c5884 100644 --- a/noncore/settings/networksettings2/wlan/wlanrun.cpp +++ b/noncore/settings/networksettings2/wlan/wlanrun.cpp | |||
@@ -10,9 +10,9 @@ State_t WLanRun::detectState( void ) { | |||
10 | // unavailable : no card found | 10 | // unavailable : no card found |
11 | // available : card found and assigned to us or free | 11 | // available : card found and assigned to us or free |
12 | // up : card found and assigned to us and up | 12 | // up : card found and assigned to us and up |
13 | 13 | ||
14 | NodeCollection * NC = nodeCollection(); | 14 | NetworkSetup * NC = networkSetup(); |
15 | QString S = QString( "/tmp/profile-%1.up" ).arg(NC->number()); | 15 | QString S = QString( "/tmp/profile-%1.up" ).arg(NC->number()); |
16 | System & Sys = NSResources->system(); | 16 | System & Sys = NSResources->system(); |
17 | InterfaceInfo * Run; | 17 | InterfaceInfo * Run; |
18 | 18 | ||
@@ -69,9 +69,9 @@ State_t WLanRun::detectState( void ) { | |||
69 | return Unavailable; | 69 | return Unavailable; |
70 | 70 | ||
71 | } | 71 | } |
72 | 72 | ||
73 | QString WLanRun::setMyState( NodeCollection * , Action_t , bool ) { | 73 | QString WLanRun::setMyState( NetworkSetup * , Action_t , bool ) { |
74 | 74 | ||
75 | // we only handle activate and deactivate | 75 | // we only handle activate and deactivate |
76 | return QString(); | 76 | return QString(); |
77 | } | 77 | } |
@@ -93,12 +93,12 @@ InterfaceInfo * WLanRun::getInterface( void ) { | |||
93 | #endif | 93 | #endif |
94 | ) | 94 | ) |
95 | ) { | 95 | ) { |
96 | // this is a LAN card | 96 | // this is a LAN card |
97 | if( Run->assignedConnection() == netNode()->connection() ) { | 97 | if( Run->assignedToNetworkSetup() == netNode()->networkSetup() ) { |
98 | // assigned to us | 98 | // assigned to us |
99 | return Run; | 99 | return Run; |
100 | } else if( Run->assignedConnection() == 0 ) { | 100 | } else if( Run->assignedToNetworkSetup() == 0 ) { |
101 | // free | 101 | // free |
102 | best = Run; | 102 | best = Run; |
103 | } | 103 | } |
104 | } | 104 | } |
diff --git a/noncore/settings/networksettings2/wlan/wlanrun.h b/noncore/settings/networksettings2/wlan/wlanrun.h index fd325d4..e3e7735 100644 --- a/noncore/settings/networksettings2/wlan/wlanrun.h +++ b/noncore/settings/networksettings2/wlan/wlanrun.h | |||
@@ -23,9 +23,9 @@ public : | |||
23 | State_t detectState( void ); | 23 | State_t detectState( void ); |
24 | 24 | ||
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 : |
30 | 30 | ||
31 | InterfaceInfo * getInterface( void ); | 31 | InterfaceInfo * getInterface( void ); |