From: Montel Laurent Date: Fri, 24 May 2013 08:35:46 +0000 (+0200) Subject: Fix indent, Use const'ref X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=bc47853986dd50efdd4cc1ec21af54b5c25e492c;p=kdenlive Fix indent, Use const'ref --- diff --git a/src/colorpickerwidget.h b/src/colorpickerwidget.h index def14f1f..eeede832 100644 --- a/src/colorpickerwidget.h +++ b/src/colorpickerwidget.h @@ -35,10 +35,10 @@ class MyFrame : public QFrame { Q_OBJECT public: - MyFrame(QWidget* parent = 0); + explicit MyFrame(QWidget* parent = 0); protected: - virtual void hideEvent ( QHideEvent * event ); + void hideEvent ( QHideEvent * event ); signals: void getColor(); diff --git a/src/colorplaneexport.cpp b/src/colorplaneexport.cpp index 0f3a97f5..b4daaa54 100644 --- a/src/colorplaneexport.cpp +++ b/src/colorplaneexport.cpp @@ -123,7 +123,7 @@ void ColorPlaneExport::slotUpdateDisplays() break; } - lblSize->setText(i18n("%1 px", QVariant(tResX->text()).toInt()*QVariant(tResY->text()).toInt())); + lblSize->setText(i18n("%1 px", tResX->text().toInt()*tResY->text().toInt())); } void ColorPlaneExport::slotValidate() diff --git a/src/utils/abstractservice.h b/src/utils/abstractservice.h index 250f3e58..2e52d634 100644 --- a/src/utils/abstractservice.h +++ b/src/utils/abstractservice.h @@ -86,11 +86,11 @@ signals: void searchInfo(const QString &); void maxPages(int); /** @brief Emit meta info for current item in formatted html. */ - void gotMetaInfo(const QString); + void gotMetaInfo(const QString &); /** @brief Emit some extra meta info (description, license). */ - void gotMetaInfo(QMap info); + void gotMetaInfo(const QMap &info); /** @brief We have an url for current item's preview thumbnail. */ - void gotThumb(const QString url); + void gotThumb(const QString &url); /** @brief The requested search query is finished. */ void searchDone(); }; diff --git a/src/utils/archiveorg.h b/src/utils/archiveorg.h index a00e4b1e..b0a5a0ec 100644 --- a/src/utils/archiveorg.h +++ b/src/utils/archiveorg.h @@ -57,7 +57,7 @@ private: QString m_thumbsPath; signals: - void addClip(KUrl, const QString &); + void addClip(const KUrl &, const QString &); }; diff --git a/src/utils/freesound.h b/src/utils/freesound.h index 04d33219..03906093 100644 --- a/src/utils/freesound.h +++ b/src/utils/freesound.h @@ -55,7 +55,7 @@ private: QProcess *m_previewProcess; signals: - void addClip(KUrl, const QString &); + void addClip(const KUrl &, const QString &); }; diff --git a/src/utils/resourcewidget.cpp b/src/utils/resourcewidget.cpp index 9935f674..7201aedb 100644 --- a/src/utils/resourcewidget.cpp +++ b/src/utils/resourcewidget.cpp @@ -67,9 +67,9 @@ #endif ResourceWidget::ResourceWidget(const QString & folder, QWidget * parent) : - QDialog(parent), - m_folder(folder), - m_currentService(NULL) + QDialog(parent), + m_folder(folder), + m_currentService(NULL) { setFont(KGlobalSettings::toolBarFont()); setupUi(this); @@ -176,7 +176,7 @@ void ResourceWidget::slotUpdateCurrentSound() } -void ResourceWidget::slotLoadThumb(const QString url) +void ResourceWidget::slotLoadThumb(const QString &url) { KUrl img(url); if (img.isEmpty()) return; @@ -184,7 +184,7 @@ void ResourceWidget::slotLoadThumb(const QString url) if (KIO::NetAccess::download(img, m_tmpThumbFile, this)) { slotSetImage(m_tmpThumbFile); /*QPixmap pix(tmpFile); - + int newHeight = pix.height() * item_image->width() / pix.width(); if (newHeight > 200) { item_image->setScaledContents(false); @@ -243,7 +243,7 @@ void ResourceWidget::slotSaveItem(const QString &originalUrl) if (saveUrl.isEmpty() || !KIO::NetAccess::stat(srcUrl, entry, this)) return; KIO::FileCopyJob * getJob = KIO::file_copy(srcUrl, KUrl(saveUrl), -1, KIO::Overwrite); - KFileItem info(entry, srcUrl); + KFileItem info(entry, srcUrl); getJob->setSourceSize(info.size()); getJob->setProperty("license", item_license->text()); getJob->setProperty("licenseurl", item_license->url()); @@ -261,27 +261,27 @@ void ResourceWidget::slotGotFile(KJob *job) const KUrl filePath = copyJob->destUrl(); #ifdef USE_NEPOMUK #if KDE_IS_VERSION(4,6,0) - Nepomuk::Resource res( filePath ); - res.setProperty( Nepomuk::Vocabulary::NIE::license(), (Nepomuk::Variant) job->property("license") ); - res.setProperty( Nepomuk::Vocabulary::NIE::licenseType(), (Nepomuk::Variant) job->property("licenseurl") ); - res.setProperty( Nepomuk::Vocabulary::NDO::copiedFrom(), (Nepomuk::Variant) job->property("originurl") ); - res.setProperty( Nepomuk::Vocabulary::NCO::creator(), (Nepomuk::Variant) job->property("author") ); - //res.setDescription(item_description->toPlainText()); - //res.setProperty( Soprano::Vocabulary::NAO::description(), + Nepomuk::Resource res( filePath ); + res.setProperty( Nepomuk::Vocabulary::NIE::license(), (Nepomuk::Variant) job->property("license") ); + res.setProperty( Nepomuk::Vocabulary::NIE::licenseType(), (Nepomuk::Variant) job->property("licenseurl") ); + res.setProperty( Nepomuk::Vocabulary::NDO::copiedFrom(), (Nepomuk::Variant) job->property("originurl") ); + res.setProperty( Nepomuk::Vocabulary::NCO::creator(), (Nepomuk::Variant) job->property("author") ); + //res.setDescription(item_description->toPlainText()); + //res.setProperty( Soprano::Vocabulary::NAO::description(), #endif #endif #ifdef USE_NEPOMUKCORE - Nepomuk2::Resource res( filePath ); - res.setProperty( Nepomuk2::Vocabulary::NIE::license(), (Nepomuk2::Variant) job->property("license") ); - res.setProperty( Nepomuk2::Vocabulary::NIE::licenseType(), (Nepomuk2::Variant) job->property("licenseurl") ); - res.setProperty( Nepomuk2::Vocabulary::NDO::copiedFrom(), (Nepomuk2::Variant) job->property("originurl") ); - res.setProperty( Nepomuk2::Vocabulary::NCO::creator(), (Nepomuk2::Variant) job->property("author") ); - //res.setDescription(item_description->toPlainText()); - //res.setProperty( Soprano::Vocabulary::NAO::description(), + Nepomuk2::Resource res( filePath ); + res.setProperty( Nepomuk2::Vocabulary::NIE::license(), (Nepomuk2::Variant) job->property("license") ); + res.setProperty( Nepomuk2::Vocabulary::NIE::licenseType(), (Nepomuk2::Variant) job->property("licenseurl") ); + res.setProperty( Nepomuk2::Vocabulary::NDO::copiedFrom(), (Nepomuk2::Variant) job->property("originurl") ); + res.setProperty( Nepomuk2::Vocabulary::NCO::creator(), (Nepomuk2::Variant) job->property("author") ); + //res.setDescription(item_description->toPlainText()); + //res.setProperty( Soprano::Vocabulary::NAO::description(), #endif - emit addClip(filePath, stringMap()); + emit addClip(filePath, stringMap()); } void ResourceWidget::slotOpenUrl(const QString &url) diff --git a/src/utils/resourcewidget.h b/src/utils/resourcewidget.h index 1def7a90..275e9112 100644 --- a/src/utils/resourcewidget.h +++ b/src/utils/resourcewidget.h @@ -60,7 +60,7 @@ private slots: void slotNextPage(); void slotPreviousPage(); void slotOpenLink(const QUrl &url); - void slotLoadThumb(const QString url); + void slotLoadThumb(const QString& url); /** @brief A file download is finished */ void slotGotFile(KJob *job); void slotSetMetadata(const QString &desc); @@ -86,7 +86,7 @@ private: void updateLayout(); signals: - void addClip(KUrl, stringMap data); + void addClip(const KUrl &, const stringMap &data); };