merge noncore/apps/* except

 - advancedfm (ljp, please...)
 - odict (tille, please...)

9 files changed, 43 insertions, 112 deletions

diff --git a/noncore/settings/aqpkg/.cvsignore b/noncore/settings/aqpkg/.cvsignore
index 2888d4a..4183697 100644
--- a/noncore/settings/aqpkg/.cvsignore
+++ b/noncore/settings/aqpkg/.cvsignore
@@ -2 +2,2 @@ Makefile*
 moc*
+.moc*
diff --git a/noncore/settings/aqpkg/aqpkg.pro b/noncore/settings/aqpkg/aqpkg.pro
index d241d1b..882cfd4 100644
--- a/noncore/settings/aqpkg/aqpkg.pro
+++ b/noncore/settings/aqpkg/aqpkg.pro
@@ -1,3 +1,2 @@
-TEMPLATE	= app
-CONFIG		= qt warn_on release
+CONFIG		= qt warn_on release quick-app
 HEADERS		= global.h \
@@ -34,3 +33,2 @@ SOURCES		= mainwin.cpp \
 		  categoryfilterimpl.cpp
-INTERFACES	= 
 TARGET		= aqpkg
@@ -39,24 +37,4 @@ DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lqpe -lopie -lstdc++
-DESTDIR = $(OPIEDIR)/bin
-
-TRANSLATIONS = ../../../i18n/de/aqpkg.ts \
-	 ../../../i18n/nl/aqpkg.ts \
-         ../../../i18n/xx/aqpkg.ts \
-         ../../../i18n/en/aqpkg.ts \
-         ../../../i18n/es/aqpkg.ts \
-         ../../../i18n/fr/aqpkg.ts \
-         ../../../i18n/hu/aqpkg.ts \
-         ../../../i18n/ja/aqpkg.ts \
-         ../../../i18n/ko/aqpkg.ts \
-         ../../../i18n/no/aqpkg.ts \
-         ../../../i18n/pl/aqpkg.ts \
-         ../../../i18n/pt/aqpkg.ts \
-         ../../../i18n/pt_BR/aqpkg.ts \
-         ../../../i18n/sl/aqpkg.ts \
-         ../../../i18n/zh_CN/aqpkg.ts \
-         ../../../i18n/zh_TW/aqpkg.ts \
-         ../../../i18n/it/aqpkg.ts \
-         ../../../i18n/da/aqpkg.ts
-
 
 include ( $(OPIEDIR)/include.pro )
+
diff --git a/noncore/settings/aqpkg/main.cpp b/noncore/settings/aqpkg/main.cpp
index b7f8b7b..179f8b7 100644
--- a/noncore/settings/aqpkg/main.cpp
+++ b/noncore/settings/aqpkg/main.cpp
@@ -29,16 +29,5 @@
 
-#ifdef QWS
-#include <qpe/qpeapplication.h>
-#include <qpe/qcopenvelope_qws.h>
-#else
-#include <qapplication.h>
-#endif
-
-#include <qobjectdefs.h>
-
 #include "mainwin.h"
-#include "server.h"
-
-#include "global.h"
 
+#include <opie/oapplicationfactory.h>
 
@@ -48,31 +37,2 @@ extern QString LOCAL_IPKGS;
 
-int main(int argc, char *argv[])
-{
-#ifdef QWS
-  QPEApplication a( argc, argv );
-#else
-  QApplication a( argc, argv );
-#endif
-
-#ifdef QWS
-  // Disable suspend mode
-  QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::DisableSuspend;
-#endif
-
-  LOCAL_SERVER = QObject::tr( "Installed packages" );
-  LOCAL_IPKGS = QObject::tr( "Local packages" );
-
-  MainWindow *win = new MainWindow();
-  a.setMainWidget(win);
-  win->showMaximized();
-
-  a.exec();
-
-#ifdef QWS
-  // Reenable suspend mode
-  QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable;
-#endif
- #ifdef _DEBUG
-  DumpUnfreed();
- #endif
-}
+OPIE_EXPORT_APP( OApplicationFactory<MainWindow> )
diff --git a/noncore/settings/aqpkg/mainwin.cpp b/noncore/settings/aqpkg/mainwin.cpp
index 42093cf..dbe694e 100644
--- a/noncore/settings/aqpkg/mainwin.cpp
+++ b/noncore/settings/aqpkg/mainwin.cpp
@@ -2,3 +2,3 @@
                              This file is part of the OPIE Project
-                             
+
                =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
@@ -68,5 +68,11 @@ extern int compareVersions( const char *v1, const char *v2 );
 
-MainWindow :: MainWindow()
-	:	QMainWindow( 0x0, 0x0, WStyle_ContextHelp )
+MainWindow :: MainWindow( QWidget* parent, const char* name, WFlags fl )
+	:	QMainWindow( parent, name, fl || WStyle_ContextHelp )
 {
+    // Disable suspend mode
+    QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::DisableSuspend;
+
+    LOCAL_SERVER = QObject::tr( "Installed packages" );
+    LOCAL_IPKGS = QObject::tr( "Local packages" );
+
     setCaption( tr( "AQPkg - Package Manager" ) );
@@ -236,2 +242,5 @@ MainWindow :: ~MainWindow()
 	delete mgr;
+
+    // Reenable suspend mode
+    QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable;
 }
@@ -1014,3 +1023,2 @@ InstallData *MainWindow :: dealWithItem( QCheckListItem *item )
         newitem->option = "D";
-        
         // If local file, remove using package name, not filename
@@ -1048,3 +1056,2 @@ InstallData *MainWindow :: dealWithItem( QCheckListItem *item )
             newitem->option = "D";
-           
             // If local file, remove using package name, not filename
@@ -1191,5 +1198,5 @@ QuestionDlg::QuestionDlg( const QString &caption, const QString &text, const QSt
     resize( 175, 100 );
-    
+
     QGridLayout *layout = new QGridLayout( this );
-    
+
     QLabel *l = new QLabel( text, this );
@@ -1197,3 +1204,3 @@ QuestionDlg::QuestionDlg( const QString &caption, const QString &text, const QSt
     layout->addMultiCellWidget( l, 0, 0, 0, 1 );
-    
+
     btn1 = new QPushButton( tr( "Remove" ), this );
@@ -1201,3 +1208,3 @@ QuestionDlg::QuestionDlg( const QString &caption, const QString &text, const QSt
     layout->addWidget( btn1, 1, 0 );
-    
+
     btn2 = new QPushButton( secondbtn, this );
@@ -1205,3 +1212,3 @@ QuestionDlg::QuestionDlg( const QString &caption, const QString &text, const QSt
     layout->addWidget( btn2, 1, 1 );
-    
+
     executing = FALSE;
@@ -1218,3 +1225,3 @@ int QuestionDlg::exec()
     }
-    
+
     return buttonpressed;
@@ -1230,3 +1237,3 @@ void QuestionDlg::slotButtonPressed()
         buttonpressed = 0;
-        
+
     qApp->exit_loop();
diff --git a/noncore/settings/aqpkg/mainwin.h b/noncore/settings/aqpkg/mainwin.h
index 615ff8b..b8e1c98 100644
--- a/noncore/settings/aqpkg/mainwin.h
+++ b/noncore/settings/aqpkg/mainwin.h
@@ -53,7 +53,8 @@ class MainWindow :public  QMainWindow
 {
-	Q_OBJECT
+    Q_OBJECT
 public:
 
-	MainWindow();
+	MainWindow( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
 	~MainWindow();
+	static QString appName() { return QString::fromLatin1( "aqpkg" ); };
 
diff --git a/noncore/settings/sysinfo/main.cpp b/noncore/settings/sysinfo/main.cpp
index 6e889db..02b1098 100644
--- a/noncore/settings/sysinfo/main.cpp
+++ b/noncore/settings/sysinfo/main.cpp
@@ -23,12 +23,5 @@
 #include <qpe/qpeapplication.h>
+#include <opie/oapplicationfactory.h>
 
-int main( int argc, char *argv[] )
-{
-    QPEApplication a( argc, argv );
-
-    SystemInfo *si = new SystemInfo();
-    a.showMainWidget( si );
-
-    return a.exec();
-}
 
+OPIE_EXPORT_APP( OApplicationFactory<SystemInfo> )
diff --git a/noncore/settings/sysinfo/storage.cpp b/noncore/settings/sysinfo/storage.cpp
index c4474d5..4ef7122 100644
--- a/noncore/settings/sysinfo/storage.cpp
+++ b/noncore/settings/sysinfo/storage.cpp
@@ -52,3 +52,3 @@ FileSysInfo::FileSysInfo( QWidget *parent, const char *name )
     connect( storage, SIGNAL( disksChanged() ), this, SLOT( disksChanged() ) );
-  
+
     lines.setAutoDelete(TRUE);
@@ -60,2 +60,3 @@ FileSysInfo::FileSysInfo( QWidget *parent, const char *name )
 
+
 void FileSysInfo::timerEvent(QTimerEvent*)
@@ -68,17 +69,8 @@ void FileSysInfo::updateMounts()
     storage->update();
-    
+
     if ( rebuildDisks )
     {
-        // Cannot auto delete QDict<MountInfo> disks because it seems to delete
-        // the filesystem object as well causing a segfault
-        MountInfo *mi; 
-        for ( QDictIterator<MountInfo> delit(disks); delit.current(); ++delit )
-        {
-            mi = delit.current();
-            mi->fs = 0x0;
-            delete mi;
-        }
         disks.clear();
         lines.clear();
-        
+
         delete vb;
@@ -87,3 +79,3 @@ void FileSysInfo::updateMounts()
         bool frst=TRUE;
-    
+
         FileSystem *fs;
@@ -92,3 +84,3 @@ void FileSysInfo::updateMounts()
             fs = it.current();
-        
+
             if ( !frst )
@@ -102,3 +94,3 @@ void FileSysInfo::updateMounts()
             frst = FALSE;
-           
+
             MountInfo *mi = new MountInfo( fs, container );
@@ -128,3 +120,3 @@ void FileSysInfo::updateMounts()
     }
-    
+
     rebuildDisks = FALSE;
@@ -147,3 +139,3 @@ MountInfo::MountInfo( FileSystem *filesys, QWidget *parent, const char *name )
     title = fs->name();
-    
+
     data = new GraphData();
@@ -165,3 +157,2 @@ MountInfo::~MountInfo()
     delete data;
-    delete fs;
 }
diff --git a/noncore/settings/sysinfo/sysinfo.h b/noncore/settings/sysinfo/sysinfo.h
index d69346a..94c3876 100644
--- a/noncore/settings/sysinfo/sysinfo.h
+++ b/noncore/settings/sysinfo/sysinfo.h
@@ -31,2 +31,3 @@ public:
     SystemInfo( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
+    static QString appName() { return QString::fromLatin1("sysinfo"); }
 };
diff --git a/noncore/settings/sysinfo/sysinfo.pro b/noncore/settings/sysinfo/sysinfo.pro
index 2582ea2..2322989 100644
--- a/noncore/settings/sysinfo/sysinfo.pro
+++ b/noncore/settings/sysinfo/sysinfo.pro
@@ -1,4 +1,2 @@
-TEMPLATE  = app
-CONFIG    = qt warn_on release
-DESTDIR   = $(OPIEDIR)/bin
+CONFIG    = qt warn_on release quick-app
 HEADERS   = memory.h \
@@ -22,3 +20,3 @@ SOURCES   = main.cpp \
       sysinfo.cpp
-INTERFACES  = 
+
 INCLUDEPATH += $(OPIEDIR)/include
@@ -26,3 +24,4 @@ DEPENDPATH  += $(OPIEDIR)/include
 LIBS            += -lqpe -lopie
-TARGET    = sysinfo
+
+TARGET	= sysinfo