merge noncore/settings/* except networksettings for which tille volunteered (thanks)

1 files changed, 6 insertions, 5 deletions

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
@@ -39,6 +39,7 @@
 #include <qpe/config.h>
 #include <qpe/datebookdb.h>
 #include <qpe/qpeapplication.h>
+#include <qpe/qpedialog.h>
 
 #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP)
 #include <qpe/qcopenvelope_qws.h>
@@ -50,7 +51,7 @@
 #include <qstring.h>
 #include <qtimer.h>
 
-MainWindow::MainWindow()
+MainWindow::MainWindow( QWidget *parent , const char *name,  bool modal, WFlags f )
         : QDialog( 0x0, 0x0, TRUE, 0 )
 {
         setCaption( tr( "SystemTime" ) );
@@ -79,11 +80,10 @@ MainWindow::MainWindow()
         mainWidget->setCurrentTab( tr( "Time" ) );
         layout->addWidget( mainWidget );
 
-        // Create QCOP channel
-        QCopChannel *channel = new QCopChannel( "QPE/Application/netsystemtime", this );
-        connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
+        connect( qApp, SIGNAL(appMessage(const QCString&, const QByteArray&)),
                          this, SLOT(slotQCopReceive(const QCString&, const QByteArray&)) );
 
+
         // Create NTP socket
         ntpSock = new QSocket( this );
         connect( ntpSock, SIGNAL(error(int)),SLOT(slotCheckNtp(int)) );
@@ -110,7 +110,8 @@ MainWindow::MainWindow()
         slotCheckNtp( -1 );
 
         // Display app
-        showMaximized();
+        //showMaximized();
+        (void)new QPEDialogListener(this);
 }
 
 MainWindow::~MainWindow()