summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEd Rogalsky <ed.rogalsky@googlemail.com>2014-03-08 16:48:09 (GMT)
committerEd Rogalsky <ed.rogalsky@googlemail.com>2014-03-08 16:48:09 (GMT)
commit07cc32ca3557ccce583f95cbc8dd114d989b4f49 (patch)
treed4d3809eaa555b14d32c581c01dab84be6632c79
parentb165d7e4ed3625ca16d4e3c22a27aaad712af129 (diff)
minor code style fixes
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/clipproperties.cpp36
-rw-r--r--src/projectlist.cpp12
-rw-r--r--src/utils/resourcewidget.cpp36
4 files changed, 41 insertions, 45 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index aedb54d..1ee4b65 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -343,7 +343,7 @@ if(NepomukCore_FOUND)
add_definitions(-DUSE_NEPOMUKCORE)
include_directories(${NEPOMUK_CORE_INCLUDE_DIR})
target_link_libraries(kdenlive ${NEPOMUK_CORE_LIBRARY})
-else(NepomukWidgets_FOUND)
+else()
if(Nepomuk_FOUND)
add_definitions(-DUSE_NEPOMUK)
include_directories(${NEPOMUK_INCLUDES})
diff --git a/src/clipproperties.cpp b/src/clipproperties.cpp
index 18c2a6b..0598489 100644
--- a/src/clipproperties.cpp
+++ b/src/clipproperties.cpp
@@ -33,18 +33,18 @@
#include <KRun>
#ifdef USE_NEPOMUK
-#if KDE_IS_VERSION(4,6,0)
-#include <Nepomuk/Variant>
-#include <Nepomuk/Resource>
-#include <Nepomuk/ResourceManager>
-#include <Nepomuk/Vocabulary/NIE>
-#endif
+ #if KDE_IS_VERSION(4,6,0)
+ #include <Nepomuk/Variant>
+ #include <Nepomuk/Resource>
+ #include <Nepomuk/ResourceManager>
+ #include <Nepomuk/Vocabulary/NIE>
+ #endif
#endif
#ifdef USE_NEPOMUKCORE
-#include <Nepomuk2/Variant>
-#include <Nepomuk2/Resource>
-#include <Nepomuk2/ResourceManager>
-#include <Nepomuk2/Vocabulary/NIE>
+ #include <Nepomuk2/Variant>
+ #include <Nepomuk2/Resource>
+ #include <Nepomuk2/ResourceManager>
+ #include <Nepomuk2/Vocabulary/NIE>
#endif
@@ -502,8 +502,7 @@ ClipProperties::ClipProperties(DocClipBase *clip, const Timecode &tc, double fps
// Check for Nepomuk metadata
#ifdef USE_NEPOMUK
-
-#if KDE_IS_VERSION(4,6,0)
+ #if KDE_IS_VERSION(4,6,0)
if (!url.isEmpty()) {
Nepomuk::ResourceManager::instance()->init();
Nepomuk::Resource res( url.path() );
@@ -519,13 +518,11 @@ ClipProperties::ClipProperties(DocClipBase *clip, const Timecode &tc, double fps
else m_view.clip_license->setHidden(true);
}
else m_view.clip_license->setHidden(true);
-#else
+ #else
m_view.clip_license->setHidden(true);
-#endif
-
+ #endif
#else
-
-#ifdef USE_NEPOMUKCORE
+ #ifdef USE_NEPOMUKCORE
if (!url.isEmpty()) {
Nepomuk2::ResourceManager::instance()->init();
@@ -542,10 +539,9 @@ ClipProperties::ClipProperties(DocClipBase *clip, const Timecode &tc, double fps
else m_view.clip_license->setHidden(true);
}
else m_view.clip_license->setHidden(true);
-#else
+ #else
m_view.clip_license->setHidden(true);
-#endif
-
+ #endif
#endif
slotFillMarkersList(m_clip);
diff --git a/src/projectlist.cpp b/src/projectlist.cpp
index ddf1a84..a5a843b 100644
--- a/src/projectlist.cpp
+++ b/src/projectlist.cpp
@@ -63,15 +63,15 @@
#include <KHBox>
#ifdef USE_NEPOMUK
-#include <nepomuk/global.h>
-#include <nepomuk/resourcemanager.h>
-#include <Nepomuk/Resource>
-//#include <nepomuk/tag.h>
+ #include <nepomuk/global.h>
+ #include <nepomuk/resourcemanager.h>
+ #include <Nepomuk/Resource>
+ //#include <nepomuk/tag.h>
#endif
#ifdef USE_NEPOMUKCORE
-#include <nepomuk2/resourcemanager.h>
-#include <Nepomuk2/Resource>
+ #include <nepomuk2/resourcemanager.h>
+ #include <Nepomuk2/Resource>
#endif
#include <QMouseEvent>
diff --git a/src/utils/resourcewidget.cpp b/src/utils/resourcewidget.cpp
index 8d10c2a..b88a0db 100644
--- a/src/utils/resourcewidget.cpp
+++ b/src/utils/resourcewidget.cpp
@@ -49,23 +49,23 @@
#include <KFileItem>
#ifdef USE_NEPOMUK
-#if KDE_IS_VERSION(4,6,0)
-#include <Nepomuk/Variant>
-#include <Nepomuk/Resource>
-#include <Nepomuk/ResourceManager>
-#include <Nepomuk/Vocabulary/NIE>
-#include <Nepomuk/Vocabulary/NCO>
-#include <Nepomuk/Vocabulary/NDO>
-#endif
+ #if KDE_IS_VERSION(4,6,0)
+ #include <Nepomuk/Variant>
+ #include <Nepomuk/Resource>
+ #include <Nepomuk/ResourceManager>
+ #include <Nepomuk/Vocabulary/NIE>
+ #include <Nepomuk/Vocabulary/NCO>
+ #include <Nepomuk/Vocabulary/NDO>
+ #endif
#endif
#ifdef USE_NEPOMUKCORE
-#include <Nepomuk2/Variant>
-#include <Nepomuk2/Resource>
-#include <Nepomuk2/ResourceManager>
-#include <Nepomuk2/Vocabulary/NIE>
-#include <Nepomuk2/Vocabulary/NCO>
-#include <Nepomuk2/Vocabulary/NDO>
+ #include <Nepomuk2/Variant>
+ #include <Nepomuk2/Resource>
+ #include <Nepomuk2/ResourceManager>
+ #include <Nepomuk2/Vocabulary/NIE>
+ #include <Nepomuk2/Vocabulary/NCO>
+ #include <Nepomuk2/Vocabulary/NDO>
#endif
ResourceWidget::ResourceWidget(const QString & folder, QWidget * parent) :
@@ -115,9 +115,9 @@ ResourceWidget::ResourceWidget(const QString & folder, QWidget * parent) :
sound_box->setEnabled(false);
search_text->setFocus();
#ifdef USE_NEPOMUK
-#if KDE_IS_VERSION(4,6,0)
+ #if KDE_IS_VERSION(4,6,0)
Nepomuk::ResourceManager::instance()->init();
-#endif
+ #endif
#endif
slotChangeService();
loadConfig();
@@ -289,7 +289,7 @@ void ResourceWidget::slotGotFile(KJob *job)
KIO::FileCopyJob* copyJob = static_cast<KIO::FileCopyJob*>( job );
const KUrl filePath = copyJob->destUrl();
#ifdef USE_NEPOMUK
-#if KDE_IS_VERSION(4,6,0)
+ #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") );
@@ -297,7 +297,7 @@ void ResourceWidget::slotGotFile(KJob *job)
res.setProperty( Nepomuk::Vocabulary::NCO::creator(), (Nepomuk::Variant) job->property("author") );
//res.setDescription(item_description->toPlainText());
//res.setProperty( Soprano::Vocabulary::NAO::description(),
-#endif
+ #endif
#endif
#ifdef USE_NEPOMUKCORE