[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdelibs/frameworks] /: Move KMimeType to kde4support
From: David Faure <faure () kde ! org>
Date: 2012-06-21 7:42:19
Message-ID: 20120621074219.8649AA60C4 () git ! kde ! org
[Download RAW message or body]
Git commit 5742d5e5b1eb30446370d0a05ddeb959db8aff56 by David Faure.
Committed on 21/06/2012 at 09:42.
Pushed by dfaure into branch 'frameworks'.
Move KMimeType to kde4support
M +2 -1 kde3support/CMakeLists.txt
M +0 -3 kdecore/CMakeLists.txt
M +3 -2 kdecore/services/kservice.cpp
M +0 -1 kded/kbuildmimetypefactory.cpp
M +2 -1 kded/kbuildservicefactory.cpp
M +1 -1 kded/kmimeassociations.cpp
M +4 -1 staging/kde4support/src/CMakeLists.txt
R +0 -0 staging/kde4support/src/kdecore/kmimetype.cpp [from: \
kdecore/services/kmimetype.cpp - 100% similarity] R +0 -0 \
staging/kde4support/src/kdecore/kmimetype.h [from: kdecore/services/kmimetype.h - \
100% similarity] R +2 -2 \
staging/kde4support/src/kdecore/kmimetyperepository.cpp [from: \
kdecore/services/kmimetyperepository.cpp - 097% similarity] R +0 -0 \
staging/kde4support/src/kdecore/kmimetyperepository_p.h [from: \
kdecore/services/kmimetyperepository_p.h - 100% similarity]
http://commits.kde.org/kdelibs/5742d5e5b1eb30446370d0a05ddeb959db8aff56
diff --git a/kde3support/CMakeLists.txt b/kde3support/CMakeLists.txt
index 364e780..cc26b68 100644
--- a/kde3support/CMakeLists.txt
+++ b/kde3support/CMakeLists.txt
@@ -8,6 +8,7 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/kdecore \
${CMAKE_CURRENT_SOURCE_ ${kcoreaddons_BINARY_DIR}/src
${kwidgetsaddons_SOURCE_DIR}/src
${kwidgetsaddons_BINARY_DIR}/src
+ ${kde4support_SOURCE_DIR}/src/kdecore
${kde4support_SOURCE_DIR}/src/kdeui
${kde4support_BINARY_DIR}/src
${kdeguiaddons_SOURCE_DIR}/src/text
@@ -88,7 +89,7 @@ remove_definitions(-DQT3_SUPPORT_WARNINGS \
-DKDE_DEPRECATED_WARNINGS)
kde4_add_library(kde3support ${LIBRARY_TYPE} ${kde3support_LIB_SRCS})
-target_link_libraries(kde3support ${KDE4_KPARTS_LIBS} ${KDE4_KPTY_LIBS} \
${QT_QTXML_LIBRARY} ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KFILE_LIBS} kwindowsystem \
${X11_LIBRARIES} kdeguiaddons kwidgets kwidgetsaddons) \
+target_link_libraries(kde3support ${KDE4_KPARTS_LIBS} ${KDE4_KPTY_LIBS} \
${QT_QTXML_LIBRARY} ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KFILE_LIBS} kwindowsystem \
${X11_LIBRARIES} kdeguiaddons kwidgets kwidgetsaddons kde4support) \
target_link_libraries(kde3support LINK_INTERFACE_LIBRARIES kio kdeui kdecore \
${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QT3SUPPORT_LIBRARY} )
set_target_properties(kde3support PROPERTIES VERSION ${GENERIC_LIB_VERSION}
diff --git a/kdecore/CMakeLists.txt b/kdecore/CMakeLists.txt
index 447f3d8..435aab2 100644
--- a/kdecore/CMakeLists.txt
+++ b/kdecore/CMakeLists.txt
@@ -166,8 +166,6 @@ set(kdecore_LIB_SRCS
kernel/ktoolinvocation.cpp
services/kmimetypefactory.cpp
services/kmimetypetrader.cpp
- services/kmimetype.cpp
- services/kmimetyperepository.cpp
services/kservice.cpp
services/kserviceaction.cpp
services/kservicefactory.cpp
@@ -331,7 +329,6 @@ install( FILES
install(FILES
network/ksocketfactory.h
network/ktcpsocket.h
- services/kmimetype.h
services/kmimetypetrader.h
services/kservice.h
services/kserviceaction.h
diff --git a/kdecore/services/kservice.cpp b/kdecore/services/kservice.cpp
index 428c30f..31a910e 100644
--- a/kdecore/services/kservice.cpp
+++ b/kdecore/services/kservice.cpp
@@ -20,7 +20,6 @@
#include "kservice.h"
#include "kservice_p.h"
#include "kmimetypefactory.h"
-#include "kmimetyperepository_p.h"
#include <sys/types.h>
#include <sys/stat.h>
@@ -33,6 +32,7 @@
#include <QtCore/QFile>
#include <QtCore/QDir>
#include <QtCore/QMap>
+#include <qmimedatabase.h>
#include <kcoreauthorized.h>
#include <kdebug.h>
@@ -946,10 +946,11 @@ QStringList KService::mimeTypes() const
{
Q_D(const KService);
QStringList ret;
+ QMimeDatabase db;
QVector<KService::ServiceTypeAndPreference>::const_iterator it = \
d->m_serviceTypes.begin(); for ( ; it < d->m_serviceTypes.end(); ++it ) {
const QString sv = (*it).serviceType;
- if (KMimeType::mimeType(sv)) // keep only mimetypes, filter out servicetypes
+ if (db.mimeTypeForFile(sv).isValid()) // keep only mimetypes, filter out \
servicetypes ret.append(sv);
}
return ret;
diff --git a/kded/kbuildmimetypefactory.cpp b/kded/kbuildmimetypefactory.cpp
index d810e77..4c3348c 100644
--- a/kded/kbuildmimetypefactory.cpp
+++ b/kded/kbuildmimetypefactory.cpp
@@ -18,7 +18,6 @@
*/
#include "kbuildmimetypefactory.h"
-#include "kmimetyperepository_p.h"
#include "ksycoca.h"
#include "ksycocadict_p.h"
#include "ksycocaresourcelist.h"
diff --git a/kded/kbuildservicefactory.cpp b/kded/kbuildservicefactory.cpp
index e689151..15aa87e 100644
--- a/kded/kbuildservicefactory.cpp
+++ b/kded/kbuildservicefactory.cpp
@@ -20,13 +20,14 @@
#include "kbuildservicefactory.h"
#include "kbuildservicegroupfactory.h"
#include "kbuildmimetypefactory.h"
-#include "kmimetyperepository_p.h"
#include "ksycoca.h"
#include "ksycocadict_p.h"
#include "ksycocaresourcelist.h"
#include "kdesktopfile.h"
+#include <kservicetype.h>
#include <QDir>
+#include <qmimedatabase.h>
#include <klocalizedstring.h>
#include <kdebug.h>
diff --git a/kded/kmimeassociations.cpp b/kded/kmimeassociations.cpp
index f3bc22d..42af40f 100644
--- a/kded/kmimeassociations.cpp
+++ b/kded/kmimeassociations.cpp
@@ -19,13 +19,13 @@
*/
#include "kmimeassociations.h"
-#include <kmimetyperepository_p.h>
#include <kservice.h>
#include <kconfiggroup.h>
#include <kconfig.h>
#include <kdebug.h>
#include <kglobal.h>
#include <kstandarddirs.h>
+#include <qmimedatabase.h>
KMimeAssociations::KMimeAssociations(KOfferHash& offerHash)
: m_offerHash(offerHash)
diff --git a/staging/kde4support/src/CMakeLists.txt \
b/staging/kde4support/src/CMakeLists.txt index 79789ff..2d0fa78 100644
--- a/staging/kde4support/src/CMakeLists.txt
+++ b/staging/kde4support/src/CMakeLists.txt
@@ -2,6 +2,8 @@ set(libkde4support_SRCS
kdecore/ktemporaryfile.cpp
kdecore/ktempdir.cpp
kdecore/kmd5.cpp
+ kdecore/kmimetype.cpp
+ kdecore/kmimetyperepository.cpp
kdecore/ksavefile.cpp
kdecore/k3socks.cpp
kdecore/k3sockssocketdevice.cpp
@@ -58,7 +60,7 @@ configure_file(kdemacros.h.cmake \
${CMAKE_CURRENT_BINARY_DIR}/kdemacros.h ) add_library(kde4support \
${libkde4support_SRCS}) generate_export_header(kde4support)
-target_link_libraries(kde4support ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} \
${QT_QTDBUS_LIBRARY} kdecore kcoreaddons kwidgets kauth kdeui ${X11_LIBRARIES}) \
+target_link_libraries(kde4support ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} \
${QT_QTDBUS_LIBRARY} kdecore kcoreaddons kwidgets kauth kdeui ${X11_LIBRARIES} \
${QtMimeTypes_LIBRARY}) set_target_properties(kde4support PROPERTIES VERSION \
${ECM_VERSION_STRING} SOVERSION ${ECM_SOVERSION})
install(TARGETS kde4support EXPORT kdelibsLibraryTargets ${ECM_TARGET_DEFAULT_ARGS})
@@ -80,6 +82,7 @@ install(FILES
kdecore/k3sockssocketdevice.h
kdecore/k3streamsocket.h
kdecore/kconfiggroup_kurl.h
+ kdecore/kmimetype.h
kdeui/kicon.h
kdeui/knumvalidator.h
kdeui/karrowbutton.h
diff --git a/kdecore/services/kmimetype.cpp \
b/staging/kde4support/src/kdecore/kmimetype.cpp similarity index 100%
rename from kdecore/services/kmimetype.cpp
rename to staging/kde4support/src/kdecore/kmimetype.cpp
diff --git a/kdecore/services/kmimetype.h \
b/staging/kde4support/src/kdecore/kmimetype.h similarity index 100%
rename from kdecore/services/kmimetype.h
rename to staging/kde4support/src/kdecore/kmimetype.h
diff --git a/kdecore/services/kmimetyperepository.cpp \
b/staging/kde4support/src/kdecore/kmimetyperepository.cpp similarity index 97%
rename from kdecore/services/kmimetyperepository.cpp
rename to staging/kde4support/src/kdecore/kmimetyperepository.cpp
index 1902d05..cc19f89 100644
--- a/kdecore/services/kmimetyperepository.cpp
+++ b/staging/kde4support/src/kdecore/kmimetyperepository.cpp
@@ -182,7 +182,7 @@ static int mimeDataBaseVersion()
// that block signals. See https://bugs.kde.org/show_bug.cgi?id=260719.
const QString umd = \
QStandardPaths::findExecutable(QString::fromLatin1("update-mime-database")); if \
(umd.isEmpty()) {
- kWarning(servicesDebugArea()) << "update-mime-database not found!";
+ kWarning() << "update-mime-database not found!";
return -1;
}
@@ -196,7 +196,7 @@ static int mimeDataBaseVersion()
return KDE_MAKE_VERSION(versionRe.cap(1).toInt(), versionRe.cap(2).toInt(), \
versionRe.cap(4).toInt()); }
- kWarning(servicesDebugArea()) << "Unexpected version scheme from \
update-mime-database -v: got" << out; + kWarning() << "Unexpected version scheme \
from update-mime-database -v: got" << out; return -1;
}
diff --git a/kdecore/services/kmimetyperepository_p.h \
b/staging/kde4support/src/kdecore/kmimetyperepository_p.h similarity index 100%
rename from kdecore/services/kmimetyperepository_p.h
rename to staging/kde4support/src/kdecore/kmimetyperepository_p.h
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic