summaryrefslogtreecommitdiff
authorzecke <zecke>2004-10-11 20:31:43 (UTC)
committer zecke <zecke>2004-10-11 20:31:43 (UTC)
commit7541d90e82392e5e727d8bdc818c5ec2f7b2bd3e (patch) (side-by-side diff)
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
@@ -293,16 +293,18 @@ int Ipkg :: executeIpkgLinkCommand( QStringList *cmd )
this, SLOT(linkCommandStdout(Opie::Core::OProcess*,char*,int)));
*proc << *cmd;
if(!proc->start(OProcess::NotifyOnExit, OProcess::All))
{
emit outputText( tr("Couldn't start ipkg-link process" ) );
}
+
+ return 0;
}
void Ipkg::linkProcessFinished()
{
// Report that the link process succeeded/failed
if ( error )
emit outputText( tr("Symbolic linking failed!\n") );
@@ -361,16 +363,18 @@ int Ipkg :: executeIpkgCommand( QStringList &cmd, const QString /*option*/ )
}
// Start the process going
finished = false;
if(!proc->start(OProcess::NotifyOnExit, OProcess::All))
{
emit outputText( tr("Couldn't start ipkg process" ) );
}
+
+ return 0;
}
void Ipkg::commandStdout(OProcess*, char *buffer, int buflen)
{
QString lineStr = buffer;
if ( lineStr[buflen-1] == '\n' )
buflen --;
lineStr = lineStr.left( buflen );
@@ -432,16 +436,17 @@ void Ipkg :: abort()
{
proc->kill();
aborted = true;
}
}
void Ipkg :: linkPackage( const QString &packFileName, const QString &dest, const QString &destDir )
{
+ Q_CONST_UNUSED( destDir )
if ( dest == "root" || dest == "/" )
return;
if( option == "remove" || option == "reinstall" || option == "upgrade" )
{
QStringList commands;
if ( runtimeDir != "" )