Diffstat (limited to 'noncore/settings/networksettings2/ppp/PPPDNSedit.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/settings/networksettings2/ppp/PPPDNSedit.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/noncore/settings/networksettings2/ppp/PPPDNSedit.cpp b/noncore/settings/networksettings2/ppp/PPPDNSedit.cpp index 22f8e59..270f695 100644 --- a/noncore/settings/networksettings2/ppp/PPPDNSedit.cpp +++ b/noncore/settings/networksettings2/ppp/PPPDNSedit.cpp | |||
@@ -2,49 +2,49 @@ | |||
2 | #include <qmessagebox.h> | 2 | #include <qmessagebox.h> |
3 | #include <qlistbox.h> | 3 | #include <qlistbox.h> |
4 | #include <qlineedit.h> | 4 | #include <qlineedit.h> |
5 | #include <qradiobutton.h> | 5 | #include <qradiobutton.h> |
6 | #include <resources.h> | 6 | #include <resources.h> |
7 | #include <GUIUtils.h> | 7 | #include <GUIUtils.h> |
8 | #include "PPPDNSedit.h" | 8 | #include "PPPDNSedit.h" |
9 | 9 | ||
10 | PPPDNSEdit::PPPDNSEdit( QWidget * Parent ) : PPPDNSGUI( Parent ){ | 10 | PPPDNSEdit::PPPDNSEdit( QWidget * Parent ) : PPPDNSGUI( Parent ){ |
11 | 11 | ||
12 | Add_TB->setPixmap( NSResources->getPixmap( "add" ) ); | 12 | Add_TB->setPixmap( NSResources->getPixmap( "add" ) ); |
13 | Remove_TB->setPixmap( NSResources->getPixmap( "remove" ) ); | 13 | Remove_TB->setPixmap( NSResources->getPixmap( "remove" ) ); |
14 | } | 14 | } |
15 | 15 | ||
16 | QString PPPDNSEdit::acceptable( void ) { | 16 | QString PPPDNSEdit::acceptable( void ) { |
17 | if( DNSFixed_RB->isChecked() ) { | 17 | if( DNSFixed_RB->isChecked() ) { |
18 | if( DomainName_LE->text().isEmpty() ) | 18 | if( DomainName_LE->text().isEmpty() ) |
19 | tr("Domainname needed"); | 19 | tr("Domainname needed"); |
20 | if( Servers_LB->count() == 0 ) | 20 | if( Servers_LB->count() == 0 ) |
21 | tr("DNS Servers needed"); | 21 | tr("DNS Servers needed"); |
22 | } | 22 | } |
23 | return QString(); | 23 | return QString(); |
24 | } | 24 | } |
25 | 25 | ||
26 | bool PPPDNSEdit::commit( PPPData_t & D ) { | 26 | bool PPPDNSEdit::commit( PPPData & D ) { |
27 | bool SM = 0; | 27 | bool SM = 0; |
28 | 28 | ||
29 | CBM( D.DNS.ServerAssigned, DNSServerAssigned_RB, SM ); | 29 | CBM( D.DNS.ServerAssigned, DNSServerAssigned_RB, SM ); |
30 | TXTM( D.DNS.DomainName, DomainName_LE, SM ); | 30 | TXTM( D.DNS.DomainName, DomainName_LE, SM ); |
31 | 31 | ||
32 | // new items in old ? | 32 | // new items in old ? |
33 | for ( unsigned i = 0; i < Servers_LB->count(); i++ ) { | 33 | for ( unsigned i = 0; i < Servers_LB->count(); i++ ) { |
34 | QString S; | 34 | QString S; |
35 | bool Found; | 35 | bool Found; |
36 | Found = 0; | 36 | Found = 0; |
37 | S = Servers_LB->text(i); | 37 | S = Servers_LB->text(i); |
38 | for ( unsigned j = 0; j < D.DNS.Servers.size(); j++ ) { | 38 | for ( unsigned j = 0; j < D.DNS.Servers.size(); j++ ) { |
39 | if( *(D.DNS.Servers[i]) == S ) { | 39 | if( *(D.DNS.Servers[i]) == S ) { |
40 | // still in list | 40 | // still in list |
41 | Found = 1; | 41 | Found = 1; |
42 | break; | 42 | break; |
43 | } | 43 | } |
44 | } | 44 | } |
45 | if( ! Found ) { | 45 | if( ! Found ) { |
46 | SM = 1; | 46 | SM = 1; |
47 | D.DNS.Servers.resize( D.DNS.Servers.size()+1 ); | 47 | D.DNS.Servers.resize( D.DNS.Servers.size()+1 ); |
48 | D.DNS.Servers[D.DNS.Servers.size()] = new QString( S ); | 48 | D.DNS.Servers[D.DNS.Servers.size()] = new QString( S ); |
49 | } | 49 | } |
50 | } | 50 | } |
@@ -54,49 +54,49 @@ bool PPPDNSEdit::commit( PPPData_t & D ) { | |||
54 | bool Found; | 54 | bool Found; |
55 | Found = 0; | 55 | Found = 0; |
56 | for ( unsigned i = 0; i < Servers_LB->count(); i++ ) { | 56 | for ( unsigned i = 0; i < Servers_LB->count(); i++ ) { |
57 | if( *(D.DNS.Servers[j]) == Servers_LB->text(i) ) { | 57 | if( *(D.DNS.Servers[j]) == Servers_LB->text(i) ) { |
58 | // still in list | 58 | // still in list |
59 | Found = 1; | 59 | Found = 1; |
60 | break; | 60 | break; |
61 | } | 61 | } |
62 | } | 62 | } |
63 | if( ! Found ) { | 63 | if( ! Found ) { |
64 | // old obsolete | 64 | // old obsolete |
65 | SM = 1; | 65 | SM = 1; |
66 | delete D.DNS.Servers[j]; | 66 | delete D.DNS.Servers[j]; |
67 | for( unsigned i = j+1; i < D.DNS.Servers.size(); i ++ ) { | 67 | for( unsigned i = j+1; i < D.DNS.Servers.size(); i ++ ) { |
68 | // compress array | 68 | // compress array |
69 | D.DNS.Servers[i-1] = D.DNS.Servers[i]; | 69 | D.DNS.Servers[i-1] = D.DNS.Servers[i]; |
70 | } | 70 | } |
71 | // shrink | 71 | // shrink |
72 | D.DNS.Servers.resize( D.DNS.Servers.size()-1 ); | 72 | D.DNS.Servers.resize( D.DNS.Servers.size()-1 ); |
73 | } | 73 | } |
74 | } | 74 | } |
75 | return SM; | 75 | return SM; |
76 | } | 76 | } |
77 | 77 | ||
78 | void PPPDNSEdit::showData( PPPData_t & D) { | 78 | void PPPDNSEdit::showData( PPPData & D) { |
79 | 79 | ||
80 | DNSServerAssigned_RB->setChecked( D.DNS.ServerAssigned ); | 80 | DNSServerAssigned_RB->setChecked( D.DNS.ServerAssigned ); |
81 | 81 | ||
82 | DomainName_LE->setText( D.DNS.DomainName ); | 82 | DomainName_LE->setText( D.DNS.DomainName ); |
83 | for( unsigned i = 0; i < D.DNS.Servers.size(); i ++ ) { | 83 | for( unsigned i = 0; i < D.DNS.Servers.size(); i ++ ) { |
84 | Servers_LB->insertItem( *(D.DNS.Servers[i]) ); | 84 | Servers_LB->insertItem( *(D.DNS.Servers[i]) ); |
85 | } | 85 | } |
86 | } | 86 | } |
87 | 87 | ||
88 | void PPPDNSEdit::SLOT_AddServer( void ) { | 88 | void PPPDNSEdit::SLOT_AddServer( void ) { |
89 | if( ServerAddress_LE->text().isEmpty() ) | 89 | if( ServerAddress_LE->text().isEmpty() ) |
90 | return; | 90 | return; |
91 | 91 | ||
92 | Servers_LB->insertItem( ServerAddress_LE->text() ); | 92 | Servers_LB->insertItem( ServerAddress_LE->text() ); |
93 | ServerAddress_LE->setText( "" ); | 93 | ServerAddress_LE->setText( "" ); |
94 | } | 94 | } |
95 | 95 | ||
96 | void PPPDNSEdit::SLOT_RemoveServer( void ) { | 96 | void PPPDNSEdit::SLOT_RemoveServer( void ) { |
97 | long i = Servers_LB->currentItem(); | 97 | long i = Servers_LB->currentItem(); |
98 | if( i < 0 ) | 98 | if( i < 0 ) |
99 | return; | 99 | return; |
100 | Servers_LB->removeItem( i ); | 100 | Servers_LB->removeItem( i ); |
101 | if( (unsigned) i >= Servers_LB->count() ) { | 101 | if( (unsigned) i >= Servers_LB->count() ) { |
102 | i --; | 102 | i --; |