minor coding guideline fixes

svn path=/trunk/KDE/kdebase/apps/; revision=666375

2 files changed, 31 insertions, 29 deletions

diff --git a/src/metadatawidget.cpp b/src/metadatawidget.cpp
index a3d5f842e..13e39eafd 100644
--- a/src/metadatawidget.cpp
+++ b/src/metadatawidget.cpp
@@ -54,18 +54,7 @@ class MetaDataWidget::Private
 {
 public:
 #ifdef HAVE_KMETADATA
-    void loadComment(const QString& comment)
-    {
-        editComment->blockSignals(true);
-        if (comment.isEmpty()) {
-            editComment->setFontItalic(true);
-            editComment->setText(i18n("Click to add comment..."));
-        } else {
-            editComment->setFontItalic(false);
-            editComment->setText(comment);
-        }
-        editComment->blockSignals(false);
-    }
+    void loadComment(const QString& comment);
 
     KUrl fileUrl;
 
@@ -77,15 +66,28 @@ public:
 #endif
 };
 
+void MetaDataWidget::Private::loadComment(const QString& comment)
+{
+    editComment->blockSignals(true);
+    if (comment.isEmpty()) {
+        editComment->setFontItalic(true);
+        editComment->setText(i18n("Click to add comment..."));
+    } else {
+        editComment->setFontItalic(false);
+        editComment->setText(comment);
+    }
+    editComment->blockSignals(false);
+}
+
 
-MetaDataWidget::MetaDataWidget(QWidget* parent)
-        : QWidget(parent)
+MetaDataWidget::MetaDataWidget(QWidget* parent) :
+    QWidget(parent)
 {
 #ifdef HAVE_KMETADATA
     d = new Private;
     d->editComment = new QTextEdit(this);
-    d->tagWidget = new Nepomuk::KMetaData::TagWidget(this);
     d->ratingWidget = new KRatingWidget(this);
+    d->tagWidget = new Nepomuk::KMetaData::TagWidget(this);
     connect(d->ratingWidget, SIGNAL(ratingChanged(int)), this, SLOT(slotRatingChanged(int)));
     connect(d->editComment, SIGNAL(textChanged()), this, SLOT(slotCommentChanged()));
 
@@ -129,11 +131,11 @@ void MetaDataWidget::setFile(const KUrl& url)
 }
 
 
-void MetaDataWidget::setFiles(const KUrl::List urls)
+void MetaDataWidget::setFiles(const KUrl::List& urls)
 {
 #ifdef HAVE_KMETADATA
     // FIXME: support multiple files
-    setFile( urls.first() );
+    setFile(urls.first());
 #endif
 }
 
@@ -141,22 +143,22 @@ void MetaDataWidget::setFiles(const KUrl::List urls)
 void MetaDataWidget::slotCommentChanged()
 {
 #ifdef HAVE_KMETADATA
-    if ( d->editComment->toPlainText() != d->file.description() ) {
+    if (d->editComment->toPlainText() != d->file.description()) {
 //    d->file.setLocation(url.url());
-        d->file.setProperty( s_nfoFileUrl, d->fileUrl.url() );
+        d->file.setProperty(s_nfoFileUrl, d->fileUrl.url());
         d->file.setDescription(d->editComment->toPlainText());
     }
 #endif
 }
 
 
-void MetaDataWidget::slotRatingChanged(int r)
+void MetaDataWidget::slotRatingChanged(int rating)
 {
 #ifdef HAVE_KMETADATA
-    if ( r != d->file.rating() ) {
+    if (rating != d->file.rating()) {
         //    d->file.setLocation(url.url());
-        d->file.setProperty( s_nfoFileUrl, d->fileUrl.url() );
-        d->file.setRating(r);
+        d->file.setProperty(s_nfoFileUrl, d->fileUrl.url());
+        d->file.setRating(rating);
     }
 #endif
 }
@@ -165,15 +167,15 @@ void MetaDataWidget::slotRatingChanged(int r)
 bool MetaDataWidget::eventFilter(QObject* obj, QEvent* event)
 {
 #ifdef HAVE_KMETADATA
-    if (obj == d->editComment->viewport()
-            || obj == d->editComment) {
+    if (obj == d->editComment->viewport() || obj == d->editComment) {
         if (event->type() == QEvent::FocusOut) {
             // make sure the info text is displayed again
             d->loadComment(d->editComment->toPlainText());
         } else if (event->type() == QEvent::FocusIn) {
             d->editComment->setFontItalic(false);
-            if (d->file.description().isEmpty())
+            if (d->file.description().isEmpty()) {
                 d->editComment->setText(QString());
+            }
         }
     }
 #endif
diff --git a/src/metadatawidget.h b/src/metadatawidget.h
index f66599ff5..01e26ba13 100644
--- a/src/metadatawidget.h
+++ b/src/metadatawidget.h
@@ -31,7 +31,7 @@ class MetaDataWidget : public QWidget
 
 public:
     MetaDataWidget(QWidget* parent = 0);
-    ~MetaDataWidget();
+    virtual ~MetaDataWidget();
 
     /**
      * \return true if the KMetaData system could be found and initialized.
@@ -42,7 +42,7 @@ public:
 
 public Q_SLOTS:
     void setFile(const KUrl& url);
-    void setFiles(const KUrl::List urls);
+    void setFiles(const KUrl::List& urls);
 
 signals:
     /**
@@ -53,7 +53,7 @@ signals:
 
 private Q_SLOTS:
     void slotCommentChanged();
-    void slotRatingChanged(int r);
+    void slotRatingChanged(int rating);
 
 protected:
     bool eventFilter(QObject* obj, QEvent* event);