code cleanup

[fapman] / packageview.cpp

diff --git a/packageview.cpp b/packageview.cpp
index 857cac6..326a92e 100644 (file)
--- a/packageview.cpp
+++ b/packageview.cpp
@@ -52,7 +52,7 @@ void ListItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &opti
        int statfilter = index.data(UserRoleCurrentStatFilter).toInt();
        int catfilter = index.data(UserRoleCurrentCatFilter).toInt();
        QString upg_version = index.data(UserRoleAvailVersion).toString();
-       BlacklistSelect::blackList blacklisted = (BlacklistSelect::blackList) index.data(UserRoleBlacklisted).toInt();
+       BlacklistSelect::blackList blacklisted = static_cast<BlacklistSelect::blackList>( index.data(UserRoleBlacklisted).toInt() );
 
        painter->save();
        QRect r = option.rect;
@@ -276,10 +276,10 @@ PackageView::PackageView(QWidget *parent) : QMainWindow(parent), ui(new Ui::Pack
 
 PackageView::~PackageView()
 {
-       delete iListCoverLabel;
-       delete iKeyFilter;
-       delete iDimmer;
-    delete ui;
+       delete iListCoverLabel; iListCoverLabel=0;
+       delete iKeyFilter; iKeyFilter=0;
+       delete iDimmer; iDimmer=0;
+       delete ui; ui=0;
 }
 
 void PackageView::orientationChanged()
@@ -501,7 +501,7 @@ void PackageView::addListItem(Package* pkg_, QString listname_)
        {
                p->setData(UserRoleDescShort, pkg_->descShort());
                p->setData(UserRoleVersion, pkg_->version());
-               p->setData(UserRoleMarked, (int)pkg_->markedOperation());
+               p->setData(UserRoleMarked, static_cast<int>(pkg_->markedOperation()) );
                p->setData(UserRoleInstalled, pkg_->isInstalled());
                p->setData(UserRoleUpgradeable, pkg_->isUpgradeable());
                p->setData(UserRoleAvailVersion, pkg_->upgradeableVersion());
@@ -509,11 +509,11 @@ void PackageView::addListItem(Package* pkg_, QString listname_)
                p->setData(UserRoleCurrentCatFilter, iSelectedCatFilter);
 
                if( pkg_->availablePackage() )
-                       p->setData(UserRoleBlacklisted, (int)pkg_->availablePackage()->blacklisted());
+                       p->setData(UserRoleBlacklisted, static_cast<int>(pkg_->availablePackage()->blacklisted()) );
                else
-                       p->setData(UserRoleBlacklisted, (int)pkg_->blacklisted());
+                       p->setData(UserRoleBlacklisted, static_cast<int>(pkg_->blacklisted()) );
 
-               //qDebug()<<pkg_->name();
+               //qDebug() << pkg_->name();
 
                pkg_->convertIcon();
                p->setData(Qt::DecorationRole, *pkg_->icon());