warn about system upgrade, minor fixes, code cleanup

[fapman] / package.cpp

diff --git a/package.cpp b/package.cpp
index 19ba186..1204101 100644 (file)
--- a/package.cpp
+++ b/package.cpp
@@ -27,7 +27,7 @@
 Package::Package(QByteArray name_, AAptInterface *apt_):
                iAptInterface(apt_), iName(name_), iIsInstalled(false), iMarkedForOperation(false),
                iPkgStatus(PkgStatUnknown), iSize(0), iInstalledSize(0), iMarkedOperation(PkgOpNone),
-               iBlacklist(BlacklistSelect::BlacklistNone), iIcon(0)
+               iBlacklist(BlacklistSelect::BlacklistNone), iIcon(0), iPinned(false)
 {
 }
 
@@ -40,7 +40,7 @@ Package::~Package()
 QString Package::displayName()
 {
        QString pkgname = name();
-       if( iMaemoDisplayName!="" )
+       if( !iMaemoDisplayName.isEmpty() )
                pkgname = maemoDisplayName();
        QString n( pkgname.at(0) );
        n = n.toUpper();
@@ -82,12 +82,10 @@ void Package::convertIcon()
 {
        if( iIconData.length() > 0 && iIcon == 0 ) {
                iIcon = new QPixmap();
-               iIconData = QByteArray::fromBase64( iIconData );
-               if( !iIcon->loadFromData( iIconData ) ) {
+               if( !iIcon->loadFromData(QByteArray::fromBase64(iIconData)) ) {
                        qDebug() << "Warning: Package" << iName << "has invalid icon data";
                }
        }
-
 }
 
 bool Package::isUpgradeable()
@@ -107,7 +105,7 @@ bool Package::isUpgradeable()
 
 QString Package::upgradeableVersion()
 {
-       QString ver="";
+       QString ver;
        if( isInstalled() ) {
                Package* newer = iAptInterface->packagesAvailable()->value(iName,0);
                if( newer )
@@ -139,7 +137,7 @@ void Package::updateStatus()
 
 Package::packageStatus Package::status()
 {
-       updateStatus(); // not optimal, but it's here just in case
+       updateStatus(); // just in case
        return iPkgStatus;
 }
 
@@ -221,7 +219,7 @@ QStringList Package::checkConflicts_RichText()
 
 bool Package::versionConflicts(QString conflictVer, QString operVer)
 {
-       if( conflictVer=="" )
+       if( conflictVer.isEmpty() )
                return true;
 
        bool confl = false;