author | zecke <zecke> | 2004-10-10 15:15:06 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-10-10 15:15:06 (UTC) |
commit | 44f716e0f0aaf35869558a805e0fa7791996897a (patch) (side-by-side diff) | |
tree | b050c5bb0ebb1739e1d28d8d7ba365005de831bf /noncore/apps/opie-console | |
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 | 0 | ||||
-rw-r--r-- | noncore/apps/opie-console/logger.h | 0 |
4 files changed, 1 insertions, 8 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 @@ -26,51 +26,48 @@ FixIt::FixIt() : QObject() { "l1:1:wait:/etc/rc.d/rc 1" "l2:2:wait:/etc/rc.d/rc 2" "l3:3:wait:/etc/rc.d/rc 3" "l4:4:wait:/etc/rc.d/rc 4" "l5:5:wait:/etc/rc.d/rc 5" "l6:6:wait:/root/etc/rc.d/rc 6" "" "# Specify things to do before rebooting" "um::ctrlaltdel:/bin/umount -a -r > /dev/null 2>&1" "sw::ctrlaltdel:/sbin/swapoff -a > /dev/null 2>&1" "" "# Specify program to run on ttyS0" "s0:24:respawn:/sbin/getty 9600 ttyS0" "#pd:5:respawn:/etc/sync/serialctl" "" "# Specify program to run on tty1" "1:2:respawn:/sbin/getty 9600 tty1" "ln:345:respawn:survive -l 6 /sbin/launch" "#qt:5:respawn:/sbin/qt" "" "# collie sp." "sy::respawn:/sbin/shsync\n"; } -FixIt::~FixIt() { -} - /* * the retail Zaurus is broken in many ways * one is that pppd is listening on our port... * we've to stop it from that and then do kill(SIGHUP,1); */ void FixIt::fixIt() { #ifndef EAST ::rename("/etc/inittab", QPEApplication::qpeDir() + "/etc/inittab" ); QFile file( "/etc/inittab" ); if ( file.open(IO_WriteOnly | IO_Raw ) ) { file.writeBlock(m_file,strlen(m_file) ); } file.close(); ::kill( SIGHUP, 1 ); #else OProcess m_kill; m_kill << "sh"; m_kill << "-c"; m_kill << QString(QPEApplication::qpeDir() + "/share/opie-console/sl6000_embedix_kill_0_1.sh"); if ( !m_kill.start(OProcess::DontCare,OProcess::NoCommunication) ) { 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 @@ #ifndef FIX_IT_H #define FIX_IT_H #include <opie2/oprocess.h> #include <opie2/odebug.h> #include <qpe/global.h> #include <qpe/qpeapplication.h> #include <sys/types.h> #include <stdio.h> #include <stdlib.h> #include <signal.h> /* * The Zaurus rom */ -class FixIt : public QObject { - - Q_OBJECT - +class FixIt { public: FixIt(); - ~FixIt(); void fixIt(); /* no real interested in implementing it */ void breakIt(); char* m_file; }; #endif 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 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 |