summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-04-23 10:29:00 (UTC)
committer mickeyl <mickeyl>2004-04-23 10:29:00 (UTC)
commitd84d16cffe92bfafc5f2433f646dcfa00e6cd7f6 (patch) (unidiff)
tree6111ac63519b629e12f818b52a8d8bf1515b46c6
parent448732c964768b5be8677a95aa1f9b07bad9e8a2 (diff)
downloadopie-d84d16cffe92bfafc5f2433f646dcfa00e6cd7f6.zip
opie-d84d16cffe92bfafc5f2433f646dcfa00e6cd7f6.tar.gz
opie-d84d16cffe92bfafc5f2433f646dcfa00e6cd7f6.tar.bz2
gcc 3.4 fixlet
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--library/global.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/library/global.cpp b/library/global.cpp
index 5ac969b..ec87555 100644
--- a/library/global.cpp
+++ b/library/global.cpp
@@ -550,49 +550,49 @@ void Global::invoke(const QString &c)
550 // XXX should unlock file /tmp/qcop-msg-ap 550 // XXX should unlock file /tmp/qcop-msg-ap
551 //see if it is being started 551 //see if it is being started
552 if ( StartingAppList::isStarting( ap ) ) { 552 if ( StartingAppList::isStarting( ap ) ) {
553 // FIXME take it out for now, since it leads to a much to short showing of wait if 553 // FIXME take it out for now, since it leads to a much to short showing of wait if
554 // some entry is clicked. 554 // some entry is clicked.
555 // Real cause is that ::execute is called twice for document tab. But it would need some larger changes 555 // Real cause is that ::execute is called twice for document tab. But it would need some larger changes
556 // to fix that, and with future syncs with qtopia 1.6 it will change anyway big time since somebody there 556 // to fix that, and with future syncs with qtopia 1.6 it will change anyway big time since somebody there
557 // had the idea that an apploader belongs to the launcher ... 557 // had the idea that an apploader belongs to the launcher ...
558 //QCopEnvelope e("QPE/System", "notBusy(QString)" ); 558 //QCopEnvelope e("QPE/System", "notBusy(QString)" );
559 //e << ap; 559 //e << ap;
560 return; 560 return;
561 } 561 }
562 562
563#endif 563#endif
564 564
565#ifdef QT_NO_QWS_MULTIPROCESS 565#ifdef QT_NO_QWS_MULTIPROCESS
566 QMessageBox::warning( 0, "Error", "Could not find the application " + c, "Ok", 0, 0, 0, 1 ); 566 QMessageBox::warning( 0, "Error", "Could not find the application " + c, "Ok", 0, 0, 0, 1 );
567#else 567#else
568 568
569 QStrList slist; 569 QStrList slist;
570 unsigned int j; 570 unsigned int j;
571 for ( j = 0; j < list.count(); j++ ) 571 for ( j = 0; j < list.count(); j++ )
572 slist.append( list[j].utf8() ); 572 slist.append( list[j].utf8() );
573 573
574 const char **args = new (const char *)[slist.count() + 1]; 574 const char **args = new const char *[slist.count() + 1];
575 for ( j = 0; j < slist.count(); j++ ) 575 for ( j = 0; j < slist.count(); j++ )
576 args[j] = slist.at(j); 576 args[j] = slist.at(j);
577 args[j] = NULL; 577 args[j] = NULL;
578 578
579#if !defined(QT_NO_COP) 579#if !defined(QT_NO_COP)
580 // an attempt to show a wait... 580 // an attempt to show a wait...
581 // more logic should be used, but this will be fine for the moment... 581 // more logic should be used, but this will be fine for the moment...
582 QCopEnvelope ( "QPE/System", "busy()" ); 582 QCopEnvelope ( "QPE/System", "busy()" );
583#endif 583#endif
584 584
585#ifdef HAVE_QUICKEXEC 585#ifdef HAVE_QUICKEXEC
586#ifdef Q_OS_MACX 586#ifdef Q_OS_MACX
587 QString libexe = qpeDir()+"/binlib/lib"+args[0] + ".dylib"; 587 QString libexe = qpeDir()+"/binlib/lib"+args[0] + ".dylib";
588#else 588#else
589 QString libexe = qpeDir()+"/binlib/lib"+args[0] + ".so"; 589 QString libexe = qpeDir()+"/binlib/lib"+args[0] + ".so";
590#endif 590#endif
591 qDebug("libfile = %s", libexe.latin1() ); 591 qDebug("libfile = %s", libexe.latin1() );
592 if ( QFile::exists( libexe ) ) { 592 if ( QFile::exists( libexe ) ) {
593 qDebug("calling quickexec %s", libexe.latin1() ); 593 qDebug("calling quickexec %s", libexe.latin1() );
594 quickexecv( libexe.utf8().data(), (const char **)args ); 594 quickexecv( libexe.utf8().data(), (const char **)args );
595 } else 595 } else
596#endif 596#endif
597 { 597 {
598 bool success = false; 598 bool success = false;