mirror of
https://bitbucket.org/smil3y/kdelibs.git
synced 2025-02-23 18:32:49 +00:00
Merge branch 'master' of https://github.com/fluxer/kdelibs into devinfo
This commit is contained in:
Ivailo Monev
commit
fc849abd43
14 changed files with 46 additions and 365 deletions
|
|
@ -41,7 +41,6 @@ set(cmakeFiles
|
|||
FindHUNSPELL.cmake
|
||||
FindKDE4Internal.cmake
|
||||
FindKDE4Workspace.cmake
|
||||
FindKipi.cmake
|
||||
FindKSane.cmake
|
||||
FindLibATASmart.cmake
|
||||
FindLibDRM.cmake
|
||||
|
|
|
|||
|
|
@ -7,8 +7,6 @@
|
|||
# It also sets variables for the following libraries:
|
||||
# KDE4WORKSPACE_TASKMANAGER_LIBRARY, KDE4WORKSPACE_TASKMANAGER_LIBS
|
||||
# KDE4WORKSPACE_KWORKSPACE_LIBRARY, KDE4WORKSPACE_KWORKSPACE_LIBS
|
||||
# KDE4WORKSPACE_SOLIDCONTROLIFACES_LIBRARY, KDE4WORKSPACE_SOLIDCONTROLIFACES_LIBS
|
||||
# KDE4WORKSPACE_SOLIDCONTROL_LIBRARY, KDE4WORKSPACE_SOLIDCONTROL_LIBS
|
||||
# KDE4WORKSPACE_PROCESSUI_LIBRARY, KDE4WORKSPACE_PROCESSUI_LIBS
|
||||
# KDE4WORKSPACE_LSOFUI_LIBRARY, KDE4WORKSPACE_LSOFUI_LIBS
|
||||
# KDE4WORKSPACE_PLASMACLOCK_LIBRARY, KDE4WORKSPACE_PLASMACLOCK_LIBS
|
||||
|
|
|
|||
|
|
@ -1,133 +0,0 @@
|
|||
# Module that tries to find the Kipi library
|
||||
#
|
||||
# Input values :
|
||||
#
|
||||
# KIPI_LOCAL_DIR - If you have put a local version of libkipi into your source tree,
|
||||
# set this variable to the relative path from the local directory.
|
||||
#
|
||||
# Output values :
|
||||
#
|
||||
# KIPI_FOUND - System has libkipi
|
||||
# KIPI_INCLUDE_DIR - The libkipi include directory
|
||||
# KIPI_LIBRARIES - Link these to use libkipi
|
||||
# KIPI_DEFINITIONS - Compiler switches required for using libkipi
|
||||
# KIPI_VERSION - The release version of the Kipi library
|
||||
# KIPI_SO_VERSION - The binary SO version of the Kipi library
|
||||
#
|
||||
|
||||
# Copyright (c) 2012, Victor Dodon <dodonvictor at gmail dot com>
|
||||
# Copyright (c) 2012-2014, Gilles Caulier <caulier dot gilles at gmail dot com>
|
||||
#
|
||||
# Redistribution and use is allowed according to the terms of the BSD license.
|
||||
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
|
||||
|
||||
IF("${Kipi_FIND_VERSION}" STREQUAL "")
|
||||
SET(Kipi_FIND_VERSION "1.2.0")
|
||||
MESSAGE(STATUS "No Kipi library version required. Check default version : ${Kipi_FIND_VERSION}")
|
||||
ELSE()
|
||||
MESSAGE(STATUS "Kipi library version required : ${Kipi_FIND_VERSION}")
|
||||
ENDIF()
|
||||
|
||||
IF(KIPI_INCLUDE_DIR AND KIPI_LIBRARIES AND KIPI_DEFINITIONS AND KIPI_VERSION AND KIPI_SO_VERSION)
|
||||
|
||||
IF(NOT Kipi_FIND_QUIETLY)
|
||||
MESSAGE(STATUS "Found kipi library in cache ${KIPI_LIBRARIES}")
|
||||
ENDIF(NOT Kipi_FIND_QUIETLY)
|
||||
# Already in cache
|
||||
SET(KIPI_FOUND TRUE)
|
||||
|
||||
ELSE(KIPI_INCLUDE_DIR AND KIPI_LIBRARIES AND KIPI_DEFINITIONS AND KIPI_VERSION AND KIPI_SO_VERSION)
|
||||
|
||||
IF(NOT Kipi_FIND_QUIETLY)
|
||||
MESSAGE(STATUS "Check Kipi library in local sub-folder...")
|
||||
ENDIF(NOT Kipi_FIND_QUIETLY)
|
||||
|
||||
IF(KIPI_LOCAL_DIR)
|
||||
FIND_FILE(KIPI_LOCAL_FOUND libkipi/libkipi_export.h ${CMAKE_SOURCE_DIR}/${KIPI_LOCAL_DIR} NO_DEFAULT_PATH)
|
||||
IF(NOT KIPI_LOCAL_FOUND)
|
||||
MESSAGE(WARNING "KIPI_LOCAL_DIR specified as \"${KIPI_LOCAL_DIR}\" but libkipi could not be found there.")
|
||||
ENDIF(NOT KIPI_LOCAL_FOUND)
|
||||
ELSE(KIPI_LOCAL_DIR)
|
||||
FIND_FILE(KIPI_LOCAL_FOUND libkipi/libkipi_export.h ${CMAKE_SOURCE_DIR}/libkipi NO_DEFAULT_PATH)
|
||||
IF(KIPI_LOCAL_FOUND)
|
||||
SET(KIPI_LOCAL_DIR libkipi)
|
||||
ENDIF(KIPI_LOCAL_FOUND)
|
||||
|
||||
FIND_FILE(KIPI_LOCAL_FOUND libkipi/libkipi_export.h ${CMAKE_SOURCE_DIR}/libs/libkipi NO_DEFAULT_PATH)
|
||||
IF(KIPI_LOCAL_FOUND)
|
||||
SET(KIPI_LOCAL_DIR libs/libkipi)
|
||||
ENDIF(KIPI_LOCAL_FOUND)
|
||||
ENDIF(KIPI_LOCAL_DIR)
|
||||
|
||||
IF(KIPI_LOCAL_FOUND)
|
||||
|
||||
SET(KIPI_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/${KIPI_LOCAL_DIR}" "${CMAKE_BINARY_DIR}/${KIPI_LOCAL_DIR}")
|
||||
SET(KIPI_DEFINITIONS "-I${CMAKE_SOURCE_DIR}/${KIPI_LOCAL_DIR}" "-I${CMAKE_BINARY_DIR}/${KIPI_LOCAL_DIR}")
|
||||
SET(KIPI_LIBRARIES kipi)
|
||||
IF(NOT Kipi_FIND_QUIETLY)
|
||||
MESSAGE(STATUS "Found Kipi library in local sub-folder: ${CMAKE_SOURCE_DIR}/${KIPI_LOCAL_DIR}")
|
||||
ENDIF(NOT Kipi_FIND_QUIETLY)
|
||||
SET(KIPI_FOUND TRUE)
|
||||
SET(KIPI_VERSION_H_FILENAME "${CMAKE_BINARY_DIR}/${KIPI_LOCAL_DIR}/libkipi/version.h")
|
||||
|
||||
ELSE(KIPI_LOCAL_FOUND)
|
||||
|
||||
IF(NOT WIN32)
|
||||
IF(NOT Kipi_FIND_QUIETLY)
|
||||
MESSAGE(STATUS "Check Kipi library using pkg-config...")
|
||||
ENDIF(NOT Kipi_FIND_QUIETLY)
|
||||
|
||||
INCLUDE(FindPkgConfig)
|
||||
PKG_CHECK_MODULES(PC_KIPI libkipi>=${Kipi_FIND_VERSION})
|
||||
ENDIF(NOT WIN32)
|
||||
|
||||
FIND_LIBRARY(KIPI_LIBRARIES NAMES kipi HINTS ${PC_KIPI_LIBRARY_DIRS} ${KDE4_LIB_INSTALL_DIR} ${KDE4_LIB_DIR})
|
||||
FIND_PATH(KIPI_INCLUDE_DIR NAMES libkipi/version.h HINTS ${PC_KIPI_INCLUDE_DIRS} ${KDE4_INCLUDE_INSTALL_DIR} ${KDE4_INCLUDE_DIR})
|
||||
SET(KIPI_VERSION_H_FILENAME "${KIPI_INCLUDE_DIR}/libkipi/version.h")
|
||||
SET(KIPI_DEFINITIONS ${PC_KIPI_CFLAGS} CACHE STRING "Kipi defintions")
|
||||
|
||||
INCLUDE(FindPackageHandleStandardArgs)
|
||||
FIND_PACKAGE_HANDLE_STANDARD_ARGS(KIPI DEFAULT_MSG KIPI_LIBRARIES KIPI_INCLUDE_DIR)
|
||||
|
||||
ENDIF(KIPI_LOCAL_FOUND)
|
||||
|
||||
IF(KIPI_FOUND)
|
||||
|
||||
IF(NOT KIPI_VERSION)
|
||||
FILE(READ "${KIPI_VERSION_H_FILENAME}" KIPI_VERSION_H_CONTENT)
|
||||
STRING(REGEX REPLACE ".*static +const +char +kipi_version\\[\\] += +\"([^\"]+)\".*" "\\1" KIPI_VERSION "${KIPI_VERSION_H_CONTENT}")
|
||||
MESSAGE(STATUS "Kipi library version: ${KIPI_VERSION}")
|
||||
ENDIF(NOT KIPI_VERSION)
|
||||
|
||||
IF(NOT KIPI_SO_VERSION)
|
||||
FILE(READ "${KIPI_VERSION_H_FILENAME}" KIPI_VERSION_H_CONTENT)
|
||||
STRING(REGEX REPLACE
|
||||
".*static +const +int +kipi_binary_version += ([^ ;]+).*"
|
||||
"\\1"
|
||||
KIPI_SO_VERSION_FOUND
|
||||
"${KIPI_VERSION_H_CONTENT}"
|
||||
)
|
||||
SET(KIPI_SO_VERSION ${KIPI_SO_VERSION_FOUND} CACHE STRING "libkipi so version")
|
||||
MESSAGE(STATUS "Kipi library SO binary version: ${KIPI_SO_VERSION}")
|
||||
ENDIF(NOT KIPI_SO_VERSION)
|
||||
|
||||
UNSET(KIPI_VERSION_H_CONTENT)
|
||||
UNSET(KIPI_VERSION_H_FILENAME)
|
||||
ENDIF(KIPI_FOUND)
|
||||
|
||||
IF(KIPI_FOUND)
|
||||
MESSAGE(STATUS "libkipi: Found version ${KIPI_VERSION} (required: ${Kipi_FIND_VERSION})")
|
||||
IF(${KIPI_VERSION} VERSION_LESS ${Kipi_FIND_VERSION})
|
||||
SET(KIPI_FOUND FALSE)
|
||||
ELSE()
|
||||
MARK_AS_ADVANCED(KIPI_INCLUDE_DIR KIPI_LIBRARIES KIPI_DEFINITIONS KIPI_VERSION KIPI_SO_VERSION)
|
||||
ENDIF()
|
||||
ELSE(KIPI_FOUND)
|
||||
UNSET(KIPI_INCLUDE_DIR)
|
||||
UNSET(KIPI_LIBRARIES)
|
||||
UNSET(KIPI_DEFINITIONS)
|
||||
UNSET(KIPI_VERSION)
|
||||
UNSET(KIPI_SO_VERSION)
|
||||
ENDIF(KIPI_FOUND)
|
||||
|
||||
ENDIF(KIPI_INCLUDE_DIR AND KIPI_LIBRARIES AND KIPI_DEFINITIONS AND KIPI_VERSION AND KIPI_SO_VERSION)
|
||||
|
|
@ -137,7 +137,7 @@ void KDeclarative::initialize()
|
|||
d->scriptEngine.data()->setGlobalObject(newGlobalObject);
|
||||
|
||||
#ifdef QT_KATIE
|
||||
KCmdLineArgs::init(KCmdLineArgs::qtArgc(), KCmdLineArgs::qtArgv(), Q_NULLPTR);
|
||||
KCmdLineArgs::init(KCmdLineArgs::qtArgc(), KCmdLineArgs::qtArgv(), nullptr);
|
||||
#endif
|
||||
|
||||
d->initialized = true;
|
||||
|
|
|
|||
|
|
@ -84,16 +84,13 @@
|
|||
1511 kdessh (kdeutils)
|
||||
1512 kdepasswd
|
||||
1601 ark (kdeutils)
|
||||
1806 oktetakasten
|
||||
1901 kfind
|
||||
1902 kfind (KfindWindow::updateResults)
|
||||
1903 kfind (KfindTabDialog::createQuery)
|
||||
2000 kfind
|
||||
2001 kregexpeditor
|
||||
2002 kfloppy
|
||||
2003 ksim
|
||||
2100 kgpg
|
||||
2200 kdf
|
||||
|
||||
# kdeaccessibility
|
||||
2400 kttsd (daemon)
|
||||
|
|
@ -125,17 +122,11 @@
|
|||
# kdenetwork, kdepim
|
||||
5001 kget
|
||||
5002 kppp
|
||||
5003 knode
|
||||
5005 knewsticker
|
||||
5007 kpf
|
||||
5009 filesharing
|
||||
5010 krdc
|
||||
5011 krdc (VNC backend)
|
||||
5012 krdc (RDP backend)
|
||||
5050 libkmime
|
||||
5051 libkmime (Codecs)
|
||||
5052 libkmime (Plugin Loader)
|
||||
5100 libkdenetwork
|
||||
|
||||
# libkio
|
||||
7000 kio
|
||||
|
|
@ -217,42 +208,18 @@
|
|||
13050 Kate (Scripting)
|
||||
13060 Kate (Indentation)
|
||||
|
||||
# KDB
|
||||
20000 KDB (core)
|
||||
20001 KDB (ui)
|
||||
20010 KDB (DBEngine)
|
||||
20011 KDB (Connection)
|
||||
20012 KDB (plugin)
|
||||
|
||||
#kfilereplace
|
||||
23000 KFileReplace (kfilereplacepart)
|
||||
|
||||
#klinkstatus
|
||||
23100 KLinkStatus
|
||||
|
||||
# libkscan / kooka
|
||||
29000 libkscan
|
||||
|
||||
# kdegraphics
|
||||
|
||||
# KIPI - KDE Imaging Plugin Interface
|
||||
51000 KIPI (general)
|
||||
51001 KIPI (loading)
|
||||
|
||||
# KEXIV2 - KDE C++ wrapper for LibExiv2
|
||||
51003 KEXIV2
|
||||
|
||||
# KSANE - KDE C++ wrapper for LibSane
|
||||
51004 KSANE
|
||||
|
||||
# Network Management
|
||||
51010 Network Management (internals)
|
||||
51011 Network Management (service)
|
||||
51012 Network Management (ui)
|
||||
51013 Network Management (KCModule)
|
||||
51014 knetworkmanager
|
||||
51020 Network Management (NetworkManager backend)
|
||||
|
||||
# kdemultimedia
|
||||
67100 kmix
|
||||
|
||||
|
|
@ -269,5 +236,3 @@
|
|||
90210 konq-plugins (rellinks)
|
||||
|
||||
100200 kfs
|
||||
|
||||
300000 kuassel
|
||||
|
|
|
|||
|
|
@ -98,14 +98,15 @@ void KServicePrivate::init( const KDesktopFile *config, KService* q )
|
|||
{
|
||||
/*kWarning(servicesDebugArea()) << "The desktop entry file " << entryPath
|
||||
<< " has no Type=... entry."
|
||||
<< " It should be \"Application\" or \"Service\"" << endl;
|
||||
<< " It should be \"Application\", \"Service\"" or \"FSDevice\" << endl;
|
||||
m_bValid = false;
|
||||
return;*/
|
||||
m_strType = QString::fromLatin1("Application");
|
||||
} else if (m_strType != QLatin1String("Application") && m_strType != QLatin1String("Service")) {
|
||||
} else if (m_strType != QLatin1String("Application") && m_strType != QLatin1String("Service")
|
||||
&& m_strType != QLatin1String("FSDevice")) {
|
||||
kWarning(servicesDebugArea()) << "The desktop entry file " << entryPath
|
||||
<< " has Type=" << m_strType
|
||||
<< " instead of \"Application\" or \"Service\"" << endl;
|
||||
<< " instead of \"Application\", \"Service\" or \"FSDevice\"" << endl;
|
||||
m_bValid = false;
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -49,8 +49,9 @@ Don't forget to add an icon to the pics directory. Try to make it look similar
|
|||
There are some global options that you can have.
|
||||
|
||||
[Global]
|
||||
Includes=foo.h,bar.h
|
||||
Init=new InitCode();
|
||||
Destroy= delete object;
|
||||
Destroy=delete object;
|
||||
PluginName=MyPlugin
|
||||
|
||||
PluginName overrides the passed in value at the command line and is optional.
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
[Global]
|
||||
PluginName=KDEWidgets
|
||||
Includes=kcomponentdata.h,ktimezone.h
|
||||
Init=new KComponentData("kdewidgets");
|
||||
|
||||
[KActionSelector]
|
||||
IncludeFile=kactionselector.h
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ static const char collClassDef[] = "class %CollName : public QObject, public QDe
|
|||
" Q_INTERFACES(QDesignerCustomWidgetCollectionInterface)\n"
|
||||
"public:\n"
|
||||
" %CollName(QObject *parent = 0);\n"
|
||||
" virtual ~%CollName() {}\n"
|
||||
" virtual ~%CollName();\n"
|
||||
" QList<QDesignerCustomWidgetInterface*> customWidgets() const { return m_plugins; } \n"
|
||||
" \n"
|
||||
"private:\n"
|
||||
|
|
@ -42,9 +42,15 @@ static const char collClassDef[] = "class %CollName : public QObject, public QDe
|
|||
static const char collClassImpl[] = "%CollName::%CollName(QObject *parent)\n"
|
||||
" : QObject(parent)"
|
||||
"{\n"
|
||||
" (void) new KComponentData(\"makekdewidgets\");\n"
|
||||
" %CollInit\n"
|
||||
" (void) new KComponentData(\"%CollName\");\n"
|
||||
"%CollectionAdd\n"
|
||||
"}\n\n";
|
||||
"}\n"
|
||||
"\n"
|
||||
"%CollName::~%CollName()\n"
|
||||
"{\n"
|
||||
" %CollDestroy\n"
|
||||
"}\n";
|
||||
|
||||
|
||||
static const char classDef[] = "class %PluginName : public QObject, public QDesignerCustomWidgetInterface\n"
|
||||
|
|
@ -128,11 +134,6 @@ int main( int argc, char **argv ) {
|
|||
void buildFile( QTextStream &ts, const QString& group, const QString& fileName, const QString& pluginName ) {
|
||||
KConfig input( fileName, KConfig::NoGlobals );
|
||||
KConfigGroup cg(&input, "Global" );
|
||||
QHash<QString, QString> MainMap;
|
||||
MainMap.insert( "PluginName", cg.readEntry( "PluginName", pluginName ) );
|
||||
MainMap.insert( "PluginNameLower", cg.readEntry( "PluginName", pluginName ).toLower() );
|
||||
MainMap.insert( "Init", cg.readEntry( "Init", "" ) );
|
||||
MainMap.insert( "Destroy", cg.readEntry( "Destroy", "" ) );
|
||||
ts << classHeader << endl;
|
||||
|
||||
QStringList includes = cg.readEntry( "Includes", QStringList() );
|
||||
|
|
@ -165,6 +166,8 @@ QString buildCollClass( KConfig &_input, const QStringList& classes ) {
|
|||
KConfigGroup input(&_input, "Global");
|
||||
QHash<QString, QString> defMap;
|
||||
defMap.insert( "CollName", input.readEntry( "PluginName" ) );
|
||||
defMap.insert( "CollInit", input.readEntry( "Init", "" ) );
|
||||
defMap.insert( "CollDestroy", input.readEntry( "Destroy", "" ) );
|
||||
QString genCode;
|
||||
|
||||
foreach ( const QString &myClass, classes )
|
||||
|
|
|
|||
|
|
@ -17,3 +17,7 @@ PCX <read>
|
|||
PSD <read>
|
||||
XCF <read>
|
||||
RAW <read>
|
||||
|
||||
If you want to want to contribute plugin for image format and there is no solid
|
||||
C/C++ library for it (like there is for WebP) then it is unlikely it will be
|
||||
accepted.
|
||||
|
|
|
|||
|
|
@ -73,6 +73,7 @@ Notes:
|
|||
<comment xml:lang="zh_TW">RELAX NG</comment>
|
||||
<glob pattern="*.rng"/>
|
||||
</mime-type>
|
||||
|
||||
<mime-type type="application/x-cda">
|
||||
<comment>CD audio</comment>
|
||||
<comment xml:lang="ar">صوت CD</comment>
|
||||
|
|
@ -133,6 +134,7 @@ Notes:
|
|||
<comment xml:lang="zh_TW">CD 音效</comment>
|
||||
<glob pattern="*.cda"/>
|
||||
</mime-type>
|
||||
|
||||
<mime-type type="application/x-font-snf">
|
||||
<comment>SNF bitmap font</comment>
|
||||
<comment xml:lang="ar">خط SNF bitmap</comment>
|
||||
|
|
@ -193,6 +195,7 @@ Notes:
|
|||
<glob pattern="*.snf.Z"/>
|
||||
<glob pattern="*.snf.gz"/>
|
||||
</mime-type>
|
||||
|
||||
<mime-type type="application/x-java-applet">
|
||||
<comment>Java applet</comment>
|
||||
<comment xml:lang="ar">بريمج جافا</comment>
|
||||
|
|
@ -252,6 +255,7 @@ Notes:
|
|||
<comment xml:lang="zh_CN">Java 小程序</comment>
|
||||
<comment xml:lang="zh_TW">Java applet</comment>
|
||||
</mime-type>
|
||||
|
||||
<mime-type type="application/x-kcsrc">
|
||||
<comment>KDE color scheme</comment>
|
||||
<comment xml:lang="ar">مخطط ألوان كدي</comment>
|
||||
|
|
@ -313,6 +317,7 @@ Notes:
|
|||
<expanded-acronym>K Desktop Environment</expanded-acronym>
|
||||
<glob pattern="*.kcsrc"/>
|
||||
</mime-type>
|
||||
|
||||
<mime-type type="application/x-kwallet"> <!-- fdo #6326 rejected, will stay KDE-specific -->
|
||||
<comment>KWallet wallet</comment>
|
||||
<comment xml:lang="ar">حافظة KWallet</comment>
|
||||
|
|
@ -375,6 +380,7 @@ Notes:
|
|||
</magic>
|
||||
<glob pattern="*.kwl"/>
|
||||
</mime-type>
|
||||
|
||||
<mime-type type="application/x-plasma">
|
||||
<sub-class-of type="application/zip"/>
|
||||
<comment>plasmoid</comment>
|
||||
|
|
@ -435,6 +441,7 @@ Notes:
|
|||
<comment xml:lang="zh_TW">Plasma 小程式</comment>
|
||||
<glob pattern="*.plasmoid"/>
|
||||
</mime-type>
|
||||
|
||||
<mime-type type="application/x-webarchive">
|
||||
<sub-class-of type="application/x-compressed-tar"/>
|
||||
<sub-class-of type="application/x-gzip"/> <!-- only necessary because x-compressed-tar is not specifying this sub-class-of (shared-mime-info 0.8) -->
|
||||
|
|
@ -496,6 +503,7 @@ Notes:
|
|||
<comment xml:lang="zh_TW">網頁歸檔</comment>
|
||||
<glob pattern="*.war"/>
|
||||
</mime-type>
|
||||
|
||||
<mime-type type="application/xsd">
|
||||
<sub-class-of type="application/xml"/>
|
||||
<comment>W3C XML schema</comment>
|
||||
|
|
@ -554,6 +562,7 @@ Notes:
|
|||
<comment xml:lang="zh_TW">W3C XML 機制</comment>
|
||||
<glob pattern="*.xsd"/>
|
||||
</mime-type>
|
||||
|
||||
<mime-type type="audio/x-pn-realaudio-plugin"> <!-- Not a type of file, so will not go to shared-mime-info -->
|
||||
<comment>RealAudio plugin file</comment>
|
||||
<comment xml:lang="ar">ملف ملحق RealAudio</comment>
|
||||
|
|
@ -611,6 +620,7 @@ Notes:
|
|||
<comment xml:lang="zh_CN">RealAudio 插件文件</comment>
|
||||
<comment xml:lang="zh_TW">RealAudio 外掛程式檔案</comment>
|
||||
</mime-type>
|
||||
|
||||
<mime-type type="image/x-kde-raw">
|
||||
<sub-class-of type="image/x-dcraw"/>
|
||||
<comment>KDE raw image formats</comment>
|
||||
|
|
@ -679,9 +689,11 @@ Notes:
|
|||
<glob pattern="*.pnx"/>
|
||||
<glob pattern="*.rdc"/>
|
||||
</mime-type>
|
||||
|
||||
<mime-type type="text/plain"> <!-- As discussed on xdg list, *.doc is needed here for disambiguation -->
|
||||
<glob pattern="*.doc"/>
|
||||
</mime-type>
|
||||
|
||||
<mime-type type="text/x-hex">
|
||||
<sub-class-of type="text/plain"/>
|
||||
<comment>Intel® hexadecimal object file</comment>
|
||||
|
|
@ -743,121 +755,7 @@ Notes:
|
|||
<comment xml:lang="zh_TW">Intel® hexadecimal 物件檔</comment>
|
||||
<glob pattern="*.hex"/>
|
||||
</mime-type>
|
||||
<mime-type type="text/x-katefilelist">
|
||||
<sub-class-of type="text/plain"/>
|
||||
<comment>Kate file list loader plugin list</comment>
|
||||
<comment xml:lang="ar">قائمة ملحقات محملات قائمة ملفات لكيت</comment>
|
||||
<comment xml:lang="ast">Llista de complementos de carga de llistes de ficheros de Kate</comment>
|
||||
<comment xml:lang="bs">spisak Kateinog priključka za učitavanje datoteka</comment>
|
||||
<comment xml:lang="ca">llista del connector carregador de llista de fitxers del Kate</comment>
|
||||
<comment xml:lang="ca@valencia">llista del connector carregador de llista de fitxers del Kate</comment>
|
||||
<comment xml:lang="da">Liste over plugins til fillisteindlæsning i Kate</comment>
|
||||
<comment xml:lang="de">Kate-Dateilistenlade-Modulliste</comment>
|
||||
<comment xml:lang="el">Λίστα αρχείου φόρτωσης λίστας πρόσθετων Kate</comment>
|
||||
<comment xml:lang="en_GB">Kate file list loader plugin list</comment>
|
||||
<comment xml:lang="es">Lista de complementos de carga de listas de archivos de Kate</comment>
|
||||
<comment xml:lang="et">Kate failinimekirja avaja plugin</comment>
|
||||
<comment xml:lang="eu">Kate fitxategi-zerrenda kargatzeko plugin zerrenda</comment>
|
||||
<comment xml:lang="fi">Kate-tiedostoluettelolataajaliitännäisluettelo</comment>
|
||||
<comment xml:lang="fr">Liste de modules externes pour le chargeur de liste de fichiers de Kate</comment>
|
||||
<comment xml:lang="ga">Liosta de bhreiseáin luchtaithe liostaí comhad do Kate</comment>
|
||||
<comment xml:lang="gl">Lista de complementos do cargador de lista de ficheiros de Kate</comment>
|
||||
<comment xml:lang="hr">Kate lista od priključka učitavača liste datoteka</comment>
|
||||
<comment xml:lang="hu">Kate-listafájl (fájllista vagy bővítménylista)</comment>
|
||||
<comment xml:lang="ia">Kate: Lista de plugin de cargator de lista de file</comment>
|
||||
<comment xml:lang="is">Kate skráahleðsluíforritalisti</comment>
|
||||
<comment xml:lang="it">elenco delle estensioni del caricatore di elenchi di file di Kate</comment>
|
||||
<comment xml:lang="ja">Kate ファイルリストローダプラグインリスト</comment>
|
||||
<comment xml:lang="kk">Kate файлдар тізімін жүктеу плагин тізімі</comment>
|
||||
<comment xml:lang="km">បញ្ជីកម្មវិធីជំនួយរបស់កម្មវិធីផ្ទុកបញ្ជីឯកសាររបស់ Kate</comment>
|
||||
<comment xml:lang="ko">Kate 파일 목록 로더 플러그인 목록</comment>
|
||||
<comment xml:lang="lt">Kate failų sąrašo užkrovimo priedų sąrašas</comment>
|
||||
<comment xml:lang="lv">Kate failu saraksta ielādētāja spraudņa saraksts</comment>
|
||||
<comment xml:lang="ml">കേറ്റ് ഫയല് പട്ടിക ലഭ്യമാക്കുന്നതിന്റെ സംയോജകങ്ങളുടെ പട്ടിക</comment>
|
||||
<comment xml:lang="mr">केट फाईल यादी लोड करणाऱ्या प्लगइनची यादी</comment>
|
||||
<comment xml:lang="nb">Liste over programtillegg for Kate fillistelasting</comment>
|
||||
<comment xml:lang="nds">Dateilistlader-Moduullist för Kate</comment>
|
||||
<comment xml:lang="nl">Kate bestandenlijstlader voor pluginlijst</comment>
|
||||
<comment xml:lang="nn">Programtilleggliste for fillistelastar i Kate</comment>
|
||||
<comment xml:lang="pa">ਕੇਟ ਫਾਇਲ ਲਿਸਟ ਲੋਡਰ ਪਲੱਗਇਨ ਲਿਸਟ</comment>
|
||||
<comment xml:lang="pl">Lista wtyczki do wczytywania plików Kate</comment>
|
||||
<comment xml:lang="pt">Lista de 'plugins' de carregamento de listas de ficheiros do Kate</comment>
|
||||
<comment xml:lang="pt_BR">Lista de plugins de carregamento de listas de arquivos do Kate</comment>
|
||||
<comment xml:lang="ro">listă de module pentru încărcarea liste de fișiere în Kate</comment>
|
||||
<comment xml:lang="ru">список файлов Kate</comment>
|
||||
<comment xml:lang="se">Kate-fiilalistoviežži lassemodulalistu</comment>
|
||||
<comment xml:lang="sk">Zoznam modulov - načítanie zoznamu súborov Kate</comment>
|
||||
<comment xml:lang="sl">Seznam vstavka nalagalnika seznamov datotek za Kate</comment>
|
||||
<comment xml:lang="sr">списак Кејтиног прикључка за учитавање фајлова</comment>
|
||||
<comment xml:lang="sr@ijekavian">списак Кејтиног прикључка за учитавање фајлова</comment>
|
||||
<comment xml:lang="sr@ijekavianlatin">spisak Kateinog priključka za učitavanje fajlova</comment>
|
||||
<comment xml:lang="sr@latin">spisak Kateinog priključka za učitavanje fajlova</comment>
|
||||
<comment xml:lang="sv">Kate insticksprogramlista för laddning av fillistor</comment>
|
||||
<comment xml:lang="tr">Kate dosya listesi yükleyici eklentisi listesi</comment>
|
||||
<comment xml:lang="ug">Kate ھۆججەت تىزىمى يۈكلىگۈچ قىستۇرما تىزىمى</comment>
|
||||
<comment xml:lang="uk">список файлів Kate</comment>
|
||||
<comment xml:lang="zh_CN">Kate 文件列表装入器插件列表</comment>
|
||||
<comment xml:lang="zh_TW">Kate 檔案清單載入器外掛程式清單</comment>
|
||||
<glob pattern="*.katefl"/>
|
||||
</mime-type>
|
||||
<mime-type type="text/x-objchdr"> <!-- ??? Useless, without glob or magic. Remove? -->
|
||||
<sub-class-of type="text/x-csrc"/>
|
||||
<comment>Objective-C header</comment>
|
||||
<comment xml:lang="ar">ترويسة Objective-C</comment>
|
||||
<comment xml:lang="ast">Cabecera de Objective-C</comment>
|
||||
<comment xml:lang="bs">Objective‑c zaglavlje</comment>
|
||||
<comment xml:lang="ca">capçalera Objective-C</comment>
|
||||
<comment xml:lang="ca@valencia">capçalera Objective-C</comment>
|
||||
<comment xml:lang="cs">Objective-C hlavička</comment>
|
||||
<comment xml:lang="da">Objective-C header-fil</comment>
|
||||
<comment xml:lang="de">Objective-C-Header</comment>
|
||||
<comment xml:lang="el">Κεφαλίδα Objective-C</comment>
|
||||
<comment xml:lang="en_GB">Objective-C header</comment>
|
||||
<comment xml:lang="es">Cabecera de Objective-C</comment>
|
||||
<comment xml:lang="et">Objective-C päis</comment>
|
||||
<comment xml:lang="eu">Objective-C goiburua</comment>
|
||||
<comment xml:lang="fi">Objective C -otsake</comment>
|
||||
<comment xml:lang="fr">En-tête « Objective-C »</comment>
|
||||
<comment xml:lang="ga">Ceanntásc Objective-C</comment>
|
||||
<comment xml:lang="gl">Cabeceira de Objective-C</comment>
|
||||
<comment xml:lang="hr">Objective-C zaglavlje</comment>
|
||||
<comment xml:lang="hu">Objective-C-fejlécfájl</comment>
|
||||
<comment xml:lang="ia">Capite de Objective-C</comment>
|
||||
<comment xml:lang="is">Objective-C haus</comment>
|
||||
<comment xml:lang="it">intestazione Objective-C</comment>
|
||||
<comment xml:lang="ja">Objective-C ヘッダ</comment>
|
||||
<comment xml:lang="kk">Objective-C айдар файлы</comment>
|
||||
<comment xml:lang="km">ក្បាល Objective-C</comment>
|
||||
<comment xml:lang="ko">오브젝티브-C 헤더</comment>
|
||||
<comment xml:lang="lt">Objektinio-C antraštė</comment>
|
||||
<comment xml:lang="lv">Objective-C galvene</comment>
|
||||
<comment xml:lang="ml">ഒബ്ജക്ടീവ്-സി ഹെഡര്</comment>
|
||||
<comment xml:lang="mr">ओब्जेक्टिव्ह-सी हेडर</comment>
|
||||
<comment xml:lang="nb">Objective-C hodefil</comment>
|
||||
<comment xml:lang="nds">"Objective-C"-Koppdatei</comment>
|
||||
<comment xml:lang="nl">Objective-C-header</comment>
|
||||
<comment xml:lang="nn">Objective-C-deklarasjonsfil</comment>
|
||||
<comment xml:lang="pa">Objective-C ਹੈੱਡਰ</comment>
|
||||
<comment xml:lang="pl">Plik nagłówkowy Objective-C</comment>
|
||||
<comment xml:lang="pt">Ficheiro de inclusão em Objective-C</comment>
|
||||
<comment xml:lang="pt_BR">Cabeçalho em Objetive-C</comment>
|
||||
<comment xml:lang="ro">antet Objective-C</comment>
|
||||
<comment xml:lang="ru">заголовочный файл Objective-C</comment>
|
||||
<comment xml:lang="se">Objective-C oaivefiila</comment>
|
||||
<comment xml:lang="sk">Hlavičkový súbor Objektového C</comment>
|
||||
<comment xml:lang="sl">Glava za Objective-C</comment>
|
||||
<comment xml:lang="sr">објектив‑Ц заглавље</comment>
|
||||
<comment xml:lang="sr@ijekavian">објектив‑Ц заглавље</comment>
|
||||
<comment xml:lang="sr@ijekavianlatin">Objective‑c zaglavlje</comment>
|
||||
<comment xml:lang="sr@latin">Objective‑c zaglavlje</comment>
|
||||
<comment xml:lang="sv">Objective-C deklarationsfil</comment>
|
||||
<comment xml:lang="th">แฟ้มส่วนหัวภาษา Objective-C</comment>
|
||||
<comment xml:lang="tr">Objective-C başlığı</comment>
|
||||
<comment xml:lang="ug">Objective-C باشى</comment>
|
||||
<comment xml:lang="uk">файл заголовків Objective-C</comment>
|
||||
<comment xml:lang="zh_CN">Objective-C 头文件</comment>
|
||||
<comment xml:lang="zh_TW">Objective-C 標頭檔</comment>
|
||||
</mime-type>
|
||||
|
||||
<mime-type type="text/vnd.abc"> <!-- fdo #6578 -->
|
||||
<sub-class-of type="text/plain"/>
|
||||
<comment>abc musical notation file</comment>
|
||||
|
|
@ -918,6 +816,7 @@ Notes:
|
|||
</magic>
|
||||
<glob pattern="*.abc"/>
|
||||
</mime-type>
|
||||
|
||||
<!-- all/ fake mime types -->
|
||||
<mime-type type="all/all">
|
||||
<comment>all files and folders</comment>
|
||||
|
|
@ -977,6 +876,7 @@ Notes:
|
|||
<comment xml:lang="zh_CN">全部文件和文件夹</comment>
|
||||
<comment xml:lang="zh_TW">所有檔案與資料夾</comment>
|
||||
</mime-type>
|
||||
|
||||
<mime-type type="all/allfiles">
|
||||
<comment>all files</comment>
|
||||
<comment xml:lang="ar">كل الملفات</comment>
|
||||
|
|
@ -1155,6 +1055,7 @@ Notes:
|
|||
<comment xml:lang="zh_CN">Windows 服务器</comment>
|
||||
<comment xml:lang="zh_TW">Windows 伺服器</comment>
|
||||
</mime-type>
|
||||
|
||||
<mime-type type="application/x-smb-workgroup"> <!-- KDE-specific -->
|
||||
<sub-class-of type="inode/directory"/>
|
||||
<comment>Windows workgroup</comment>
|
||||
|
|
@ -1214,6 +1115,7 @@ Notes:
|
|||
<comment xml:lang="zh_CN">Windows 工作组</comment>
|
||||
<comment xml:lang="zh_TW">Windows 工作群組</comment>
|
||||
</mime-type>
|
||||
|
||||
<mime-type type="application/x-ksysguard">
|
||||
<!-- <sub-class-of type="application/xml"/> -->
|
||||
<comment>KDE system monitor</comment>
|
||||
|
|
@ -1274,66 +1176,6 @@ Notes:
|
|||
<comment xml:lang="zh_TW">KDE 系統監視器</comment>
|
||||
<glob pattern="*.sgrd"/>
|
||||
</mime-type>
|
||||
<mime-type type="application/x-ktheme">
|
||||
<sub-class-of type="application/zip"/>
|
||||
<comment>KDE theme</comment>
|
||||
<comment xml:lang="ar">سمة كدي</comment>
|
||||
<comment xml:lang="ast">Tema de KDE</comment>
|
||||
<comment xml:lang="bg">Тема за KDE</comment>
|
||||
<comment xml:lang="bs">KDE tema</comment>
|
||||
<comment xml:lang="ca">tema del KDE</comment>
|
||||
<comment xml:lang="ca@valencia">tema del KDE</comment>
|
||||
<comment xml:lang="cs">Motiv KDE</comment>
|
||||
<comment xml:lang="da">KDE-tema</comment>
|
||||
<comment xml:lang="de">KDE-Design</comment>
|
||||
<comment xml:lang="el">Θέμα του KDE</comment>
|
||||
<comment xml:lang="en_GB">KDE theme</comment>
|
||||
<comment xml:lang="es">Tema de KDE</comment>
|
||||
<comment xml:lang="et">KDE teema</comment>
|
||||
<comment xml:lang="eu">KDE tema</comment>
|
||||
<comment xml:lang="fi">KDE-teema</comment>
|
||||
<comment xml:lang="fr">Thème KDE</comment>
|
||||
<comment xml:lang="ga">Téama KDE</comment>
|
||||
<comment xml:lang="gl">Tema de KDE</comment>
|
||||
<comment xml:lang="hr">KDE-ova tema</comment>
|
||||
<comment xml:lang="hu">KDE-téma</comment>
|
||||
<comment xml:lang="ia">Thema de KDE</comment>
|
||||
<comment xml:lang="is">KDE þema</comment>
|
||||
<comment xml:lang="it">tema di KDE</comment>
|
||||
<comment xml:lang="ja">KDE テーマ</comment>
|
||||
<comment xml:lang="kk">KDE нақышы</comment>
|
||||
<comment xml:lang="km">ស្បែករបស់ KDE</comment>
|
||||
<comment xml:lang="ko">KDE 테마</comment>
|
||||
<comment xml:lang="lt">KDE tema</comment>
|
||||
<comment xml:lang="lv">KDE tēma</comment>
|
||||
<comment xml:lang="ml">കെഡിഇ പ്രമേയം</comment>
|
||||
<comment xml:lang="mr">केडीई शैली</comment>
|
||||
<comment xml:lang="nb">KDE-tema</comment>
|
||||
<comment xml:lang="nds">KDE-Muster</comment>
|
||||
<comment xml:lang="nl">KDE-thema</comment>
|
||||
<comment xml:lang="nn">KDE-tema</comment>
|
||||
<comment xml:lang="pa">KDE ਥੀਮ</comment>
|
||||
<comment xml:lang="pl">Motyw KDE</comment>
|
||||
<comment xml:lang="pt">Tema do KDE</comment>
|
||||
<comment xml:lang="pt_BR">Tema do KDE</comment>
|
||||
<comment xml:lang="ro">Tematică KDE</comment>
|
||||
<comment xml:lang="ru">оформление KDE</comment>
|
||||
<comment xml:lang="se">KDE fáddá</comment>
|
||||
<comment xml:lang="sk">Téma KDE</comment>
|
||||
<comment xml:lang="sl">Tema KDE</comment>
|
||||
<comment xml:lang="sr">КДЕ тема</comment>
|
||||
<comment xml:lang="sr@ijekavian">КДЕ тема</comment>
|
||||
<comment xml:lang="sr@ijekavianlatin">KDE tema</comment>
|
||||
<comment xml:lang="sr@latin">KDE tema</comment>
|
||||
<comment xml:lang="sv">KDE-tema</comment>
|
||||
<comment xml:lang="th">ชุดตกแต่ง KDE</comment>
|
||||
<comment xml:lang="tr">KDE teması</comment>
|
||||
<comment xml:lang="ug">KDE ئۆرنىكى</comment>
|
||||
<comment xml:lang="uk">тема KDE</comment>
|
||||
<comment xml:lang="zh_CN">KDE 主题</comment>
|
||||
<comment xml:lang="zh_TW">KDE 主題</comment>
|
||||
<glob pattern="*.kth"/>
|
||||
</mime-type>
|
||||
|
||||
<mime-type type="application/x-quanta">
|
||||
<sub-class-of type="text/plain"/>
|
||||
|
|
@ -1944,6 +1786,7 @@ Notes:
|
|||
<comment xml:lang="zh_TW">Turtle RDF 文件</comment>
|
||||
<sub-class-of type="text/plain" />
|
||||
</mime-type>
|
||||
|
||||
<mime-type type="image/x-pic"> <!-- fdo #26038 -->
|
||||
<comment>Softimage PIC image</comment>
|
||||
<comment xml:lang="ar">صورة PIC</comment>
|
||||
|
|
@ -2037,6 +1880,7 @@ Notes:
|
|||
</magic>
|
||||
<glob pattern="*.zst"/>
|
||||
</mime-type>
|
||||
|
||||
<mime-type type="application/x-zstd-compressed-tar">
|
||||
<comment>Tar archive (Zstandard-compressed)</comment>
|
||||
<comment xml:lang="bg">Архив — tar, компресиран със Zstandard</comment>
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ using namespace Solid::Backends::UDev;
|
|||
|
||||
OpticalDisc::OpticalDisc(UDevDevice *device)
|
||||
: StorageVolume(device),
|
||||
p_cdio(Q_NULLPTR)
|
||||
p_cdio(nullptr)
|
||||
{
|
||||
const QByteArray devicename(m_device->deviceProperty("DEVNAME").toLocal8Bit());
|
||||
p_cdio = cdio_open(devicename.constData(), DRIVER_UNKNOWN);
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ using namespace Solid::Backends::UDev;
|
|||
|
||||
OpticalDrive::OpticalDrive(UDevDevice *device)
|
||||
: StorageDrive(device),
|
||||
p_cdio(Q_NULLPTR)
|
||||
p_cdio(nullptr)
|
||||
{
|
||||
const QByteArray devicename(m_device->deviceProperty("DEVNAME").toLocal8Bit());
|
||||
p_cdio = cdio_open(devicename.constData(), DRIVER_UNKNOWN);
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
namespace UdevQt {
|
||||
|
||||
Device::Device()
|
||||
: m_device(Q_NULLPTR)
|
||||
: m_device(nullptr)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -59,14 +59,14 @@ Device &Device::operator=(const Device &other)
|
|||
if (other.m_device) {
|
||||
m_device = udev_device_ref(other.m_device);
|
||||
} else {
|
||||
m_device = Q_NULLPTR;
|
||||
m_device = nullptr;
|
||||
}
|
||||
return *this;
|
||||
}
|
||||
|
||||
bool Device::isValid() const
|
||||
{
|
||||
return (m_device != Q_NULLPTR);
|
||||
return (m_device != nullptr);
|
||||
}
|
||||
|
||||
QString Device::subsystem() const
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue