summaryrefslogtreecommitdiff
authorzecke <zecke>2004-10-11 20:31:43 (UTC)
committer zecke <zecke>2004-10-11 20:31:43 (UTC)
commit7541d90e82392e5e727d8bdc818c5ec2f7b2bd3e (patch) (unidiff)
tree043b05fd959a83a5cd35a5c23517028bcbcd35a7
parentd063dce0ade1e18044cb8826963e47e979e9a280 (diff)
downloadopie-7541d90e82392e5e727d8bdc818c5ec2f7b2bd3e.zip
opie-7541d90e82392e5e727d8bdc818c5ec2f7b2bd3e.tar.gz
opie-7541d90e82392e5e727d8bdc818c5ec2f7b2bd3e.tar.bz2
'return 0' instead of no return from no void function. Lets see if that
fix breaks anything
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/aqpkg/ipkg.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/noncore/settings/aqpkg/ipkg.cpp b/noncore/settings/aqpkg/ipkg.cpp
index 17efda9..dd9e78d 100644
--- a/noncore/settings/aqpkg/ipkg.cpp
+++ b/noncore/settings/aqpkg/ipkg.cpp
@@ -285,32 +285,34 @@ int Ipkg :: executeIpkgLinkCommand( QStringList *cmd )
285 // OK we're gonna use OProcess to run this thing 285 // OK we're gonna use OProcess to run this thing
286 proc = new OProcess(); 286 proc = new OProcess();
287 aborted = false; 287 aborted = false;
288 288
289 // Connect up our slots 289 // Connect up our slots
290 connect(proc, SIGNAL(processExited(Opie::Core::OProcess*)), 290 connect(proc, SIGNAL(processExited(Opie::Core::OProcess*)),
291 this, SLOT( linkProcessFinished())); 291 this, SLOT( linkProcessFinished()));
292 connect(proc, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)), 292 connect(proc, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)),
293 this, SLOT(linkCommandStdout(Opie::Core::OProcess*,char*,int))); 293 this, SLOT(linkCommandStdout(Opie::Core::OProcess*,char*,int)));
294 294
295 *proc << *cmd; 295 *proc << *cmd;
296 296
297 if(!proc->start(OProcess::NotifyOnExit, OProcess::All)) 297 if(!proc->start(OProcess::NotifyOnExit, OProcess::All))
298 { 298 {
299 emit outputText( tr("Couldn't start ipkg-link process" ) ); 299 emit outputText( tr("Couldn't start ipkg-link process" ) );
300 } 300 }
301
302 return 0;
301} 303}
302 304
303void Ipkg::linkProcessFinished() 305void Ipkg::linkProcessFinished()
304{ 306{
305 // Report that the link process succeeded/failed 307 // Report that the link process succeeded/failed
306 308
307 if ( error ) 309 if ( error )
308 emit outputText( tr("Symbolic linking failed!\n") ); 310 emit outputText( tr("Symbolic linking failed!\n") );
309 else 311 else
310 emit outputText( tr("Symbolic linking succeeded.\n") ); 312 emit outputText( tr("Symbolic linking succeeded.\n") );
311 313
312 delete proc; 314 delete proc;
313 proc = 0; 315 proc = 0;
314 finished = true; 316 finished = true;
315} 317}
316 318
@@ -353,32 +355,34 @@ int Ipkg :: executeIpkgCommand( QStringList &cmd, const QString /*option*/ )
353 this, SLOT(commandStdout(Opie::Core::OProcess*,char*,int))); 355 this, SLOT(commandStdout(Opie::Core::OProcess*,char*,int)));
354 356
355 connect(proc, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)), 357 connect(proc, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)),
356 this, SLOT(commandStderr(Opie::Core::OProcess*,char*,int))); 358 this, SLOT(commandStderr(Opie::Core::OProcess*,char*,int)));
357 359
358 for ( QStringList::Iterator it = cmd.begin(); it != cmd.end(); ++it ) 360 for ( QStringList::Iterator it = cmd.begin(); it != cmd.end(); ++it )
359 { 361 {
360 *proc << (*it).latin1(); 362 *proc << (*it).latin1();
361 } 363 }
362 364
363 // Start the process going 365 // Start the process going
364 finished = false; 366 finished = false;
365 if(!proc->start(OProcess::NotifyOnExit, OProcess::All)) 367 if(!proc->start(OProcess::NotifyOnExit, OProcess::All))
366 { 368 {
367 emit outputText( tr("Couldn't start ipkg process" ) ); 369 emit outputText( tr("Couldn't start ipkg process" ) );
368 } 370 }
371
372 return 0;
369} 373}
370 374
371void Ipkg::commandStdout(OProcess*, char *buffer, int buflen) 375void Ipkg::commandStdout(OProcess*, char *buffer, int buflen)
372{ 376{
373 QString lineStr = buffer; 377 QString lineStr = buffer;
374 if ( lineStr[buflen-1] == '\n' ) 378 if ( lineStr[buflen-1] == '\n' )
375 buflen --; 379 buflen --;
376 lineStr = lineStr.left( buflen ); 380 lineStr = lineStr.left( buflen );
377 emit outputText( lineStr ); 381 emit outputText( lineStr );
378 382
379 // check if we are installing dependant packages 383 // check if we are installing dependant packages
380 if ( option == "install" || option == "reinstall" ) 384 if ( option == "install" || option == "reinstall" )
381 { 385 {
382 // Need to keep track of any dependant packages that get installed 386 // Need to keep track of any dependant packages that get installed
383 // so that we can create links to them as necessary 387 // so that we can create links to them as necessary
384 if ( lineStr.startsWith( "Installing " ) ) 388 if ( lineStr.startsWith( "Installing " ) )
@@ -424,32 +428,33 @@ void Ipkg::processFinished()
424 428
425 emit ipkgFinished(); 429 emit ipkgFinished();
426} 430}
427 431
428 432
429void Ipkg :: abort() 433void Ipkg :: abort()
430{ 434{
431 if ( proc ) 435 if ( proc )
432 { 436 {
433 proc->kill(); 437 proc->kill();
434 aborted = true; 438 aborted = true;
435 } 439 }
436} 440}
437 441
438void Ipkg :: linkPackage( const QString &packFileName, const QString &dest, const QString &destDir ) 442void Ipkg :: linkPackage( const QString &packFileName, const QString &dest, const QString &destDir )
439{ 443{
444 Q_CONST_UNUSED( destDir )
440 if ( dest == "root" || dest == "/" ) 445 if ( dest == "root" || dest == "/" )
441 return; 446 return;
442 447
443 if( option == "remove" || option == "reinstall" || option == "upgrade" ) 448 if( option == "remove" || option == "reinstall" || option == "upgrade" )
444 { 449 {
445 QStringList commands; 450 QStringList commands;
446 451
447 if ( runtimeDir != "" ) 452 if ( runtimeDir != "" )
448 { 453 {
449 commands << "cd "; 454 commands << "cd ";
450 commands << runtimeDir; 455 commands << runtimeDir;
451 commands << ";"; 456 commands << ";";
452 } 457 }
453 commands << "ipkg-link" << "remove" << packFileName; 458 commands << "ipkg-link" << "remove" << packFileName;
454 executeIpkgLinkCommand( &commands ); 459 executeIpkgLinkCommand( &commands );
455 } 460 }