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

1 files changed, 13 insertions, 12 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
@@ -41,2 +41,3 @@
 #include <qpe/qpeapplication.h>
+#include <qpe/qpedialog.h>
 
@@ -52,3 +53,3 @@
 
-MainWindow::MainWindow()
+MainWindow::MainWindow( QWidget *parent , const char *name,  bool modal, WFlags f )
         : QDialog( 0x0, 0x0, TRUE, 0 )
@@ -68,3 +69,3 @@ MainWindow::MainWindow()
 
-        // Add tab widgets 
+        // Add tab widgets
         mainWidget->addTab( timeTab = new TimeTabWidget( mainWidget ), "netsystemtime/DateTime", tr( "Time" ) );
@@ -81,6 +82,5 @@ MainWindow::MainWindow()
 
-        // Create QCOP channel
-        QCopChannel *channel = new QCopChannel( "QPE/Application/netsystemtime", this );
-        connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
-                         this, SLOT(slotQCopReceive(const QCString&, const QByteArray&)) );
+        connect( qApp, SIGNAL(appMessage(const QCString&, const QByteArray&)),
+                this, SLOT(slotQCopReceive(const QCString&, const QByteArray&)) );
+
 
@@ -112,3 +112,4 @@ MainWindow::MainWindow()
         // Display app
-        showMaximized();
+        //showMaximized();
+        (void)new QPEDialogListener(this);
 }
@@ -167,3 +168,3 @@ void MainWindow::runNTP()
                 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 ) );
-                
+
                 switch (
@@ -200,4 +201,4 @@ void MainWindow::runNTP()
                 ntpProcess->clearArguments();
-        
-        *ntpProcess << "ntpdate" << srv;
+
+        *ntpProcess << "ntpdate"  << srv;
         bool ret = ntpProcess->start( OProcess::NotifyOnExit, OProcess::AllOutput );
@@ -299,3 +300,3 @@ void MainWindow::slotNtpFinished( OProcess *p )
         QDateTime dt = QDateTime::currentDateTime();
-        
+
         //  Verify run was successful
@@ -340,3 +341,3 @@ void MainWindow::slotNtpFinished( OProcess *p )
         output = tr( "%1 seconds").arg(QString::number( timeShift ));
-        
+
         // Display information on time server tab