1 files changed, 7 insertions, 21 deletions

diff --git a/pictureviewer2.cpp b/pictureviewer2.cpp
index c3cf59e..54ad9e8 100644
--- a/pictureviewer2.cpp
+++ b/pictureviewer2.cpp
@@ -5,7 +5,6 @@
   2 of the License, or (at your option) any later version.
 */
 
-#include <QDesktopWidget>
 #include <QApplication>
 #include <QGraphicsScene>
 #include <QGraphicsPixmapItem>
@@ -126,7 +125,7 @@ void PictureViewer2::addFiles(const QStringList &files, bool clear){
         return;
     }
     PicDataList pd;
-    for(QString f : files){
+    for(const auto &f : files){
         pd << picData(f);
     }
     addFiles(pd, clear);
@@ -140,7 +139,7 @@ void PictureViewer2::addFiles(const QString &dir, bool clear){
     PicDataList pd;
     QDir directory = QDir(dir);
     QFileInfoList files = directory.entryInfoList(QDir::Files, QDir::Name);
-    for(QFileInfo fi : files){
+    for(const auto &fi : files){
         pd << picData(fi.absoluteFilePath());
     }
     addFiles(pd, clear);
@@ -288,7 +287,7 @@ void PictureViewer2::deleteCurrent(){
 void PictureViewer2::showNewPicsDialog(){
     mNewPicsDlg->clearFiles();
     QStringList fileList;
-    for(QVariantList v : mMarkedFiles){
+    for(const auto &v : mMarkedFiles){
         fileList << v.at(PicFilesModel::FullPath).toString();
     }
     mNewPicsDlg->addFiles(fileList);
@@ -335,7 +334,7 @@ void PictureViewer2::doSlide(){
     }
     auto picDataOld = mPicData;
     mPicData.clear();
-    for(auto pd : picDataOld){
+    for(const auto &pd : picDataOld){
         QList<QVariant> tmp;
         tmp << Helper::createArchivePath(pd.value(0).toString(), pd.value(1).toString()) << pd.value(2);
         mPicData << tmp;
@@ -533,6 +532,7 @@ void PictureViewer2::constructMappingItem(const PicData &file){
     doc->setDocumentMargin(8);
     QTextCursor *cur = new QTextCursor(doc);
     docFromTree(mapData, cur, 0);
+    delete cur;
     if(mMappingItem){
         mMappingPos = mMappingItem->scenePos();
         mScene->removeItem(mMappingItem);
@@ -580,20 +580,6 @@ void PictureViewer2::setGradient(const QPixmap &pic){
     setBackgroundBrush(QBrush(g));
 }
 
-QTextDocument *PictureViewer2::treeToString(const SmTreeItem *root) const{
-    QTextDocument *retval = new QTextDocument;
-    retval->setIndentWidth(2);
-    retval->setDocumentMargin(8);
-    QTextCursor *cursor = new QTextCursor(retval);
-    for(int i = 0; i < root->childCount(); ++i){
-        treeToStringRecursive(root->child(i), cursor, 0);
-        QTextBlockFormat fmt;
-        fmt.setIndent(0);
-        cursor->insertBlock(fmt);
-    }
-    return retval;
-}
-
 void PictureViewer2::treeToStringRecursive(const SmTreeItem *parent, QTextCursor *cursor, int indent) const{
     QChar bullet(0x2640);
     if(indent % 2){
@@ -750,12 +736,12 @@ PictureViewer2Item::PictureViewer2Item(const PicData &data, const int numSelecte
     //prevent QStaticText from wrapping filesnames with spaces
     //we shouldn't allow this in the first place
     mTextList << data.at(PicFilesModel::FileName).toString().replace(' ', '_');
-    mTextList << QString("%1x%2").arg(QString::number(picSize.width())).arg(QString::number(picSize.height()));
+    mTextList << QString("%1x%2").arg(QString::number(picSize.width()), QString::number(picSize.height()));
     QLocale l;
     mTextList << QString(QObject::tr("%1 bytes")).arg(l.toString(data.at(PicFilesModel::Size).toInt()));
     mTextList << l.toString(data.at(PicFilesModel::Added).toDate());
     mTextList << data.at(PicFilesModel::MimeType).toString();
-    mTextList << QString(QObject::tr("%1/%2 files")).arg(QString::number(cur + 1)).arg(QString::number(numSelected));
+    mTextList << QString(QObject::tr("%1/%2 files")).arg(QString::number(cur + 1), QString::number(numSelected));
     setZValue(1);
 }