| -rw-r--r-- | noncore/apps/zsafe/main.cpp | 96 | ||||
| -rw-r--r-- | noncore/apps/zsafe/zsafe.pro | 4 |
2 files changed, 3 insertions, 97 deletions
diff --git a/noncore/apps/zsafe/main.cpp b/noncore/apps/zsafe/main.cpp index 2707730..6dfd455 100644 --- a/noncore/apps/zsafe/main.cpp +++ b/noncore/apps/zsafe/main.cpp @@ -9,32 +9,11 @@ #include "zsafe.h" -#ifndef NO_OPIE /* OPIE */ #include <opie2/odebug.h> -using namespace Opie::Core; -#endif /* QT */ -#ifdef DESKTOP -#include <qapplication.h> -#else -#include <qpe/qpeapplication.h> -#endif - -/* STD */ -#include <stdio.h> -#include <signal.h> - -ZSafe *zs; -#ifdef DESKTOP -QApplication *appl; -#else -QPEApplication *appl; -#endif - -int DeskW; -int DeskH; +#include <opie2/oapplicationfactory.h> void suspend (int signum) { @@ -47,77 +26,6 @@ void resume (int signum) zs->resume(signum); } -int main( int argc, char ** argv ) -{ -#ifndef Q_WS_WIN - // install signal handler -// signal (SIGSTOP, suspend); -#endif - -#ifdef DESKTOP - QApplication a( argc, argv ); -#else - QPEApplication a( argc, argv ); -#endif - appl = &a; -#ifdef DESKTOP - if (argc >= 3) - { -#ifndef Q_WS_WIN - DeskW = atoi(argv[1]); - DeskH = atoi(argv[2]); -#else - int w, h; - sscanf (argv[1], "%d", &w); - sscanf (argv[2], "%d", &h); - DeskW = w; - DeskH = h; -#endif - } - else - { - DeskW = 600; - DeskH = 400; - } -#else - DeskW = a.desktop()->width(); - DeskH = a.desktop()->height(); +OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<ZSafe> ) -#ifndef NO_OPIE - owarn << "Width: " << DeskW << " Height: " << DeskH << oendl; -#endif -#ifdef JPATCH_HDE - // nothings -#else - if (DeskW > 240) - { - DeskW -= 20; - DeskH += 25; -#ifndef NO_OPIE - owarn << "Changed width: " << DeskW << " Height: " << DeskH << oendl; -#endif - } -#endif - -#endif - - ZSafe *mw = new ZSafe( 0, 0, QWidget::WDestructiveClose ); -// ZSafe mw; -// zs = &mw; - zs = mw; - -#ifndef Q_WS_WIN -// signal (SIGCONT, resume); -#endif -#ifdef DESKTOP - a.setMainWidget(mw); - mw->show(); -#else - // a.showMainWidget( &mw ); - a.showMainDocumentWidget( mw ); -#endif - int ret = a.exec(); - - return ret; -} diff --git a/noncore/apps/zsafe/zsafe.pro b/noncore/apps/zsafe/zsafe.pro index 236d11e..e53015d 100644 --- a/noncore/apps/zsafe/zsafe.pro +++ b/noncore/apps/zsafe/zsafe.pro @@ -1,6 +1,4 @@ -TEMPLATE = app -CONFIG = qt warn_on -DESTDIR = $(OPIEDIR)/bin +CONFIG = qt quick-app HEADERS = zsafe.h krc2.h category.h categorylist.h zlistview.h \ scqtfiledlg.h SOURCES = main.cpp zsafe.cpp krc2.cpp category.cpp \ |