26 files changed, 45 insertions, 100 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 | |||
@@ -563,12 +563,8 @@ void Appearance::accept ( ) | |||
563 | 563 | ||
564 | config. write ( ); // need to flush the config info first | 564 | config. write ( ); // need to flush the config info first |
565 | Global::applyStyle ( ); | 565 | Global::applyStyle ( ); |
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 ( ); |
572 | } | 568 | } |
573 | 569 | ||
574 | void Appearance::done ( int r ) | 570 | void Appearance::done ( int r ) |
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 | |||
@@ -54,8 +54,9 @@ class Appearance : public QDialog | |||
54 | 54 | ||
55 | public: | 55 | public: |
56 | Appearance( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); | 56 | Appearance( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); |
57 | ~Appearance(); | 57 | ~Appearance(); |
58 | static QString appName() { return QString::fromLatin1("appearance"); } | ||
58 | 59 | ||
59 | protected: | 60 | protected: |
60 | virtual void accept ( ); | 61 | virtual void accept ( ); |
61 | virtual void done ( int r ); | 62 | virtual void done ( int r ); |
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,16 +1,15 @@ | |||
1 | TEMPLATE = app | 1 | CONFIG = qt warn_on release quick-app |
2 | CONFIG = qt warn_on release | ||
3 | DESTDIR = $(OPIEDIR)/bin | ||
4 | HEADERS = appearance.h editScheme.h sample.h | 2 | HEADERS = appearance.h editScheme.h sample.h |
5 | SOURCES = appearance.cpp editScheme.cpp main.cpp sample.cpp | 3 | SOURCES = appearance.cpp editScheme.cpp main.cpp sample.cpp |
6 | INCLUDEPATH += $(OPIEDIR)/include | 4 | INCLUDEPATH += $(OPIEDIR)/include |
7 | DEPENDPATH += ../$(OPIEDIR)/include | 5 | DEPENDPATH += ../$(OPIEDIR)/include |
8 | LIBS += -lqpe -lopie | 6 | LIBS += -lqpe -lopie |
9 | TARGET = appearance | ||
10 | INCLUDEPATH += $(OPIEDIR)/include | 7 | INCLUDEPATH += $(OPIEDIR)/include |
11 | DEPENDPATH += $(OPIEDIR)/include | 8 | DEPENDPATH += $(OPIEDIR)/include |
12 | 9 | ||
10 | TARGET = appearance | ||
11 | |||
13 | TRANSLATIONS = ../../../i18n/de/appearance.ts \ | 12 | TRANSLATIONS = ../../../i18n/de/appearance.ts \ |
14 | ../../../i18n/nl/appearance.ts \ | 13 | ../../../i18n/nl/appearance.ts \ |
15 | ../../../i18n/xx/appearance.ts \ | 14 | ../../../i18n/xx/appearance.ts \ |
16 | ../../../i18n/en/appearance.ts \ | 15 | ../../../i18n/en/appearance.ts \ |
@@ -28,6 +27,5 @@ TRANSLATIONS = ../../../i18n/de/appearance.ts \ | |||
28 | ../../../i18n/zh_TW/appearance.ts \ | 27 | ../../../i18n/zh_TW/appearance.ts \ |
29 | ../../../i18n/da/appearance.ts | 28 | ../../../i18n/da/appearance.ts |
30 | 29 | ||
31 | 30 | ||
32 | |||
33 | include ( $(OPIEDIR)/include.pro ) | 31 | include ( $(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 | |||
@@ -27,16 +27,8 @@ | |||
27 | 27 | ||
28 | #include "appearance.h" | 28 | #include "appearance.h" |
29 | 29 | ||
30 | #include <qpe/qpeapplication.h> | 30 | #include <qpe/qpeapplication.h> |
31 | #include <opie/oapplicationfactory.h> | ||
31 | 32 | ||
32 | 33 | ||
33 | int main ( int argc, char **argv ) | 34 | OPIE_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,15 +1,12 @@ | |||
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 |
5 | SOURCES = main.cpp backuprestore.cpp | 3 | SOURCES = main.cpp backuprestore.cpp |
6 | INCLUDEPATH+= $(OPIEDIR)/include | 4 | INCLUDEPATH+= $(OPIEDIR)/include |
7 | DEPENDPATH+= $(OPIEDIR)/include | 5 | DEPENDPATH+= $(OPIEDIR)/include |
8 | LIBS += -lqpe | 6 | LIBS += -lqpe |
9 | INTERFACES= backuprestorebase.ui errordialog.ui | 7 | INTERFACES= backuprestorebase.ui errordialog.ui |
10 | TARGET = backup | 8 | TARGET = backup |
11 | DESTDIR = $(OPIEDIR)/bin | ||
12 | 9 | ||
13 | TRANSLATIONS = ../../../i18n/de/backup.ts \ | 10 | TRANSLATIONS = ../../../i18n/de/backup.ts \ |
14 | ../../../i18n/nl/backup.ts \ | 11 | ../../../i18n/nl/backup.ts \ |
15 | ../../../i18n/xx/backup.ts \ | 12 | ../../../i18n/xx/backup.ts \ |
@@ -29,7 +26,5 @@ TRANSLATIONS = ../../../i18n/de/backup.ts \ | |||
29 | ../../../i18n/it/backup.ts \ | 26 | ../../../i18n/it/backup.ts \ |
30 | ../../../i18n/da/backup.ts | 27 | ../../../i18n/da/backup.ts |
31 | 28 | ||
32 | 29 | ||
33 | |||
34 | |||
35 | include ( $(OPIEDIR)/include.pro ) | 30 | include ( $(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 | |||
@@ -36,10 +36,10 @@ | |||
36 | 36 | ||
37 | const QString tempFileName = "/tmp/backup.err"; | 37 | const QString tempFileName = "/tmp/backup.err"; |
38 | 38 | ||
39 | 39 | ||
40 | BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name) | 40 | BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name, WFlags fl) |
41 | : BackupAndRestoreBase(parent, name){ | 41 | : BackupAndRestoreBase(parent, name, fl){ |
42 | this->showMaximized(); | 42 | this->showMaximized(); |
43 | backupList->header()->hide(); | 43 | backupList->header()->hide(); |
44 | restoreList->header()->hide(); | 44 | restoreList->header()->hide(); |
45 | connect(backupButton, SIGNAL(clicked()), | 45 | connect(backupButton, SIGNAL(clicked()), |
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 | |||
@@ -13,11 +13,12 @@ class BackupAndRestore : public BackupAndRestoreBase { | |||
13 | Q_OBJECT | 13 | Q_OBJECT |
14 | 14 | ||
15 | public: | 15 | public: |
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 | static QString appName() { return QString::fromLatin1("backup"); } | ||
20 | 21 | ||
21 | private slots: | 22 | private slots: |
22 | void backupPressed(); | 23 | void backupPressed(); |
23 | void restore(); | 24 | void restore(); |
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 | |||
@@ -1,14 +1,8 @@ | |||
1 | #include "backuprestore.h" | 1 | #include "backuprestore.h" |
2 | #include "qnetworkprotocol.h" | 2 | #include "qnetworkprotocol.h" |
3 | #include <qpe/qpeapplication.h> | 3 | #include <qpe/qpeapplication.h> |
4 | #include <opie/oapplicationfactory.h> | ||
4 | 5 | ||
5 | int main(int argc, char *argv[]) { | ||
6 | QPEApplication a( argc, argv ); | ||
7 | 6 | ||
8 | BackupAndRestore app(0, "mainwindow"); | 7 | OPIE_EXPORT_APP( OApplicationFactory<BackupAndRestore> ) |
9 | a.showMainWidget(&app); | ||
10 | return a.exec(); | ||
11 | } | ||
12 | |||
13 | // main.cpp | ||
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,7 +1,5 @@ | |||
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 |
5 | SOURCES = language.cpp main.cpp | 3 | SOURCES = language.cpp main.cpp |
6 | INTERFACES= languagesettingsbase.ui | 4 | INTERFACES= languagesettingsbase.ui |
7 | INCLUDEPATH += $(OPIEDIR)/include | 5 | INCLUDEPATH += $(OPIEDIR)/include |
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 | |||
@@ -20,17 +20,8 @@ | |||
20 | 20 | ||
21 | #include "settings.h" | 21 | #include "settings.h" |
22 | 22 | ||
23 | #include <qpe/qpeapplication.h> | 23 | #include <qpe/qpeapplication.h> |
24 | #include <opie/oapplicationfactory.h> | ||
24 | 25 | ||
25 | 26 | ||
26 | int main(int argc, char** argv) | 27 | OPIE_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 | |||
@@ -34,8 +34,10 @@ class LanguageSettings : public LanguageSettingsBase | |||
34 | public: | 34 | public: |
35 | LanguageSettings( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); | 35 | LanguageSettings( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); |
36 | ~LanguageSettings(); | 36 | ~LanguageSettings(); |
37 | 37 | ||
38 | static QString appName() { return QString::fromLatin1("language"); } | ||
39 | |||
38 | protected: | 40 | protected: |
39 | void accept(); | 41 | void accept(); |
40 | void reject(); | 42 | void reject(); |
41 | void done(int); | 43 | void done(int); |
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 | |||
@@ -3,15 +3,8 @@ | |||
3 | #include "mainwindow.h" | 3 | #include "mainwindow.h" |
4 | 4 | ||
5 | #include <qpixmap.h> | 5 | #include <qpixmap.h> |
6 | #include <qpe/qpeapplication.h> | 6 | #include <qpe/qpeapplication.h> |
7 | #include <opie/oapplicationfactory.h> | ||
7 | 8 | ||
8 | int main( int argc, char ** argv ) | 9 | OPIE_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 | |||
@@ -16,8 +16,9 @@ namespace MediumMountSetting { | |||
16 | Q_OBJECT | 16 | Q_OBJECT |
17 | public: | 17 | public: |
18 | MainWindow(QWidget *parent = 0, const char *name = 0 , bool modal = FALSE, WFlags = 0); | 18 | MainWindow(QWidget *parent = 0, const char *name = 0 , bool modal = FALSE, WFlags = 0); |
19 | ~MainWindow(); | 19 | ~MainWindow(); |
20 | static QString appName() { return QString::fromLatin1("mediummount"); } | ||
20 | 21 | ||
21 | private slots: | 22 | private slots: |
22 | void slotGlobalChanged(int ); | 23 | void slotGlobalChanged(int ); |
23 | void slotCheckingChanged(int ); | 24 | void slotCheckingChanged(int ); |
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 | |||
@@ -1,8 +1,8 @@ | |||
1 | TEMPLATE= app | 1 | TEMPLATE= app |
2 | DESTDIR = $(OPIEDIR)/bin/ | 2 | 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 |
6 | SOURCES = main.cpp mediumwidget.cc mediumglobal.cc mainwindow.cc | 6 | SOURCES = main.cpp mediumwidget.cc mediumglobal.cc mainwindow.cc |
7 | INCLUDEPATH+= $(OPIEDIR)/include | 7 | INCLUDEPATH+= $(OPIEDIR)/include |
8 | DEPENDPATH+= $(OPIEDIR)/include | 8 | DEPENDPATH+= $(OPIEDIR)/include |
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 | |||
@@ -26,8 +26,9 @@ namespace MediumMountSetting { | |||
26 | public: | 26 | public: |
27 | MediumMountWidget(const QString&, const QPixmap &, QWidget *parent, const char *name = 0 ); | 27 | MediumMountWidget(const QString&, const QPixmap &, QWidget *parent, const char *name = 0 ); |
28 | ~MediumMountWidget(); | 28 | ~MediumMountWidget(); |
29 | 29 | ||
30 | |||
30 | void writeConfig(); | 31 | void writeConfig(); |
31 | 32 | ||
32 | private slots: | 33 | private slots: |
33 | void slotAdd(); | 34 | void slotAdd(); |
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 | |||
@@ -28,14 +28,8 @@ | |||
28 | 28 | ||
29 | #include "mainwindow.h" | 29 | #include "mainwindow.h" |
30 | 30 | ||
31 | #include <qpe/qpeapplication.h> | 31 | #include <qpe/qpeapplication.h> |
32 | #include <opie/oapplicationfactory.h> | ||
32 | 33 | ||
33 | int main( int argc, char ** argv ) | ||
34 | { | ||
35 | QPEApplication a( argc, argv ); | ||
36 | 34 | ||
37 | MainWindow mw; | 35 | OPIE_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 | |||
@@ -38,8 +38,9 @@ | |||
38 | 38 | ||
39 | #include <qpe/config.h> | 39 | #include <qpe/config.h> |
40 | #include <qpe/datebookdb.h> | 40 | #include <qpe/datebookdb.h> |
41 | #include <qpe/qpeapplication.h> | 41 | #include <qpe/qpeapplication.h> |
42 | #include <qpe/qpedialog.h> | ||
42 | 43 | ||
43 | #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP) | 44 | #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP) |
44 | #include <qpe/qcopenvelope_qws.h> | 45 | #include <qpe/qcopenvelope_qws.h> |
45 | #endif | 46 | #endif |
@@ -49,9 +50,9 @@ | |||
49 | #include <qsocket.h> | 50 | #include <qsocket.h> |
50 | #include <qstring.h> | 51 | #include <qstring.h> |
51 | #include <qtimer.h> | 52 | #include <qtimer.h> |
52 | 53 | ||
53 | MainWindow::MainWindow() | 54 | MainWindow::MainWindow( QWidget *parent , const char *name, bool modal, WFlags f ) |
54 | : QDialog( 0x0, 0x0, TRUE, 0 ) | 55 | : QDialog( 0x0, 0x0, TRUE, 0 ) |
55 | { | 56 | { |
56 | setCaption( tr( "SystemTime" ) ); | 57 | setCaption( tr( "SystemTime" ) ); |
57 | 58 | ||
@@ -78,13 +79,12 @@ MainWindow::MainWindow() | |||
78 | 79 | ||
79 | mainWidget->setCurrentTab( tr( "Time" ) ); | 80 | mainWidget->setCurrentTab( tr( "Time" ) ); |
80 | layout->addWidget( mainWidget ); | 81 | layout->addWidget( mainWidget ); |
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 | connect( channel, SIGNAL(received(const QCString&, const QByteArray&)), | ||
85 | this, SLOT(slotQCopReceive(const QCString&, const QByteArray&)) ); | 84 | this, SLOT(slotQCopReceive(const QCString&, const QByteArray&)) ); |
86 | 85 | ||
86 | |||
87 | // Create NTP socket | 87 | // Create NTP socket |
88 | ntpSock = new QSocket( this ); | 88 | ntpSock = new QSocket( this ); |
89 | connect( ntpSock, SIGNAL(error(int)),SLOT(slotCheckNtp(int)) ); | 89 | connect( ntpSock, SIGNAL(error(int)),SLOT(slotCheckNtp(int)) ); |
90 | slotProbeNTPServer(); | 90 | slotProbeNTPServer(); |
@@ -109,9 +109,10 @@ MainWindow::MainWindow() | |||
109 | slotNTPDelayChanged( config.readNumEntry( "ntpRefreshFreq", 1440 ) ); | 109 | slotNTPDelayChanged( config.readNumEntry( "ntpRefreshFreq", 1440 ) ); |
110 | slotCheckNtp( -1 ); | 110 | slotCheckNtp( -1 ); |
111 | 111 | ||
112 | // Display app | 112 | // Display app |
113 | showMaximized(); | 113 | //showMaximized(); |
114 | (void)new QPEDialogListener(this); | ||
114 | } | 115 | } |
115 | 116 | ||
116 | MainWindow::~MainWindow() | 117 | MainWindow::~MainWindow() |
117 | { | 118 | { |
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 | |||
@@ -47,10 +47,11 @@ class MainWindow : public QDialog | |||
47 | { | 47 | { |
48 | Q_OBJECT | 48 | Q_OBJECT |
49 | 49 | ||
50 | public: | 50 | public: |
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 | ||
54 | protected: | 55 | protected: |
55 | void accept(); | 56 | void accept(); |
56 | void reject(); | 57 | void reject(); |
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,7 +1,5 @@ | |||
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 \ |
5 | timetabwidget.h \ | 3 | timetabwidget.h \ |
6 | formattabwidget.h \ | 4 | formattabwidget.h \ |
7 | settingstabwidget.h \ | 5 | settingstabwidget.h \ |
@@ -16,10 +14,9 @@ SOURCES = main.cpp \ | |||
16 | ntptabwidget.cpp | 14 | ntptabwidget.cpp |
17 | INCLUDEPATH+= $(OPIEDIR)/include | 15 | INCLUDEPATH+= $(OPIEDIR)/include |
18 | DEPENDPATH+= $(OPIEDIR)/include | 16 | DEPENDPATH+= $(OPIEDIR)/include |
19 | LIBS += -lqpe -lopie | 17 | LIBS += -lqpe -lopie |
20 | INTERFACES= | 18 | |
21 | DESTDIR = $(OPIEDIR)/bin | ||
22 | TARGET = systemtime | 19 | TARGET = systemtime |
23 | 20 | ||
24 | TRANSLATIONS = ../../../i18n/de/systemtime.ts \ | 21 | TRANSLATIONS = ../../../i18n/de/systemtime.ts \ |
25 | ../../../i18n/nl/systemtime.ts \ | 22 | ../../../i18n/nl/systemtime.ts \ |
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 | |||
@@ -20,14 +20,10 @@ | |||
20 | 20 | ||
21 | #include "soundsettings.h" | 21 | #include "soundsettings.h" |
22 | 22 | ||
23 | #include <qpe/qpeapplication.h> | 23 | #include <qpe/qpeapplication.h> |
24 | #include <opie/oapplicationfactory.h> | ||
25 | |||
26 | OPIE_EXPORT_APP( OApplicationFactory<SoundSettings> ) | ||
24 | 27 | ||
25 | 28 | ||
26 | int 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,7 +1,5 @@ | |||
1 | TEMPLATE = app | 1 | CONFIG += qt warn_on release quick-app |
2 | CONFIG += qt warn_on release | ||
3 | DESTDIR = $(OPIEDIR)/bin | ||
4 | HEADERS = soundsettings.h soundsettingsbase.h | 2 | HEADERS = soundsettings.h soundsettingsbase.h |
5 | SOURCES = soundsettings.cpp soundsettingsbase.cpp main.cpp | 3 | SOURCES = soundsettings.cpp soundsettingsbase.cpp main.cpp |
6 | #INTERFACES = soundsettingsbase.ui | 4 | #INTERFACES = soundsettingsbase.ui |
7 | INCLUDEPATH += $(OPIEDIR)/include | 5 | INCLUDEPATH += $(OPIEDIR)/include |
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 | |||
@@ -28,8 +28,9 @@ class SoundSettings : public SoundSettingsBase | |||
28 | { | 28 | { |
29 | Q_OBJECT | 29 | Q_OBJECT |
30 | 30 | ||
31 | public: | 31 | public: |
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 ); |
33 | 34 | ||
34 | protected: | 35 | protected: |
35 | bool noWarning; | 36 | bool noWarning; |
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,6 +1,6 @@ | |||
1 | Package: opie-sshkeys | 1 | Package: opie-sshkeys |
2 | Files: plugins/application/libsshkeys.so* bin/sshkeys apps/Settings/sshkeys.desktop pics/sshkeys/sshkeys.png | 2 | Files: bin/sshkeys apps/Settings/sshkeys.desktop pics/sshkeys/sshkeys.png |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/settings | 4 | Section: opie/settings |
5 | Maintainer: David Woodhouse <dwmw2@infradead.org> | 5 | Maintainer: David Woodhouse <dwmw2@infradead.org> |
6 | Architecture: arm | 6 | Architecture: arm |
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 | |||
@@ -8,12 +8,7 @@ | |||
8 | ***************************************************************************/ | 8 | ***************************************************************************/ |
9 | 9 | ||
10 | #include "usermanager.h" | 10 | #include "usermanager.h" |
11 | #include <qpe/qpeapplication.h> | 11 | #include <qpe/qpeapplication.h> |
12 | #include <opie/oapplicationfactory.h> | ||
12 | 13 | ||
13 | int main( int argc, char ** argv ) | 14 | OPIE_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 | |||
@@ -26,8 +26,9 @@ class UserConfig : public QMainWindow | |||
26 | { | 26 | { |
27 | Q_OBJECT | 27 | Q_OBJECT |
28 | 28 | ||
29 | public: | 29 | public: |
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 ); |
31 | ~UserConfig(); | 32 | ~UserConfig(); |
32 | 33 | ||
33 | private: | 34 | private: |
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,14 +1,12 @@ | |||
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 |
5 | SOURCES = usermanager.cpp userdialog.cpp groupdialog.cpp passwd.cpp main.cpp | 4 | SOURCES = usermanager.cpp userdialog.cpp groupdialog.cpp passwd.cpp main.cpp |
6 | INCLUDEPATH+= $(OPIEDIR)/include | 5 | INCLUDEPATH+= $(OPIEDIR)/include |
7 | DEPENDPATH+= $(OPIEDIR)/include | 6 | DEPENDPATH+= $(OPIEDIR)/include |
8 | LIBS += -lqpe -lopie -lcrypt | 7 | LIBS += -lqpe -lopie -lcrypt |
9 | TARGET = usermanager | 8 | TARGET = usermanager |
10 | DESTDIR = $(OPIEDIR)/bin | ||
11 | 9 | ||
12 | TRANSLATIONS = ../../../i18n/de/usermanager.ts \ | 10 | TRANSLATIONS = ../../../i18n/de/usermanager.ts \ |
13 | ../../../i18n/nl/usermanager.ts \ | 11 | ../../../i18n/nl/usermanager.ts \ |
14 | ../../../i18n/xx/usermanager.ts \ | 12 | ../../../i18n/xx/usermanager.ts \ |