warn about system upgrade, minor fixes, code cleanup

[fapman] / aaptinterface.cpp

diff --git a/aaptinterface.cpp b/aaptinterface.cpp
index 3d63feb..f900f1c 100644 (file)
--- a/aaptinterface.cpp
+++ b/aaptinterface.cpp
@@ -45,6 +45,8 @@ AAptInterface::AAptInterface(QObject* parent = 0) : QObject(parent)
        iLastListUpdate.setTime_t(0);
        iLastDpkgUpdate.setTime_t(0);
 
+       iDataReadBuffer = new char[KDataReadBufferSize];
+
        iProcAptGetUpdate = new QProcess(this);
        iProcAptGetSimulate = new QProcess(this);
        iProcAptGetInstall = new QProcess(this);
@@ -103,6 +105,8 @@ AAptInterface::~AAptInterface()
                iProcAptGetInstall->kill();
        if( iProcAptGetClean->state() != QProcess::NotRunning )
                iProcAptGetClean->kill();
+
+       delete iDataReadBuffer;
 }
 
 void AAptInterface::addQueuedOperation(interfaceMode mode_)
@@ -1314,17 +1318,15 @@ Package* AAptInterface::ReadNextPackage(QFile& f, quint64& currentreaddata)
        bool pkgready = false;
 
        // this is faster than directly reading to QByteArray...
-       char* data = new char[25000];
        QByteArray line;
        while( !pkgready && !f.atEnd() ) {
-               f.readLine(data,25000);
-               line = data;
+               f.readLine(iDataReadBuffer,KDataReadBufferSize);
+               line = iDataReadBuffer;
                currentreaddata += line.size();
                if( processPackageDataLine(pkg,line) ) {
                        pkgready = true;
                }
        }
-       delete data;
 
        if( !pkg->name().isEmpty() && pkg->isInstalled() ) {
                QFileInfo f( KDpkgInfoDir + "/" + pkg->name() + ".list" );