author | zecke <zecke> | 2004-10-10 15:15:06 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-10-10 15:15:06 (UTC) |
commit | 44f716e0f0aaf35869558a805e0fa7791996897a (patch) (unidiff) | |
tree | b050c5bb0ebb1739e1d28d8d7ba365005de831bf /noncore/apps | |
parent | fc76111d51817116376eeb417bd83fbf4e0b77f1 (diff) | |
download | opie-44f716e0f0aaf35869558a805e0fa7791996897a.zip opie-44f716e0f0aaf35869558a805e0fa7791996897a.tar.gz opie-44f716e0f0aaf35869558a805e0fa7791996897a.tar.bz2 |
FixIt doesn't have any signals and slots so don't make it a QObject
this fixes linking of it.
Logger: Add new lines to fix compiler warnings
-rw-r--r-- | noncore/apps/opie-console/fixit.cpp | 3 | ||||
-rw-r--r-- | noncore/apps/opie-console/fixit.h | 6 | ||||
-rw-r--r-- | noncore/apps/opie-console/logger.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/opie-console/logger.h | 2 |
4 files changed, 3 insertions, 10 deletions
diff --git a/noncore/apps/opie-console/fixit.cpp b/noncore/apps/opie-console/fixit.cpp index c14e35e..5ac7673 100644 --- a/noncore/apps/opie-console/fixit.cpp +++ b/noncore/apps/opie-console/fixit.cpp | |||
@@ -2,99 +2,96 @@ | |||
2 | #include "fixit.h" | 2 | #include "fixit.h" |
3 | 3 | ||
4 | using namespace Opie::Core; | 4 | using namespace Opie::Core; |
5 | 5 | ||
6 | #ifdef FSCKED_DISTRI | 6 | #ifdef FSCKED_DISTRI |
7 | FixIt::FixIt() : QObject() { | 7 | FixIt::FixIt() : QObject() { |
8 | /* the new inittab */ | 8 | /* the new inittab */ |
9 | m_file = "#\n# /etc/inittab" | 9 | m_file = "#\n# /etc/inittab" |
10 | "#" | 10 | "#" |
11 | "" | 11 | "" |
12 | "# 0 - halt (Do NOT set initdefault to this)" | 12 | "# 0 - halt (Do NOT set initdefault to this)" |
13 | "# 1 - Single user mode" | 13 | "# 1 - Single user mode" |
14 | "# 2 - Multiuser, without NFS (The same as 3, if you do not have networking)" | 14 | "# 2 - Multiuser, without NFS (The same as 3, if you do not have networking)" |
15 | "# 3 - Full multiuser mode" | 15 | "# 3 - Full multiuser mode" |
16 | "# 4 - JavaVM(Intent) developer mode" | 16 | "# 4 - JavaVM(Intent) developer mode" |
17 | "# 5 - JavaVM(Intent)" | 17 | "# 5 - JavaVM(Intent)" |
18 | "# 6 - reboot (Do NOT set initdefault to this)" | 18 | "# 6 - reboot (Do NOT set initdefault to this)" |
19 | "#" | 19 | "#" |
20 | "id:5:initdefault:" | 20 | "id:5:initdefault:" |
21 | "" | 21 | "" |
22 | "# Specify things to do when starting" | 22 | "# Specify things to do when starting" |
23 | "si::sysinit:/etc/rc.d/rc.sysinit" | 23 | "si::sysinit:/etc/rc.d/rc.sysinit" |
24 | "" | 24 | "" |
25 | "l0:0:wait:/root/etc/rc.d/rc 0" | 25 | "l0:0:wait:/root/etc/rc.d/rc 0" |
26 | "l1:1:wait:/etc/rc.d/rc 1" | 26 | "l1:1:wait:/etc/rc.d/rc 1" |
27 | "l2:2:wait:/etc/rc.d/rc 2" | 27 | "l2:2:wait:/etc/rc.d/rc 2" |
28 | "l3:3:wait:/etc/rc.d/rc 3" | 28 | "l3:3:wait:/etc/rc.d/rc 3" |
29 | "l4:4:wait:/etc/rc.d/rc 4" | 29 | "l4:4:wait:/etc/rc.d/rc 4" |
30 | "l5:5:wait:/etc/rc.d/rc 5" | 30 | "l5:5:wait:/etc/rc.d/rc 5" |
31 | "l6:6:wait:/root/etc/rc.d/rc 6" | 31 | "l6:6:wait:/root/etc/rc.d/rc 6" |
32 | "" | 32 | "" |
33 | "# Specify things to do before rebooting" | 33 | "# Specify things to do before rebooting" |
34 | "um::ctrlaltdel:/bin/umount -a -r > /dev/null 2>&1" | 34 | "um::ctrlaltdel:/bin/umount -a -r > /dev/null 2>&1" |
35 | "sw::ctrlaltdel:/sbin/swapoff -a > /dev/null 2>&1" | 35 | "sw::ctrlaltdel:/sbin/swapoff -a > /dev/null 2>&1" |
36 | "" | 36 | "" |
37 | "# Specify program to run on ttyS0" | 37 | "# Specify program to run on ttyS0" |
38 | "s0:24:respawn:/sbin/getty 9600 ttyS0" | 38 | "s0:24:respawn:/sbin/getty 9600 ttyS0" |
39 | "#pd:5:respawn:/etc/sync/serialctl" | 39 | "#pd:5:respawn:/etc/sync/serialctl" |
40 | "" | 40 | "" |
41 | "# Specify program to run on tty1" | 41 | "# Specify program to run on tty1" |
42 | "1:2:respawn:/sbin/getty 9600 tty1" | 42 | "1:2:respawn:/sbin/getty 9600 tty1" |
43 | "ln:345:respawn:survive -l 6 /sbin/launch" | 43 | "ln:345:respawn:survive -l 6 /sbin/launch" |
44 | "#qt:5:respawn:/sbin/qt" | 44 | "#qt:5:respawn:/sbin/qt" |
45 | "" | 45 | "" |
46 | "# collie sp." | 46 | "# collie sp." |
47 | "sy::respawn:/sbin/shsync\n"; | 47 | "sy::respawn:/sbin/shsync\n"; |
48 | } | 48 | } |
49 | 49 | ||
50 | FixIt::~FixIt() { | ||
51 | } | ||
52 | |||
53 | /* | 50 | /* |
54 | * the retail Zaurus is broken in many ways | 51 | * the retail Zaurus is broken in many ways |
55 | * one is that pppd is listening on our port... | 52 | * one is that pppd is listening on our port... |
56 | * we've to stop it from that and then do kill(SIGHUP,1); | 53 | * we've to stop it from that and then do kill(SIGHUP,1); |
57 | */ | 54 | */ |
58 | void FixIt::fixIt() { | 55 | void FixIt::fixIt() { |
59 | #ifndef EAST | 56 | #ifndef EAST |
60 | ::rename("/etc/inittab", QPEApplication::qpeDir() + "/etc/inittab" ); | 57 | ::rename("/etc/inittab", QPEApplication::qpeDir() + "/etc/inittab" ); |
61 | QFile file( "/etc/inittab" ); | 58 | QFile file( "/etc/inittab" ); |
62 | if ( file.open(IO_WriteOnly | IO_Raw ) ) { | 59 | if ( file.open(IO_WriteOnly | IO_Raw ) ) { |
63 | file.writeBlock(m_file,strlen(m_file) ); | 60 | file.writeBlock(m_file,strlen(m_file) ); |
64 | } | 61 | } |
65 | file.close(); | 62 | file.close(); |
66 | ::kill( SIGHUP, 1 ); | 63 | ::kill( SIGHUP, 1 ); |
67 | 64 | ||
68 | #else | 65 | #else |
69 | 66 | ||
70 | OProcess m_kill; | 67 | OProcess m_kill; |
71 | m_kill << "sh"; | 68 | m_kill << "sh"; |
72 | m_kill << "-c"; | 69 | m_kill << "-c"; |
73 | m_kill << QString(QPEApplication::qpeDir() + "/share/opie-console/sl6000_embedix_kill_0_1.sh"); | 70 | m_kill << QString(QPEApplication::qpeDir() + "/share/opie-console/sl6000_embedix_kill_0_1.sh"); |
74 | 71 | ||
75 | 72 | ||
76 | if ( !m_kill.start(OProcess::DontCare,OProcess::NoCommunication) ) { | 73 | if ( !m_kill.start(OProcess::DontCare,OProcess::NoCommunication) ) { |
77 | owarn << "could not execute kill script" << oendl; | 74 | owarn << "could not execute kill script" << oendl; |
78 | } else { | 75 | } else { |
79 | Global::statusMessage( tr("Fixing up Embedix")); | 76 | Global::statusMessage( tr("Fixing up Embedix")); |
80 | } | 77 | } |
81 | 78 | ||
82 | #endif | 79 | #endif |
83 | } | 80 | } |
84 | 81 | ||
85 | void FixIt::breakIt() { | 82 | void FixIt::breakIt() { |
86 | #ifdef EAST | 83 | #ifdef EAST |
87 | OProcess m_restart; | 84 | OProcess m_restart; |
88 | m_restart << "sh"; | 85 | m_restart << "sh"; |
89 | m_restart << "-c"; | 86 | m_restart << "-c"; |
90 | m_restart << QString(QPEApplication::qpeDir() + "/share/opie-console/sl6000_embedix_restart_0_1.sh"); | 87 | m_restart << QString(QPEApplication::qpeDir() + "/share/opie-console/sl6000_embedix_restart_0_1.sh"); |
91 | 88 | ||
92 | 89 | ||
93 | if ( !m_restart.start() ) { | 90 | if ( !m_restart.start() ) { |
94 | owarn << "could not execute restart script" << oendl; | 91 | owarn << "could not execute restart script" << oendl; |
95 | } | 92 | } |
96 | 93 | ||
97 | #endif | 94 | #endif |
98 | } | 95 | } |
99 | 96 | ||
100 | 97 | ||
diff --git a/noncore/apps/opie-console/fixit.h b/noncore/apps/opie-console/fixit.h index c9188cf..5328616 100644 --- a/noncore/apps/opie-console/fixit.h +++ b/noncore/apps/opie-console/fixit.h | |||
@@ -1,35 +1,31 @@ | |||
1 | #ifndef FIX_IT_H | 1 | #ifndef FIX_IT_H |
2 | #define FIX_IT_H | 2 | #define FIX_IT_H |
3 | 3 | ||
4 | #include <opie2/oprocess.h> | 4 | #include <opie2/oprocess.h> |
5 | #include <opie2/odebug.h> | 5 | #include <opie2/odebug.h> |
6 | 6 | ||
7 | #include <qpe/global.h> | 7 | #include <qpe/global.h> |
8 | #include <qpe/qpeapplication.h> | 8 | #include <qpe/qpeapplication.h> |
9 | 9 | ||
10 | #include <sys/types.h> | 10 | #include <sys/types.h> |
11 | 11 | ||
12 | #include <stdio.h> | 12 | #include <stdio.h> |
13 | #include <stdlib.h> | 13 | #include <stdlib.h> |
14 | #include <signal.h> | 14 | #include <signal.h> |
15 | 15 | ||
16 | 16 | ||
17 | /* | 17 | /* |
18 | * The Zaurus rom | 18 | * The Zaurus rom |
19 | */ | 19 | */ |
20 | class FixIt : public QObject { | 20 | class FixIt { |
21 | |||
22 | Q_OBJECT | ||
23 | |||
24 | public: | 21 | public: |
25 | FixIt(); | 22 | FixIt(); |
26 | ~FixIt(); | ||
27 | void fixIt(); | 23 | void fixIt(); |
28 | /* no real interested in implementing it */ | 24 | /* no real interested in implementing it */ |
29 | void breakIt(); | 25 | void breakIt(); |
30 | char* m_file; | 26 | char* m_file; |
31 | }; | 27 | }; |
32 | 28 | ||
33 | 29 | ||
34 | #endif | 30 | #endif |
35 | 31 | ||
diff --git a/noncore/apps/opie-console/logger.cpp b/noncore/apps/opie-console/logger.cpp index 56557f3..6620faf 100644 --- a/noncore/apps/opie-console/logger.cpp +++ b/noncore/apps/opie-console/logger.cpp | |||
@@ -1,20 +1,20 @@ | |||
1 | #include <qfile.h> | 1 | #include <qfile.h> |
2 | #include <qtextstream.h> | 2 | #include <qtextstream.h> |
3 | 3 | ||
4 | #include "logger.h" | 4 | #include "logger.h" |
5 | 5 | ||
6 | 6 | ||
7 | Logger::Logger() {} | 7 | Logger::Logger() {} |
8 | 8 | ||
9 | Logger::Logger(const QString fileName) { | 9 | Logger::Logger(const QString fileName) { |
10 | m_file.setName(fileName); | 10 | m_file.setName(fileName); |
11 | m_file.open(IO_ReadWrite); | 11 | m_file.open(IO_ReadWrite); |
12 | } | 12 | } |
13 | 13 | ||
14 | Logger::~Logger() { | 14 | Logger::~Logger() { |
15 | m_file.close(); | 15 | m_file.close(); |
16 | } | 16 | } |
17 | 17 | ||
18 | void Logger::append(QByteArray ar) { | 18 | void Logger::append(QByteArray ar) { |
19 | m_file.writeBlock(ar); | 19 | m_file.writeBlock(ar); |
20 | } \ No newline at end of file | 20 | } |
diff --git a/noncore/apps/opie-console/logger.h b/noncore/apps/opie-console/logger.h index cdc9f68..a2583eb 100644 --- a/noncore/apps/opie-console/logger.h +++ b/noncore/apps/opie-console/logger.h | |||
@@ -1,19 +1,19 @@ | |||
1 | #ifndef CONSOLE_LOGGER_H | 1 | #ifndef CONSOLE_LOGGER_H |
2 | #define CONSOLE_LOGGER_H | 2 | #define CONSOLE_LOGGER_H |
3 | 3 | ||
4 | #include <qstring.h> | 4 | #include <qstring.h> |
5 | #include <qfile.h> | 5 | #include <qfile.h> |
6 | 6 | ||
7 | class Logger { | 7 | class Logger { |
8 | 8 | ||
9 | public: | 9 | public: |
10 | Logger(); | 10 | Logger(); |
11 | Logger(const QString fileName); | 11 | Logger(const QString fileName); |
12 | void append(QByteArray ar); | 12 | void append(QByteArray ar); |
13 | ~Logger(); | 13 | ~Logger(); |
14 | 14 | ||
15 | private: | 15 | private: |
16 | QFile m_file; | 16 | QFile m_file; |
17 | }; | 17 | }; |
18 | 18 | ||
19 | #endif \ No newline at end of file | 19 | #endif |