more ODP and right signal syntax

3 files changed, 11 insertions, 11 deletions

diff --git a/noncore/settings/aqpkg/ipkg.cpp b/noncore/settings/aqpkg/ipkg.cpp
index 0091a3b..420863c 100644
--- a/noncore/settings/aqpkg/ipkg.cpp
+++ b/noncore/settings/aqpkg/ipkg.cpp
@@ -232,132 +232,132 @@ void Ipkg :: removeStatusEntry()
         //read new line
         line = readStream.readLine();
 
         if ( line.contains( ":", TRUE ) )
         {
             //grep key and value from line
             k[0] = '\0';
             v[0] = '\0';
             sscanf( line, "%[^:]: %[^\n]", k, v );
             key = k;
             value = v;
             key = key.stripWhiteSpace();
             value = value.stripWhiteSpace();
         } else {
             key = "";
             value = "";
         }
 
         if ( key == "Package" && value == package )
         {
             //skip lines from the deleted package
             while ( ( !readStream.atEnd() ) && ( line.stripWhiteSpace() != "" ) )
             {
                 line = readStream.readLine();
             }
         } else {
 
             //write other lines into the tempfile
             writeStream << line << "\n";
 
             // Improve UI responsiveness
             i++;
             if ( ( i % 50 ) == 0 )
                 qApp->processEvents();
         }
     }
 
     readFile.close();
     writeFile.close();
 
     // Remove old status file and put tmp stats file in its place
     remove( statusFile );
     rename( outStatusFile, statusFile );
  }
 
 int Ipkg :: executeIpkgCommand( QStringList &cmd, const QString /*option*/ )
 {
     // If one is already running - should never be but just to be safe
     if ( proc )
     {
         delete proc;
         proc = 0;
     }
 
     // OK we're gonna use OProcess to run this thing
     proc = new OProcess();
     aborted = false;
 
 
     // Connect up our slots
     connect(proc, SIGNAL(processExited(Opie::Core::OProcess*)),
             this, SLOT( processFinished()));
 
     connect(proc, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)),
-            this, SLOT(commandStdout(OProcess*,char*,int)));
+            this, SLOT(commandStdout(Opie::Core::OProcess*,char*,int)));
 
     connect(proc, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)),
