summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/appearance2/appearance.cpp4
-rw-r--r--noncore/settings/appearance2/appearance.h3
-rw-r--r--noncore/settings/appearance2/appearance2.pro8
-rw-r--r--noncore/settings/appearance2/main.cpp14
-rw-r--r--noncore/settings/backup/backup.pro7
-rw-r--r--noncore/settings/backup/backuprestore.cpp68
-rw-r--r--noncore/settings/backup/backuprestore.h13
-rw-r--r--noncore/settings/backup/main.cpp10
-rw-r--r--noncore/settings/language/language.pro4
-rw-r--r--noncore/settings/language/main.cpp13
-rw-r--r--noncore/settings/language/settings.h2
-rw-r--r--noncore/settings/mediummount/main.cpp11
-rw-r--r--noncore/settings/mediummount/mainwindow.h1
-rw-r--r--noncore/settings/mediummount/mediummount.pro2
-rw-r--r--noncore/settings/mediummount/mediumwidget.h1
-rw-r--r--noncore/settings/netsystemtime/main.cpp10
-rw-r--r--noncore/settings/netsystemtime/mainwindow.cpp25
-rw-r--r--noncore/settings/netsystemtime/mainwindow.h3
-rw-r--r--noncore/settings/netsystemtime/netsystemtime.pro7
-rw-r--r--noncore/settings/sound/main.cpp10
-rw-r--r--noncore/settings/sound/sound.pro4
-rw-r--r--noncore/settings/sound/soundsettings.h1
-rw-r--r--noncore/settings/sshkeys/opie-sshkeys.control2
-rw-r--r--noncore/settings/usermanager/main.cpp9
-rw-r--r--noncore/settings/usermanager/usermanager.h1
-rw-r--r--noncore/settings/usermanager/usermanager.pro4
26 files changed, 91 insertions, 146 deletions
diff --git a/noncore/settings/appearance2/appearance.cpp b/noncore/settings/appearance2/appearance.cpp
index 00128d3..9e5eede 100644
--- a/noncore/settings/appearance2/appearance.cpp
+++ b/noncore/settings/appearance2/appearance.cpp
@@ -566,6 +566,2 @@ void Appearance::accept ( )
566 566
567 if ( QMessageBox::warning ( this, tr( "Restart" ), tr( "Do you want to restart %1 now?" ). arg ( ODevice::inst ( )-> system ( ) == System_Zaurus ? "Qtopia" : "Opie" ), tr( "Yes" ), tr( "No" ), 0, 0, 1 ) == 0 ) {
568 QCopEnvelope e( "QPE/System", "restart()" );
569 }
570
571 QDialog::accept ( ); 567 QDialog::accept ( );
diff --git a/noncore/settings/appearance2/appearance.h b/noncore/settings/appearance2/appearance.h
index da9e976..51e9636 100644
--- a/noncore/settings/appearance2/appearance.h
+++ b/noncore/settings/appearance2/appearance.h
@@ -57,2 +57,3 @@ public:
57 ~Appearance(); 57 ~Appearance();
58 static QString appName() { return QString::fromLatin1("appearance"); }
58 59
@@ -61,3 +62,3 @@ protected:
61 virtual void done ( int r ); 62 virtual void done ( int r );
62 63
63protected slots: 64protected slots:
diff --git a/noncore/settings/appearance2/appearance2.pro b/noncore/settings/appearance2/appearance2.pro
index e37536d..145de2f 100644
--- a/noncore/settings/appearance2/appearance2.pro
+++ b/noncore/settings/appearance2/appearance2.pro
@@ -1,4 +1,2 @@
1TEMPLATE = app 1CONFIG = qt warn_on release quick-app
2CONFIG = qt warn_on release
3DESTDIR = $(OPIEDIR)/bin
4HEADERS = appearance.h editScheme.h sample.h 2HEADERS = appearance.h editScheme.h sample.h
@@ -8,3 +6,2 @@ DEPENDPATH += ../$(OPIEDIR)/include
8LIBS += -lqpe -lopie 6LIBS += -lqpe -lopie
9TARGET = appearance
10INCLUDEPATH += $(OPIEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
@@ -12,2 +9,4 @@ DEPENDPATH += $(OPIEDIR)/include
12 9
10 TARGET = appearance
11
13TRANSLATIONS = ../../../i18n/de/appearance.ts \ 12TRANSLATIONS = ../../../i18n/de/appearance.ts \
@@ -31,3 +30,2 @@ TRANSLATIONS = ../../../i18n/de/appearance.ts \
31 30
32
33include ( $(OPIEDIR)/include.pro ) 31include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/appearance2/main.cpp b/noncore/settings/appearance2/main.cpp
index ad24cf3..5595429 100644
--- a/noncore/settings/appearance2/main.cpp
+++ b/noncore/settings/appearance2/main.cpp
@@ -17,3 +17,3 @@
17..}^=.=       =       ; Public License for more details. 17..}^=.=       =       ; Public License for more details.
18++=   -.     .`     .: 18++=   -.     .`     .:
19 :     =  ...= . :.=- You should have received a copy of the GNU 19 :     =  ...= . :.=- You should have received a copy of the GNU
@@ -30,13 +30,5 @@
30#include <qpe/qpeapplication.h> 30#include <qpe/qpeapplication.h>
31#include <opie/oapplicationfactory.h>
31 32
32 33
33int main ( int argc, char **argv ) 34OPIE_EXPORT_APP( OApplicationFactory<Appearance> )
34{
35 QPEApplication app ( argc, argv );
36
37 Appearance m;
38 app. showMainDocumentWidget ( &m );
39
40 return app. exec ( );
41}
42
diff --git a/noncore/settings/backup/backup.pro b/noncore/settings/backup/backup.pro
index cadb381..1e9af61 100644
--- a/noncore/settings/backup/backup.pro
+++ b/noncore/settings/backup/backup.pro
@@ -1,4 +1,2 @@
1 TEMPLATE= app 1 CONFIG = qt warn_on release quick-app
2 #CONFIG = qt warn_on debug
3 CONFIG = qt warn_on release
4 HEADERS = backuprestore.h 2 HEADERS = backuprestore.h
@@ -10,3 +8,2 @@ INTERFACES = backuprestorebase.ui errordialog.ui
10 TARGET = backup 8 TARGET = backup
11 DESTDIR = $(OPIEDIR)/bin
12 9
@@ -32,4 +29,2 @@ TRANSLATIONS = ../../../i18n/de/backup.ts \
32 29
33
34
35include ( $(OPIEDIR)/include.pro ) 30include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/backup/backuprestore.cpp b/noncore/settings/backup/backuprestore.cpp
index 922523b..1c854d9 100644
--- a/noncore/settings/backup/backuprestore.cpp
+++ b/noncore/settings/backup/backuprestore.cpp
@@ -39,4 +39,4 @@ const QString tempFileName = "/tmp/backup.err";
39 39
40BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name) 40BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name, WFlags fl)
41 : BackupAndRestoreBase(parent, name){ 41 : BackupAndRestoreBase(parent, name, fl){
42 this->showMaximized(); 42 this->showMaximized();
@@ -49,7 +49,7 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name)
49 connect(backupList, SIGNAL(clicked( QListViewItem * )), 49 connect(backupList, SIGNAL(clicked( QListViewItem * )),
50 this, SLOT(selectItem(QListViewItem*))); 50 this, SLOT(selectItem(QListViewItem*)));
51 connect(restoreSource, SIGNAL(activated( int )), 51 connect(restoreSource, SIGNAL(activated( int )),
52 this, SLOT(sourceDirChanged(int))); 52 this, SLOT(sourceDirChanged(int)));
53 connect(updateList, SIGNAL(clicked()), 53 connect(updateList, SIGNAL(clicked()),
54 this, SLOT( fileListUpdate())); 54 this, SLOT( fileListUpdate()));
55 55
@@ -64,5 +64,5 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name)
64 selectItem(documents); 64 selectItem(documents);
65 65
66 scanForApplicationSettings(); 66 scanForApplicationSettings();
67 67
68 Config config("BackupAndRestore"); 68 Config config("BackupAndRestore");
@@ -70,3 +70,3 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name)
70 int totalLocations = config.readNumEntry("totalLocations",0); 70 int totalLocations = config.readNumEntry("totalLocations",0);
71 71
72//todo make less static here and use Storage class to get infos 72//todo make less static here and use Storage class to get infos
@@ -88,4 +88,4 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name)
88 } 88 }
89 89
90 // Read the list of items to ignore. 90 // Read the list of items to ignore.
91 QList<QString> dontBackupList; 91 QList<QString> dontBackupList;
@@ -100,3 +100,3 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name)
100 getAllItems(backupList->firstChild(), list); 100 getAllItems(backupList->firstChild(), list);
101 101
102 for(uint i = 0; i < list.count(); i++){ 102 for(uint i = 0; i < list.count(); i++){
@@ -115,3 +115,3 @@ BackupAndRestore::~BackupAndRestore(){
115 getAllItems(backupList->firstChild(), list); 115 getAllItems(backupList->firstChild(), list);
116 116
117 Config config("BackupAndRestore"); 117 Config config("BackupAndRestore");
@@ -119,3 +119,3 @@ BackupAndRestore::~BackupAndRestore(){
119 config.clearGroup(); 119 config.clearGroup();
120 120
121 int count = 0; 121 int count = 0;
@@ -137,3 +137,3 @@ QList<QListViewItem> BackupAndRestore::getAllItems(QListViewItem *item, QList<QL
137 if(item->childCount() > 0) 137 if(item->childCount() > 0)
138 getAllItems(item->firstChild(), list); 138 getAllItems(item->firstChild(), list);
139 list.append(item); 139 list.append(item);
@@ -181,6 +181,6 @@ void BackupAndRestore::scanForApplicationSettings(){
181 * The "Backup" button has been pressed. Get a list of all of the files that 181 * The "Backup" button has been pressed. Get a list of all of the files that
182 * should be backed up. If there are no files, emit and error and exit. 182 * should be backed up. If there are no files, emit and error and exit.
183 * Determine the file name to store the backup in. Backup the file(s) using 183 * Determine the file name to store the backup in. Backup the file(s) using
184 * tar and gzip --best. Report failure or success 184 * tar and gzip --best. Report failure or success
185 */ 185 */
186void BackupAndRestore::backupPressed(){ 186void BackupAndRestore::backupPressed(){
@@ -190,3 +190,3 @@ void BackupAndRestore::backupPressed(){
190 "No items selected.",QString("Ok") ); 190 "No items selected.",QString("Ok") );
191 return; 191 return;
192 } 192 }
@@ -197,3 +197,3 @@ void BackupAndRestore::backupPressed(){
197 QDateTime datetime = QDateTime::currentDateTime(); 197 QDateTime datetime = QDateTime::currentDateTime();
198 QString dateString = QString::number( datetime.date().year() ) + QString::number( datetime.date().month() ).rightJustify(2, '0') + 198 QString dateString = QString::number( datetime.date().year() ) + QString::number( datetime.date().month() ).rightJustify(2, '0') +
199 QString::number( datetime.date().day() ).rightJustify(2, '0'); 199 QString::number( datetime.date().day() ).rightJustify(2, '0');
@@ -201,3 +201,3 @@ void BackupAndRestore::backupPressed(){
201 outputFile += "/" + dateString; 201 outputFile += "/" + dateString;
202 202
203 QString t = outputFile; 203 QString t = outputFile;
@@ -209,3 +209,3 @@ void BackupAndRestore::backupPressed(){
209 209
210 // We execute tar and compressing its output with gzip.. 210 // We execute tar and compressing its output with gzip..
211 // The error output will be written into a temp-file which could be provided 211 // The error output will be written into a temp-file which could be provided
@@ -230,3 +230,3 @@ void BackupAndRestore::backupPressed(){
230 230
231 switch( QMessageBox::critical(this, tr( "Message" ), tr( "Backup Failed!" ) + "\n" 231 switch( QMessageBox::critical(this, tr( "Message" ), tr( "Backup Failed!" ) + "\n"
232 + errorMsg, QString( tr( "Ok" ) ), QString( tr( "Details" ) ) ) ){ 232 + errorMsg, QString( tr( "Ok" ) ), QString( tr( "Details" ) ) ) ){
@@ -244,3 +244,3 @@ void BackupAndRestore::backupPressed(){
244 errorFile.close(); 244 errorFile.close();
245 245
246 pErrDialog->m_textarea->setText( s ); 246 pErrDialog->m_textarea->setText( s );
@@ -255,3 +255,3 @@ void BackupAndRestore::backupPressed(){
255 setCaption(tr("Backup and Restore.. Failed !!")); 255 setCaption(tr("Backup and Restore.. Failed !!"));
256 return; 256 return;
257 } 257 }
@@ -259,3 +259,3 @@ void BackupAndRestore::backupPressed(){
259 QMessageBox::information(this, tr( "Message" ), tr( "Backup Successfull." ), QString(tr( "Ok" ) ) ); 259 QMessageBox::information(this, tr( "Message" ), tr( "Backup Successfull." ), QString(tr( "Ok" ) ) );
260 260
261 } 261 }
@@ -266,3 +266,3 @@ void BackupAndRestore::backupPressed(){
266 * Get a list of all of the files to backup. 266 * Get a list of all of the files to backup.
267 */ 267 */
268int BackupAndRestore::getBackupFiles(QString &backupFiles, QListViewItem *parent){ 268int BackupAndRestore::getBackupFiles(QString &backupFiles, QListViewItem *parent){
@@ -276,3 +276,3 @@ int BackupAndRestore::getBackupFiles(QString &backupFiles, QListViewItem *parent
276 } 276 }
277 277
278 uint count = 0; 278 uint count = 0;
@@ -319,3 +319,3 @@ void BackupAndRestore::rescanFolder(QString directory){
319 return; 319 return;
320 320
321 d.setFilter( QDir::Files | QDir::Hidden | QDir::Dirs); 321 d.setFilter( QDir::Files | QDir::Hidden | QDir::Dirs);
@@ -343,3 +343,3 @@ void BackupAndRestore::rescanFolder(QString directory){
343 * Report errors or success 343 * Report errors or success
344 */ 344 */
345void BackupAndRestore::restore(){ 345void BackupAndRestore::restore(){
@@ -349,3 +349,3 @@ void BackupAndRestore::restore(){
349 tr( "Please select something to restore." ),QString( tr( "Ok") ) ); 349 tr( "Please select something to restore." ),QString( tr( "Ok") ) );
350 return; 350 return;
351 } 351 }
@@ -354,5 +354,5 @@ void BackupAndRestore::restore(){
354 QString restoreFile = backupLocations[restoreSource->currentText()]; 354 QString restoreFile = backupLocations[restoreSource->currentText()];
355 355
356 restoreFile += "/" + restoreItem->text(0); 356 restoreFile += "/" + restoreItem->text(0);
357 357
358 int r = system(QString("tar -C / -zxf %1 2> %3") 358 int r = system(QString("tar -C / -zxf %1 2> %3")
@@ -362,3 +362,3 @@ void BackupAndRestore::restore(){
362 QString errorMsg= tr( "Error from System:\n" ) + (QString)strerror( errno ); 362 QString errorMsg= tr( "Error from System:\n" ) + (QString)strerror( errno );
363 switch( QMessageBox::critical(this, tr( "Message" ), tr( "Restore Failed." ) + "\n" 363 switch( QMessageBox::critical(this, tr( "Message" ), tr( "Restore Failed." ) + "\n"
364 + errorMsg, QString( tr( "Ok") ), QString( tr( "Details" ) ) ) ) { 364 + errorMsg, QString( tr( "Ok") ), QString( tr( "Details" ) ) ) ) {
@@ -375,3 +375,3 @@ void BackupAndRestore::restore(){
375 errorFile.close(); 375 errorFile.close();
376 376
377 pErrDialog->m_textarea->setText( s ); 377 pErrDialog->m_textarea->setText( s );
@@ -385,3 +385,3 @@ void BackupAndRestore::restore(){
385 setCaption(tr("Backup and Restore.. Failed !!")); 385 setCaption(tr("Backup and Restore.. Failed !!"));
386 return; 386 return;
387 387
diff --git a/noncore/settings/backup/backuprestore.h b/noncore/settings/backup/backuprestore.h
index 8c733e3..4bdc758 100644
--- a/noncore/settings/backup/backuprestore.h
+++ b/noncore/settings/backup/backuprestore.h
@@ -1,2 +1,2 @@
1#ifndef WINDOW_H 1#ifndef WINDOW_H
2#define WINDOW_H 2#define WINDOW_H
@@ -10,12 +10,13 @@ class QListViewItem;
10 10
11class BackupAndRestore : public BackupAndRestoreBase { 11class BackupAndRestore : public BackupAndRestoreBase {
12 12
13Q_OBJECT 13Q_OBJECT
14 14
15public: 15public:
16 16
17 BackupAndRestore( QWidget* parent = 0, const char* name = 0); 17 BackupAndRestore( QWidget* parent = 0, const char* name = 0, WFlags fl = 0);
18 ~BackupAndRestore(); 18 ~BackupAndRestore();
19 19
20 20 static QString appName() { return QString::fromLatin1("backup"); }
21
21private slots: 22private slots:
diff --git a/noncore/settings/backup/main.cpp b/noncore/settings/backup/main.cpp
index 676e1f0..b375a3b 100644
--- a/noncore/settings/backup/main.cpp
+++ b/noncore/settings/backup/main.cpp
@@ -3,12 +3,6 @@
3#include <qpe/qpeapplication.h> 3#include <qpe/qpeapplication.h>
4#include <opie/oapplicationfactory.h>
4 5
5int main(int argc, char *argv[]) {
6 QPEApplication a( argc, argv );
7
8 BackupAndRestore app(0, "mainwindow");
9 a.showMainWidget(&app);
10 return a.exec();
11}
12 6
13// main.cpp 7OPIE_EXPORT_APP( OApplicationFactory<BackupAndRestore> )
14 8
diff --git a/noncore/settings/language/language.pro b/noncore/settings/language/language.pro
index eb9e0b9..f181f7e 100644
--- a/noncore/settings/language/language.pro
+++ b/noncore/settings/language/language.pro
@@ -1,4 +1,2 @@
1 TEMPLATE= app 1 CONFIG += qt warn_on release quick-app
2 CONFIG += qt warn_on release
3 DESTDIR = $(OPIEDIR)/bin
4 HEADERS = settings.h 2 HEADERS = settings.h
diff --git a/noncore/settings/language/main.cpp b/noncore/settings/language/main.cpp
index a760ff3..8bdf8a5 100644
--- a/noncore/settings/language/main.cpp
+++ b/noncore/settings/language/main.cpp
@@ -23,14 +23,5 @@
23#include <qpe/qpeapplication.h> 23#include <qpe/qpeapplication.h>
24#include <opie/oapplicationfactory.h>
24 25
25 26
26int main(int argc, char** argv) 27OPIE_EXPORT_APP( OApplicationFactory<LanguageSettings> )
27{
28 QPEApplication a(argc,argv);
29
30 LanguageSettings dlg;
31
32 a.showMainWidget(&dlg);
33
34 return a.exec();
35}
36
diff --git a/noncore/settings/language/settings.h b/noncore/settings/language/settings.h
index 22cc987..a157d26 100644
--- a/noncore/settings/language/settings.h
+++ b/noncore/settings/language/settings.h
@@ -37,2 +37,4 @@ public:
37 37
38 static QString appName() { return QString::fromLatin1("language"); }
39
38protected: 40protected:
diff --git a/noncore/settings/mediummount/main.cpp b/noncore/settings/mediummount/main.cpp
index 118a725..b8cdeaf 100644
--- a/noncore/settings/mediummount/main.cpp
+++ b/noncore/settings/mediummount/main.cpp
@@ -6,12 +6,5 @@
6#include <qpe/qpeapplication.h> 6#include <qpe/qpeapplication.h>
7#include <opie/oapplicationfactory.h>
7 8
8int main( int argc, char ** argv ) 9OPIE_EXPORT_APP( OApplicationFactory<MediumMountSetting::MainWindow> )
9{
10 QPEApplication a( argc, argv );
11 10
12 MediumMountSetting::MainWindow mw;
13 a.showMainWidget( &mw );
14 mw.showMaximized();
15
16 return a.exec();
17}
diff --git a/noncore/settings/mediummount/mainwindow.h b/noncore/settings/mediummount/mainwindow.h
index 71dac79..9649863 100644
--- a/noncore/settings/mediummount/mainwindow.h
+++ b/noncore/settings/mediummount/mainwindow.h
@@ -19,2 +19,3 @@ namespace MediumMountSetting {
19 ~MainWindow(); 19 ~MainWindow();
20 static QString appName() { return QString::fromLatin1("mediummount"); }
20 21
diff --git a/noncore/settings/mediummount/mediummount.pro b/noncore/settings/mediummount/mediummount.pro
index 97bbbaf..6e29fa5 100644
--- a/noncore/settings/mediummount/mediummount.pro
+++ b/noncore/settings/mediummount/mediummount.pro
@@ -3,3 +3,3 @@ DESTDIR = $(OPIEDIR)/bin/
3 #CONFIG = qt warn_on debug 3 #CONFIG = qt warn_on debug
4 CONFIG = qt warn_on release 4 CONFIG = qt warn_on release quick-app
5 HEADERS = mediumwidget.h mediumglobal.h mainwindow.h 5 HEADERS = mediumwidget.h mediumglobal.h mainwindow.h
diff --git a/noncore/settings/mediummount/mediumwidget.h b/noncore/settings/mediummount/mediumwidget.h
index 7f7b755..0f27117 100644
--- a/noncore/settings/mediummount/mediumwidget.h
+++ b/noncore/settings/mediummount/mediumwidget.h
@@ -28,2 +28,3 @@ namespace MediumMountSetting {
28 ~MediumMountWidget(); 28 ~MediumMountWidget();
29
29 30
diff --git a/noncore/settings/netsystemtime/main.cpp b/noncore/settings/netsystemtime/main.cpp
index 4b20a61..da98eee 100644
--- a/noncore/settings/netsystemtime/main.cpp
+++ b/noncore/settings/netsystemtime/main.cpp
@@ -31,11 +31,5 @@
31#include <qpe/qpeapplication.h> 31#include <qpe/qpeapplication.h>
32#include <opie/oapplicationfactory.h>
32 33
33int main( int argc, char ** argv )
34{
35 QPEApplication a( argc, argv );
36 34
37 MainWindow mw; 35OPIE_EXPORT_APP( OApplicationFactory<MainWindow> )
38 a.showMainWidget( &mw );
39
40 return a.exec();
41}
diff --git a/noncore/settings/netsystemtime/mainwindow.cpp b/noncore/settings/netsystemtime/mainwindow.cpp
index 2d240ba..66e1ca3 100644
--- a/noncore/settings/netsystemtime/mainwindow.cpp
+++ b/noncore/settings/netsystemtime/mainwindow.cpp
@@ -41,2 +41,3 @@
41#include <qpe/qpeapplication.h> 41#include <qpe/qpeapplication.h>
42#include <qpe/qpedialog.h>
42 43
@@ -52,3 +53,3 @@
52 53
53MainWindow::MainWindow() 54MainWindow::MainWindow( QWidget *parent , const char *name, bool modal, WFlags f )
54 : QDialog( 0x0, 0x0, TRUE, 0 ) 55 : QDialog( 0x0, 0x0, TRUE, 0 )
@@ -68,3 +69,3 @@ MainWindow::MainWindow()
68 69
69 // Add tab widgets 70 // Add tab widgets
70 mainWidget->addTab( timeTab = new TimeTabWidget( mainWidget ), "netsystemtime/DateTime", tr( "Time" ) ); 71 mainWidget->addTab( timeTab = new TimeTabWidget( mainWidget ), "netsystemtime/DateTime", tr( "Time" ) );
@@ -81,6 +82,5 @@ MainWindow::MainWindow()
81 82
82 // Create QCOP channel 83 connect( qApp, SIGNAL(appMessage(const QCString&, const QByteArray&)),
83 QCopChannel *channel = new QCopChannel( "QPE/Application/netsystemtime", this ); 84 this, SLOT(slotQCopReceive(const QCString&, const QByteArray&)) );
84 connect( channel, SIGNAL(received(const QCString&, const QByteArray&)), 85
85 this, SLOT(slotQCopReceive(const QCString&, const QByteArray&)) );
86 86
@@ -112,3 +112,4 @@ MainWindow::MainWindow()
112 // Display app 112 // Display app
113 showMaximized(); 113 //showMaximized();
114 (void)new QPEDialogListener(this);
114} 115}
@@ -167,3 +168,3 @@ void MainWindow::runNTP()
167 QString msg = tr( "You asked for a delay of %1 minutes, but only %2 minutes elapsed since last lookup.<br>Continue?" ).arg( QString::number( ntpDelay ) ).arg( QString::number( _lookupDiff / 60 ) ); 168 QString msg = tr( "You asked for a delay of %1 minutes, but only %2 minutes elapsed since last lookup.<br>Continue?" ).arg( QString::number( ntpDelay ) ).arg( QString::number( _lookupDiff / 60 ) );
168 169
169 switch ( 170 switch (
@@ -200,4 +201,4 @@ void MainWindow::runNTP()
200 ntpProcess->clearArguments(); 201 ntpProcess->clearArguments();
201 202
202 *ntpProcess << "ntpdate" << srv; 203 *ntpProcess << "ntpdate" << srv;
203 bool ret = ntpProcess->start( OProcess::NotifyOnExit, OProcess::AllOutput ); 204 bool ret = ntpProcess->start( OProcess::NotifyOnExit, OProcess::AllOutput );
@@ -299,3 +300,3 @@ void MainWindow::slotNtpFinished( OProcess *p )
299 QDateTime dt = QDateTime::currentDateTime(); 300 QDateTime dt = QDateTime::currentDateTime();
300 301
301 // Verify run was successful 302 // Verify run was successful
@@ -340,3 +341,3 @@ void MainWindow::slotNtpFinished( OProcess *p )
340 output = tr( "%1 seconds").arg(QString::number( timeShift )); 341 output = tr( "%1 seconds").arg(QString::number( timeShift ));
341 342
342 // Display information on time server tab 343 // Display information on time server tab
diff --git a/noncore/settings/netsystemtime/mainwindow.h b/noncore/settings/netsystemtime/mainwindow.h
index fa94335..1cdbc1a 100644
--- a/noncore/settings/netsystemtime/mainwindow.h
+++ b/noncore/settings/netsystemtime/mainwindow.h
@@ -50,4 +50,5 @@ class MainWindow : public QDialog
50public: 50public:
51 MainWindow(); 51 MainWindow( QWidget *parent = 0, const char *name = 0, bool modal = FALSE,WFlags f = 0);
52 ~MainWindow(); 52 ~MainWindow();
53 static QString appName() { return QString::fromLatin1("systemtime"); }
53 54
diff --git a/noncore/settings/netsystemtime/netsystemtime.pro b/noncore/settings/netsystemtime/netsystemtime.pro
index 7a12dd1..2140f2e 100644
--- a/noncore/settings/netsystemtime/netsystemtime.pro
+++ b/noncore/settings/netsystemtime/netsystemtime.pro
@@ -1,4 +1,2 @@
1 TEMPLATE= app 1 CONFIG = qt warn_on release quick-app
2 CONFIG = qt warn_on debug
3 #CONFIG = qt warn_on release
4 HEADERS = mainwindow.h \ 2 HEADERS = mainwindow.h \
@@ -19,4 +17,3 @@ DEPENDPATH += $(OPIEDIR)/include
19 LIBS += -lqpe -lopie 17 LIBS += -lqpe -lopie
20 INTERFACES= 18
21 DESTDIR = $(OPIEDIR)/bin
22 TARGET = systemtime 19 TARGET = systemtime
diff --git a/noncore/settings/sound/main.cpp b/noncore/settings/sound/main.cpp
index 33b0523..d919ce4 100644
--- a/noncore/settings/sound/main.cpp
+++ b/noncore/settings/sound/main.cpp
@@ -23,11 +23,7 @@
23#include <qpe/qpeapplication.h> 23#include <qpe/qpeapplication.h>
24#include <opie/oapplicationfactory.h>
25
26OPIE_EXPORT_APP( OApplicationFactory<SoundSettings> )
24 27
25 28
26int main(int argc, char** argv)
27{
28 QPEApplication a(argc,argv);
29 SoundSettings dlg;
30 a.showMainWidget(&dlg);
31 return a.exec();
32}
33 29
diff --git a/noncore/settings/sound/sound.pro b/noncore/settings/sound/sound.pro
index 48c612e..c0a1ed3 100644
--- a/noncore/settings/sound/sound.pro
+++ b/noncore/settings/sound/sound.pro
@@ -1,4 +1,2 @@
1TEMPLATE = app 1CONFIG += qt warn_on release quick-app
2CONFIG += qt warn_on release
3DESTDIR = $(OPIEDIR)/bin
4HEADERS = soundsettings.h soundsettingsbase.h 2HEADERS = soundsettings.h soundsettingsbase.h
diff --git a/noncore/settings/sound/soundsettings.h b/noncore/settings/sound/soundsettings.h
index 71ce6f5..57a360f 100644
--- a/noncore/settings/sound/soundsettings.h
+++ b/noncore/settings/sound/soundsettings.h
@@ -31,2 +31,3 @@ Q_OBJECT
31public: 31public:
32 static QString appName() { return QString::fromLatin1("sound"); }
32 SoundSettings( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); 33 SoundSettings( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
diff --git a/noncore/settings/sshkeys/opie-sshkeys.control b/noncore/settings/sshkeys/opie-sshkeys.control
index d05858c..4deccf4 100644
--- a/noncore/settings/sshkeys/opie-sshkeys.control
+++ b/noncore/settings/sshkeys/opie-sshkeys.control
@@ -1,3 +1,3 @@
1Package: opie-sshkeys 1Package: opie-sshkeys
2Files: plugins/application/libsshkeys.so* bin/sshkeys apps/Settings/sshkeys.desktop pics/sshkeys/sshkeys.png 2Files: bin/sshkeys apps/Settings/sshkeys.desktop pics/sshkeys/sshkeys.png
3Priority: optional 3Priority: optional
diff --git a/noncore/settings/usermanager/main.cpp b/noncore/settings/usermanager/main.cpp
index aa78286..515ea9a 100644
--- a/noncore/settings/usermanager/main.cpp
+++ b/noncore/settings/usermanager/main.cpp
@@ -11,9 +11,4 @@
11#include <qpe/qpeapplication.h> 11#include <qpe/qpeapplication.h>
12#include <opie/oapplicationfactory.h>
12 13
13int main( int argc, char ** argv ) 14OPIE_EXPORT_APP( OApplicationFactory<UserConfig> )
14{
15 QPEApplication a( argc, argv );
16 UserConfig mw(0,0,0);
17 a.showMainWidget( &mw );
18 return a.exec();
19}
diff --git a/noncore/settings/usermanager/usermanager.h b/noncore/settings/usermanager/usermanager.h
index 6782923..313646a 100644
--- a/noncore/settings/usermanager/usermanager.h
+++ b/noncore/settings/usermanager/usermanager.h
@@ -29,2 +29,3 @@ class UserConfig : public QMainWindow
29public: 29public:
30 static QString appName() { return QString::fromLatin1("appname"); }
30 UserConfig( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); 31 UserConfig( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
diff --git a/noncore/settings/usermanager/usermanager.pro b/noncore/settings/usermanager/usermanager.pro
index 576a233..f61fb63 100644
--- a/noncore/settings/usermanager/usermanager.pro
+++ b/noncore/settings/usermanager/usermanager.pro
@@ -1,4 +1,3 @@
1 TEMPLATE= app
2 #CONFIG = qt warn_on debug 1 #CONFIG = qt warn_on debug
3 CONFIG = qt warn_on release 2 CONFIG = qt warn_on release quick-app
4 HEADERS = usermanager.h userdialog.h groupdialog.h passwd.h 3 HEADERS = usermanager.h userdialog.h groupdialog.h passwd.h
@@ -9,3 +8,2 @@ LIBS += -lqpe -lopie -lcrypt
9 TARGET = usermanager 8 TARGET = usermanager
10DESTDIR = $(OPIEDIR)/bin
11 9