author | mickeyl <mickeyl> | 2004-05-27 18:28:16 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-05-27 18:28:16 (UTC) |
commit | bcc46fb4eef70c0a7313983c77eaed0b96adb8fd (patch) (unidiff) | |
tree | 4a8d9574341c939f61c6f3caa1f4f40468cb87c6 | |
parent | 9e05044fd18d8940a9c2cc035b70fdec0cbbf34d (diff) | |
download | opie-bcc46fb4eef70c0a7313983c77eaed0b96adb8fd.zip opie-bcc46fb4eef70c0a7313983c77eaed0b96adb8fd.tar.gz opie-bcc46fb4eef70c0a7313983c77eaed0b96adb8fd.tar.bz2 |
compile fix + add .cvsignore
-rw-r--r-- | noncore/settings/networksettings2/.cvsignore | 29 | ||||
-rw-r--r-- | noncore/settings/networksettings2/main.cpp | 3 |
2 files changed, 31 insertions, 1 deletions
diff --git a/noncore/settings/networksettings2/.cvsignore b/noncore/settings/networksettings2/.cvsignore new file mode 100644 index 0000000..e000724 --- a/dev/null +++ b/noncore/settings/networksettings2/.cvsignore | |||
@@ -0,0 +1,29 @@ | |||
1 | *.moc | ||
2 | *.moc.o | ||
3 | *.o | ||
4 | .deps | ||
5 | .libs | ||
6 | .moc.cpp | ||
7 | .moc.o | ||
8 | .o | ||
9 | Makefile* | ||
10 | addconnection.cpp | ||
11 | addconnection.h | ||
12 | interfaceadvanced.cpp | ||
13 | interfaceadvanced.h | ||
14 | interfaceinformation.cpp | ||
15 | interfaceinformation.h | ||
16 | interfacesetup.cpp | ||
17 | interfacesetup.h | ||
18 | mainwindow.cpp | ||
19 | mainwindow.h | ||
20 | moc_*.cpp | ||
21 | networksetup | ||
22 | systemadvanced.cpp | ||
23 | systemadvanced.h | ||
24 | hosts.h | ||
25 | hosts.cpp | ||
26 | vpn.h | ||
27 | vpn.cpp | ||
28 | dns.h | ||
29 | dns.cpp | ||
diff --git a/noncore/settings/networksettings2/main.cpp b/noncore/settings/networksettings2/main.cpp index e2c00f6..30d1270 100644 --- a/noncore/settings/networksettings2/main.cpp +++ b/noncore/settings/networksettings2/main.cpp | |||
@@ -1,55 +1,56 @@ | |||
1 | #include "nsdata.h" | 1 | #include "nsdata.h" |
2 | #include "activateprofile.h" | 2 | #include "activateprofile.h" |
3 | #include "networksettings.h" | 3 | #include "networksettings.h" |
4 | 4 | ||
5 | #include <qpe/qpeapplication.h> | 5 | #include <qpe/qpeapplication.h> |
6 | 6 | ||
7 | #include <opie/oapplicationfactory.h> | 7 | #include <opie2/oapplicationfactory.h> |
8 | using namespace Opie::Core; | ||
8 | 9 | ||
9 | #ifdef GONE | 10 | #ifdef GONE |
10 | 11 | ||
11 | OPIE_EXPORT_APP( OApplicationFactory<NetworkSettings> ) | 12 | OPIE_EXPORT_APP( OApplicationFactory<NetworkSettings> ) |
12 | 13 | ||
13 | #else | 14 | #else |
14 | 15 | ||
15 | // just standard GUI | 16 | // just standard GUI |
16 | #define ACT_GUI 0 | 17 | #define ACT_GUI 0 |
17 | // used by interfaces to request for allow of up/down | 18 | // used by interfaces to request for allow of up/down |
18 | #define ACT_REQUEST 1 | 19 | #define ACT_REQUEST 1 |
19 | // regenerate config files | 20 | // regenerate config files |
20 | #define ACT_REGEN 2 | 21 | #define ACT_REGEN 2 |
21 | // used by interfaces to request user prompt | 22 | // used by interfaces to request user prompt |
22 | #define ACT_PROMPT 3 | 23 | #define ACT_PROMPT 3 |
23 | 24 | ||
24 | int main( int argc, char * argv[] ) { | 25 | int main( int argc, char * argv[] ) { |
25 | int rv = 0; | 26 | int rv = 0; |
26 | int Action = ACT_GUI; | 27 | int Action = ACT_GUI; |
27 | // could be overruled by -qws | 28 | // could be overruled by -qws |
28 | QApplication::Type GuiType = QApplication::GuiClient; | 29 | QApplication::Type GuiType = QApplication::GuiClient; |
29 | 30 | ||
30 | #ifdef _WS_QWS_ | 31 | #ifdef _WS_QWS_ |
31 | QPEApplication * TheApp; | 32 | QPEApplication * TheApp; |
32 | #else | 33 | #else |
33 | QApplication * TheApp; | 34 | QApplication * TheApp; |
34 | #endif | 35 | #endif |
35 | 36 | ||
36 | for ( int i = 1; i < argc; i ++ ) { | 37 | for ( int i = 1; i < argc; i ++ ) { |
37 | int rmv; | 38 | int rmv; |
38 | rmv = 0; | 39 | rmv = 0; |
39 | if( strcmp( argv[i], "--regen" ) == 0 ) { | 40 | if( strcmp( argv[i], "--regen" ) == 0 ) { |
40 | Action = ACT_REGEN; | 41 | Action = ACT_REGEN; |
41 | GuiType = QApplication::Tty; | 42 | GuiType = QApplication::Tty; |
42 | rmv = 1; | 43 | rmv = 1; |
43 | } else if( strcmp( argv[i], "--prompt" ) == 0 ) { | 44 | } else if( strcmp( argv[i], "--prompt" ) == 0 ) { |
44 | Action = ACT_PROMPT; | 45 | Action = ACT_PROMPT; |
45 | rmv = 1; | 46 | rmv = 1; |
46 | } | 47 | } |
47 | if( rmv ) { | 48 | if( rmv ) { |
48 | memmove( argv+i, argv+i+rmv, | 49 | memmove( argv+i, argv+i+rmv, |
49 | sizeof( char * ) * (argc-i-rmv) ); | 50 | sizeof( char * ) * (argc-i-rmv) ); |
50 | i --; | 51 | i --; |
51 | argc -= rmv; | 52 | argc -= rmv; |
52 | } | 53 | } |
53 | } | 54 | } |
54 | 55 | ||
55 | if( strstr( argv[0], "-request" ) ) { | 56 | if( strstr( argv[0], "-request" ) ) { |