[kdelibs/frameworks] staging/kde4support/src: Fix build after filemetadata move

[Sebastian Kügler]

Git commit f570c881ede5a08c11ea6f4d656c6575abaa7e0e by Sebastian Kügler.
Committed on 08/08/2013 at 21:36.
Pushed by sebas into branch 'frameworks'.

Fix build after filemetadata move

- replace KIO_EXPORT with KDE4SUPPORT_EXPORT
- replace KIO_DEPRECATED with KDE4SUPPORT_EXPORT
- add strigi libs to linker if strigi is found

I *suppose* this is correct, since it looks logical (in fact like
omissions in CMakeLists.txt during the move. I'm pushing this because it
fixes the build, but it would certainly be good if someone else could
look over these changes.

CCMAIL:kde-frameworks-devel at kde.org

M  +3    -1    staging/kde4support/src/CMakeLists.txt
M  +2    -2    staging/kde4support/src/kio/kfilemetainfo.h
M  +2    -2    staging/kde4support/src/kio/metainfojob.cpp

http://commits.kde.org/kdelibs/f570c881ede5a08c11ea6f4d656c6575abaa7e0e

diff --git a/staging/kde4support/src/CMakeLists.txt b/staging/kde4support/src/CMakeLists.txt
index 38af849..928497d 100644
--- a/staging/kde4support/src/CMakeLists.txt
+++ b/staging/kde4support/src/CMakeLists.txt
@@ -11,9 +11,10 @@ if(NOT HAVE_NEPOMUK)
 endif(NOT HAVE_NEPOMUK)
 
 if(NOT STRIGI_FOUND)
-   set(KIO_NO_STRIGI TRUE)
+    set(KIO_NO_STRIGI TRUE)
 else()
     add_subdirectory( kio/dummyanalyzers )
+    set(KIO_EXTRA_LIBS ${KIO_EXTRA_LIBS} ${STRIGI_STREAMANALYZER_LIBRARY} ${STRIGI_STREAMS_LIBRARY})
 endif(NOT STRIGI_FOUND)
 
 if(NOT KIO_NO_NEPOMUK)
@@ -194,6 +195,7 @@ target_link_libraries(KDE4Support
    KConfigWidgets
    kdeui
    kio
+   ${KIO_EXTRA_LIBS}
    KI18n
    KInterProcessWindowing
    ${X11_LIBRARIES}
diff --git a/staging/kde4support/src/kio/kfilemetainfo.h b/staging/kde4support/src/kio/kfilemetainfo.h
index 5dc438e..850064a 100644
--- a/staging/kde4support/src/kio/kfilemetainfo.h
+++ b/staging/kde4support/src/kio/kfilemetainfo.h
@@ -145,13 +145,13 @@ public:
      * Deprecated
      **/
 #ifndef KDE_NO_DEPRECATED
-    KIO_DEPRECATED KFileMetaInfoGroupList preferredGroups() const;
+    KDE4SUPPORT_DEPRECATED KFileMetaInfoGroupList preferredGroups() const;
 #endif
     /**
      * Deprecated
      **/
 #ifndef KDE_NO_DEPRECATED
-    KIO_DEPRECATED KFileMetaInfoGroupList supportedGroups() const;
+    KDE4SUPPORT_DEPRECATED KFileMetaInfoGroupList supportedGroups() const;
 #endif
     KFileMetaInfoGroupList groups() const;
     QStringList keys() const;
diff --git a/staging/kde4support/src/kio/metainfojob.cpp b/staging/kde4support/src/kio/metainfojob.cpp
index fa9c480..75b2b40 100644
--- a/staging/kde4support/src/kio/metainfojob.cpp
+++ b/staging/kde4support/src/kio/metainfojob.cpp
@@ -158,12 +158,12 @@ void MetaInfoJob::slotMetaInfo(KIO::Job*, const QByteArray &data)
     d->succeeded = true;
 }
 
-KIO_EXPORT MetaInfoJob *KIO::fileMetaInfo( const KFileItemList& items)
+KDE4SUPPORT_EXPORT MetaInfoJob *KIO::fileMetaInfo( const KFileItemList& items)
 {
     return new MetaInfoJob(items);
 }
 
-KIO_EXPORT MetaInfoJob *KIO::fileMetaInfo( const QList<QUrl> &items)
+KDE4SUPPORT_EXPORT MetaInfoJob *KIO::fileMetaInfo( const QList<QUrl> &items)
 {
     KFileItemList fileItems;
     foreach (const QUrl& url, items) {