-            this, SLOT(commandStderr(OProcess*,char*,int)));
+            this, SLOT(commandStderr(Opie::Core::OProcess*,char*,int)));
 
     for ( QStringList::Iterator it = cmd.begin(); it != cmd.end(); ++it )
     {
          *proc << (*it).latin1();
     }
 
     // Start the process going
     finished = false;
     if(!proc->start(OProcess::NotifyOnExit, OProcess::All))
     {
         emit outputText( tr("Couldn't start ipkg process" ) );
     }
 }
 
 void Ipkg::commandStdout(OProcess*, char *buffer, int buflen)
 {
     QString lineStr = buffer;
     if ( lineStr[buflen-1] == '\n' )
         buflen --;
     lineStr = lineStr.left( buflen );
     emit outputText( lineStr );
 
     // check if we are installing dependant packages
     if ( option == "install" || option == "reinstall" )
     {
         // Need to keep track of any dependant packages that get installed
         // so that we can create links to them as necessary
         if ( lineStr.startsWith( "Installing " ) )
         {
             int start = lineStr.find( " " ) + 1;
             int end = lineStr.find( " ", start );
             QString *package = new QString( lineStr.mid( start, end-start ) );
             dependantPackages->append( package );
         }
     }
     else if ( option == "remove" && !( flags & FORCE_DEPENDS ) &&
               lineStr.find( "is depended upon by packages:" ) != -1 )
     {
         // Ipkg should send this to STDERR, but doesn't - so trap here
         error = true;
     }
 
     buffer[0] = '\0';
 }
 
 void Ipkg::commandStderr(OProcess*, char *buffer, int buflen)
 {
     QString lineStr = buffer;
     if ( lineStr[buflen-1] == '\n' )
         buflen --;
     lineStr=lineStr.left( buflen );
     emit outputText( lineStr );
     buffer[0] = '\0';
     error = true;
 }
 
 void Ipkg::processFinished()
 {
     // Finally, if we are removing a package, remove its entry from the <destdir>/usr/lib/ipkg/status file
     // to workaround an ipkg bug which stops reinstall to a different location
 
     if ( !error && option == "remove" )
         removeStatusEntry();
 
diff --git a/noncore/settings/netsystemtime/mainwindow.cpp b/noncore/settings/netsystemtime/mainwindow.cpp
index ba96f33..385d355 100644
--- a/noncore/settings/netsystemtime/mainwindow.cpp
+++ b/noncore/settings/netsystemtime/mainwindow.cpp
@@ -130,131 +130,131 @@ void MainWindow::accept()
     // Update the systemtime
     timeTab->saveSettings( TRUE );
 
     // Save format options
     formatTab->saveSettings( TRUE );
 
     // Save settings options
     settingsTab->saveSettings();
 
     // Since time has changed quickly load in the DateBookDB to allow the alarm server to get a better
     // grip on itself (example re-trigger alarms for when we travel back in time).
     DateBookDB db;
 
     // Turn back on the screensaver
     QCopEnvelope enableScreenSaver( "QPE/System", "setScreenSaverIntervals(int,int,int)" );
     enableScreenSaver << -1 << -1 << -1;
 
     // Exit app
     qApp->quit();
 }
 
 void MainWindow::reject()
 {
     // Reset time settings
     timeTab->saveSettings( FALSE );
 
     // Send notifications but do not save settings
     formatTab->saveSettings( FALSE );
 
     // Exit app
     qApp->quit();
 }
 
 void MainWindow::runNTP()
 {
     if ( !ntpDelayElapsed() && ntpInteractive )
     {
         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 (
             QMessageBox::warning( this, tr( "Continue?" ), msg, QMessageBox::Yes, QMessageBox::No )
             )
         {
             case QMessageBox::Yes: break;
             case QMessageBox::No:  return;
             default: return;
         }
     }
 
     QString srv = settingsTab->ntpServer();
 
     // Send information to time server tab if enabled
     if ( ntpTabEnabled )
     {
         ntpTab->setStartTime( QDateTime::currentDateTime().toString() );
         QString output = tr( "Running:\nntpdate " );
         output.append( srv );
         ntpTab->addNtpOutput( output );
     }
 
     if ( !ntpProcess )
     {
         ntpProcess = new OProcess();
         connect( ntpProcess, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)),
-                 this, SLOT(slotNtpOutput(OProcess*,char*,int)) );
+                 this, SLOT(slotNtpOutput(Opie::Core::OProcess*,char*,int)) );
         connect( ntpProcess, SIGNAL(processExited(Opie::Core::OProcess*)),
-                 this, SLOT(slotNtpFinished(OProcess*)) );
+                 this, SLOT(slotNtpFinished(Opie::Core::OProcess*)) );
     }
 
     else
         ntpProcess->clearArguments();
 
     *ntpProcess << "ntpdate"  << srv;
     bool ret = ntpProcess->start( OProcess::NotifyOnExit, OProcess::AllOutput );
     if ( !ret )
     {
         QMessageBox::critical( this, tr( "Error" ), tr( "Error while getting time from network." ) );
         if ( ntpTabEnabled )
             ntpTab->addNtpOutput( tr( "Error while executing ntpdate" ) );
     }
 }
 
 bool MainWindow::ntpDelayElapsed()
 {
     // Determine if time elapsed is greater than time delay
     Config config( "ntp" );
     config.setGroup( "lookups" );
     _lookupDiff = TimeConversion::toUTC( QDateTime::currentDateTime() ) - config.readNumEntry( "time", 0 );
     if ( _lookupDiff < 0 )
         return true;
     return ( _lookupDiff - ( ntpDelay * 60) ) > 0;
 }
 
 void MainWindow::slotSetTime( const QDateTime &dt )
 {
     timeTab->setDateTime( dt );
 }
 
 void MainWindow::slotQCopReceive( const QCString &msg, const QByteArray & )
 {
     if ( msg == "ntpLookup(QString)" )
     {
         ntpInteractive = false;
         runNTP();
     }
     if ( msg == "setPredictedTime(QString)" )
     {
         //setPredictTime();
     }
 }
 
 void MainWindow::slotDisplayNTPTab( bool display )
 {
     ntpTabEnabled = display;
 
     // Create widget if it hasn't needed
     if ( display && !ntpTab )
     {
         ntpTab = new NTPTabWidget( mainWidget );
         connect( ntpTab, SIGNAL(getNTPTime()), this, SLOT(slotGetNTPTime()) );
     }
 
     // Display/hide tab
     display ? mainWidget->addTab( ntpTab, "netsystemtime/ntptab", tr( "Time Server" ) )
             : mainWidget->removePage( ntpTab );
 }
 
 void MainWindow::slotDisplayPredictTab( bool display )
 {
     predictTabEnabled = display;
 
diff --git a/noncore/settings/sshkeys/sshkeys.cpp b/noncore/settings/sshkeys/sshkeys.cpp
index 31f6b85..cebc845 100644
--- a/noncore/settings/sshkeys/sshkeys.cpp
+++ b/noncore/settings/sshkeys/sshkeys.cpp
@@ -1,157 +1,157 @@
 /*
  *  ssh-agent key manipulation utility
  *
  *  (C) 2002 David Woodhouse <dwmw2@infradead.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
 #include "sshkeys.h"
 
 #include <qpe/qpeapplication.h>
 #include <qmultilineedit.h>
 #include <qpushbutton.h>
 #include <qlistview.h>
 #include <qcombobox.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <ctype.h>
 
 using namespace Opie::Core;
 static char *keynames[] = { "identity", "id_rsa", "id_dsa" };
 
 SSHKeysApp::SSHKeysApp( QWidget* parent,  const char* name, WFlags fl )
     : SSHKeysBase( parent, name, fl )
 {
     char *home = getenv("HOME");
     unsigned i;
 
     connect(AddButton, SIGNAL(clicked()), this, SLOT(doAddButton()));
     connect(RefreshListButton, SIGNAL(clicked()), this, SLOT(doRefreshListButton()));
     connect(RemoveAllButton, SIGNAL(clicked()), this, SLOT(doRemoveAllButton()));
 
     connect(&addprocess, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)),
-        this, SLOT(log_sshadd_output(OProcess*,char*,int)));
+            this, SLOT(log_sshadd_output(Opie::Core::OProcess*,char*,int)));
     connect(&addprocess, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)),
-        this, SLOT(log_sshadd_stderr(OProcess*,char*,int)));
+            this, SLOT(log_sshadd_stderr(Opie::Core::OProcess*,char*,int)));
     connect(&addprocess, SIGNAL(processExited(Opie::Core::OProcess*)),
-        this, SLOT(ssh_add_exited(OProcess*)));
+            this, SLOT(ssh_add_exited(Opie::Core::OProcess*)));
 
     connect(KeyFileName, SIGNAL(textChanged(const QString&)),
         this, SLOT(add_text_changed(const QString&)));
 
     if (home) {
         for (i = 0; i < sizeof(keynames)/sizeof(keynames[0]); i++) {
             char thiskeyname[32];
 
             thiskeyname[31] = 0;
             snprintf(thiskeyname, 31, "%s/.ssh/%s", home, keynames[i]);
             if (!access(thiskeyname, R_OK)) {
                 KeyFileName->insertItem(thiskeyname);
             }
         }
     }
 
     doRefreshListButton();
 }
 
 SSHKeysApp::~SSHKeysApp()
 {
 }
 
 void SSHKeysApp::doRefreshListButton()
 {
     OProcess sshadd_process;
     QListViewItem *t = KeyList->firstChild();
 
     while(t) {
         QListViewItem *next = t->nextSibling();
         KeyList->takeItem(t);
         delete(t);
         t = next;
     }
 
     connect(&sshadd_process, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)),
-        this, SLOT(get_list_keys_output(OProcess*,char*,int)));
+            this, SLOT(get_list_keys_output(Opie::Core::OProcess*,char*,int)));
     connect(&sshadd_process, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)),
-        this, SLOT(log_sshadd_stderr(OProcess*,char*,int)));
+            this, SLOT(log_sshadd_stderr(Opie::Core::OProcess*,char*,int)));
 
     keystate = KeySize;
     incoming_keyname="";
     incoming_keysize="";
     incoming_keyfingerprint="";
 
 //    log_text("Running ssh-add -l");
     sshadd_process << "ssh-add" << "-l";
     bool ret = sshadd_process.start(OProcess::Block, OProcess::AllOutput);
     if (!ret) {
         log_text(tr("Error running ssh-add"));
         return;
     }
     flush_sshadd_output();
     if (sshadd_process.exitStatus() == 2) {
         setEnabled(FALSE);
     }
 }
 
 void SSHKeysApp::get_list_keys_output(OProcess *proc, char *buffer, int buflen)
 {
     int i;
     (void) proc;
 
     for (i=0; i<buflen; i++) {
         switch(keystate) {
         case Noise:
         noise:
             if (buffer[i] == '\n') {
                 log_text(incoming_noise.local8Bit());
                 incoming_noise = "";
                 keystate = KeySize;
             } else {
                 incoming_noise += buffer[i];
             }
             break;
 
         case KeySize:
             if (isdigit(buffer[i])) {
                 incoming_keysize += buffer[i];
             } else if (buffer[i] == ' ') {
                 keystate = KeyFingerprint;
             } else {
                 incoming_keysize = "";
                 incoming_noise = "";
                 keystate = Noise;
                 goto noise;
             }
             break;
 
         case KeyFingerprint:
             if (isxdigit(buffer[i]) || buffer[i] == ':') {
                 incoming_keyfingerprint += buffer[i];
             } else if (buffer[i] == ' ') {
                 keystate = KeyName;
             } else {
                 incoming_keysize = "";
                 incoming_keyfingerprint = "";
                 incoming_noise = "";
                 keystate = Noise;
                 goto noise;
             }
             break;
 
@@ -218,77 +218,77 @@ void SSHKeysApp::log_sshadd_stderr(OProcess *proc, char *buffer, int buflen)
         } else {
             pending_stderr += *buffer;
         }
         buffer++;
         buflen--;
     }
 }
 
 void SSHKeysApp::ssh_add_exited(OProcess *proc)
 {
     (void)proc;
 
     doRefreshListButton();
     setEnabled(TRUE);
     if (proc->exitStatus() == 2) {
         setEnabled(FALSE);
     }
 }
 
 void SSHKeysApp::add_text_changed(const QString &text)
 {
     struct stat sbuf;
 
     if (!text.length() || (!access(text.ascii(), R_OK) &&
                 !stat(text.ascii(), &sbuf) &&
                    S_ISREG(sbuf.st_mode)))
         AddButton->setEnabled(TRUE);
     else
         AddButton->setEnabled(FALSE);
 }
 
 void SSHKeysApp::doAddButton()
 {
     addprocess.clearArguments();
 
     setEnabled(FALSE);
 
     if (KeyFileName->currentText().length()) {
         addprocess << "ssh-add" << "--" << KeyFileName->currentText();
 //        log_text(QString(tr("Running ssh-add -- ")) + KeyFileName->currentText());
     } else {
         addprocess << "ssh-add";
 //        log_text(tr("Running ssh-add"));
     }
     bool ret = addprocess.start(OProcess::NotifyOnExit, OProcess::AllOutput);
     if (!ret) {
         log_text(tr("Error running ssh-add"));
         doRefreshListButton();
         setEnabled(TRUE);
     }
     flush_sshadd_output();
 }
 
 void SSHKeysApp::log_text(const char *text)
 {
     TextOutput->append(text);
     TextOutput->setCursorPosition(TextOutput->numLines()+1, 0, FALSE);
 }
 
 void SSHKeysApp::doRemoveAllButton()
 {
     OProcess sshadd_process;
 
     connect(&sshadd_process, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)),
-        this, SLOT(log_sshadd_output(OProcess*,char*,int)));
+            this, SLOT(log_sshadd_output(Opie::Core::OProcess*,char*,int)));
     connect(&sshadd_process, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)),
-        this, SLOT(log_sshadd_stderr(OProcess*,char*,int)));
+            this, SLOT(log_sshadd_stderr(Opie::Core::OProcess*,char*,int)));
 
 //    log_text(tr("Running ssh-add -D"));
     sshadd_process << "ssh-add" << "-D";
     bool ret = sshadd_process.start(OProcess::Block, OProcess::AllOutput);
     if (!ret) {
         log_text(tr("Error running ssh-add"));
     }
     flush_sshadd_output();
     doRefreshListButton();
 }